ashishkumar468
diff --git a/‎.idea/inspectionProfiles/Project_Default.xml‎
Lines changed: 1 addition & 0 deletions b/‎.idea/inspectionProfiles/Project_Default.xml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎app/build.gradle‎
Lines changed: 11 additions & 6 deletions b/‎app/build.gradle‎
Lines changed: 11 additions & 6 deletions
diff --git a/‎app/src/main/AndroidManifest.xml‎
Lines changed: 6 additions & 5 deletions b/‎app/src/main/AndroidManifest.xml‎
Lines changed: 6 additions & 5 deletions
diff --git a/‎app/src/main/java/fr/free/nrw/commons/CommonsApplication.java‎
Lines changed: 6 additions & 16 deletions b/‎app/src/main/java/fr/free/nrw/commons/CommonsApplication.java‎
Lines changed: 6 additions & 16 deletions
@@ -19,10 +19,9 @@ dependencies {
 
     implementation project(':wikimedia-data-client')
     // Utils
-    implementation 'com.github.nicolas-raoul:Quadtree:ac16ea8035bf07'
     implementation 'in.yuvi:http.fluent:1.3'
     implementation 'com.google.code.gson:gson:2.8.5'
-    implementation 'com.squareup.okhttp3:okhttp:4.2.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.5.0'
     implementation 'com.squareup.okio:okio:2.2.2'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.3'
@@ -44,6 +43,7 @@ dependencies {
     implementation 'com.dinuscxj:circleprogressbar:1.1.1'
     implementation 'com.karumi:dexter:5.0.0'
     implementation "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION"
+
     kapt "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION"
 
     // Logging
@@ -53,7 +53,7 @@ dependencies {
     api('com.github.tony19:logback-android-classic:1.1.1-6') {
         exclude group: 'com.google.android', module: 'android'
     }
-    implementation "com.squareup.okhttp3:logging-interceptor:4.2.0"
+    implementation "com.squareup.okhttp3:logging-interceptor:4.5.0"
 
     // Dependency injector
     implementation "com.google.dagger:dagger-android-support:$DAGGER_VERSION"
@@ -65,7 +65,7 @@ dependencies {
 
     //Mocking
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'
-    testImplementation 'org.mockito:mockito-inline:2.8.47'
+    testImplementation 'org.mockito:mockito-inline:2.13.0'
     testImplementation 'org.mockito:mockito-core:2.23.0'
     testImplementation "org.powermock:powermock-module-junit4:2.0.0-beta.5"
     testImplementation "org.powermock:powermock-api-mockito2:2.0.0-beta.5"
@@ -108,9 +108,10 @@ dependencies {
 
     //Room
     implementation "androidx.room:room-runtime:$ROOM_VERSION"
-    kapt "androidx.room:room-compiler:$ROOM_VERSION" // For Kotlin use kapt instead of annotationProcessor
-    implementation 'com.squareup.retrofit2:retrofit:2.7.1'
+    implementation "androidx.room:room-ktx:$ROOM_VERSION"
     implementation "androidx.room:room-rxjava2:$ROOM_VERSION"
+    kapt "androidx.room:room-compiler:$ROOM_VERSION" // For Kotlin use kapt instead of annotationProcessor
+    implementation 'com.squareup.retrofit2:retrofit:2.8.1'
     testImplementation "androidx.arch.core:core-testing:2.1.0"
 
     // Pref
@@ -208,6 +209,7 @@ android {
             buildConfigField "String", "WIKIMEDIA_API_POTD", "\"https://commons.wikimedia.org/w/api.php?action=featuredfeed&feed=potd&feedformat=rss&language=en\""
             buildConfigField "String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.org/w/api.php\""
             buildConfigField "String", "WIKIDATA_API_HOST", "\"https://www.wikidata.org/w/api.php\""
+            buildConfigField "String", "WIKIDATA_URL", "\"https://www.wikidata.org\""
             buildConfigField "String", "WIKIMEDIA_FORGE_API_HOST", "\"https://tools.wmflabs.org/\""
             buildConfigField "String", "WIKIMEDIA_CAMPAIGNS_URL", "\"https://raw.githubusercontent.com/commons-app/campaigns/master/campaigns.json\""
             buildConfigField "String", "IMAGE_URL_BASE", "\"https://upload.wikimedia.org/wikipedia/commons\""
@@ -229,6 +231,7 @@ android {
             buildConfigField "String", "COMMIT_SHA", "\"" + getBuildVersion().toString() + "\""
             buildConfigField "String", "TEST_USERNAME", "\"" + System.getenv("test_user_name") + "\""
             buildConfigField "String", "TEST_PASSWORD", "\"" + System.getenv("test_user_password") + "\""
+            buildConfigField "String", "DEPICTS_PROPERTY", "\"P180\""
 
             dimension 'tier'
         }
@@ -240,6 +243,7 @@ android {
             buildConfigField "String", "WIKIMEDIA_API_POTD", "\"https://commons.wikimedia.org/w/api.php?action=featuredfeed&feed=potd&feedformat=rss&language=en\""
             buildConfigField "String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.beta.wmflabs.org/w/api.php\""
             buildConfigField "String", "WIKIDATA_API_HOST", "\"https://www.wikidata.org/w/api.php\""
+            buildConfigField "String", "WIKIDATA_URL", "\"https://www.wikidata.org\""
             buildConfigField "String", "WIKIMEDIA_FORGE_API_HOST", "\"https://tools.wmflabs.org/\""
             buildConfigField "String", "WIKIMEDIA_CAMPAIGNS_URL", "\"https://raw.githubusercontent.com/commons-app/campaigns/master/campaigns_beta_active.json\""
             buildConfigField "String", "IMAGE_URL_BASE", "\"https://upload.beta.wmflabs.org/wikipedia/commons\""
@@ -261,6 +265,7 @@ android {
             buildConfigField "String", "COMMIT_SHA", "\"" + getBuildVersion().toString() + "\""
             buildConfigField "String", "TEST_USERNAME", "\"" + System.getenv("test_user_name") + "\""
             buildConfigField "String", "TEST_PASSWORD", "\"" + System.getenv("test_user_password") + "\""
+            buildConfigField "String", "DEPICTS_PROPERTY", "\"P245962\""
 
             dimension 'tier'
         }
 
@@ -15,7 +15,9 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.MANAGE_DOCUMENTS" />
     <uses-permission android:name="com.google.android.apps.photos.permission.GOOGLE_PHOTOS" />
+    <uses-permission android:name="android.permission.READ_LOGS" />
     <uses-permission android:name="android.permission.SET_WALLPAPER"/>
 
 
@@ -118,12 +120,12 @@
             android:parentActivityName=".contributions.MainActivity" />
 
         <activity
-            android:name=".explore.depictions.WikidataItemDetailsActivity"
+            android:name=".depictions.WikidataItemDetailsActivity"
             android:label="@string/title_activity_featured_images"
             android:parentActivityName=".contributions.MainActivity" />
 
         <activity
-            android:name=".explore.ExploreActivity"
+            android:name=".explore.categories.ExploreActivity"
             android:label="@string/title_activity_explore"
             android:parentActivityName=".contributions.MainActivity"
             android:configChanges="orientation|screenSize|keyboard" />
@@ -137,9 +139,8 @@
             />
 
         <activity
-            android:name=".profile.ProfileActivity"
-            android:configChanges="orientation|screenSize|keyboard"
-            android:label="@string/Profile" />
+            android:name=".achievements.AchievementsActivity"
+            android:label="@string/Achievements" />
 
         <activity
             android:name=".bookmarks.BookmarksActivity"
 
@@ -9,6 +9,7 @@
 import static org.acra.ReportField.USER_COMMENT;
 
 import android.annotation.SuppressLint;
+import android.app.Application;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.content.Context;
@@ -17,13 +18,13 @@
 import android.os.Process;
 import android.util.Log;
 import androidx.annotation.NonNull;
-import androidx.multidex.MultiDexApplication;
 import com.facebook.drawee.backends.pipeline.Fresco;
 import com.facebook.imagepipeline.core.ImagePipeline;
 import com.facebook.imagepipeline.core.ImagePipelineConfig;
 import com.mapbox.mapboxsdk.Mapbox;
 import com.squareup.leakcanary.LeakCanary;
 import com.squareup.leakcanary.RefWatcher;
+
 import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao;
 import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao;
@@ -36,7 +37,6 @@
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.logging.FileLoggingTree;
 import fr.free.nrw.commons.logging.LogUtils;
-import fr.free.nrw.commons.media.CustomOkHttpNetworkFetcher;
 import fr.free.nrw.commons.settings.Prefs;
 import fr.free.nrw.commons.upload.FileUtils;
 import fr.free.nrw.commons.utils.ConfigUtils;
@@ -77,20 +77,11 @@
         resCommentPrompt = R.string.crash_dialog_comment_prompt
 )
 
-public class CommonsApplication extends MultiDexApplication {
-
-  public static final String IS_LIMITED_CONNECTION_MODE_ENABLED = "is_limited_connection_mode_enabled";
-  @Inject
-  SessionManager sessionManager;
-  @Inject
-  DBOpenHelper dbOpenHelper;
-
-  @Inject
-  @Named("default_preferences")
-  JsonKvStore defaultPrefs;
+public class CommonsApplication extends Application {
+    @Inject SessionManager sessionManager;
+    @Inject DBOpenHelper dbOpenHelper;
 
-  @Inject
-  CustomOkHttpNetworkFetcher customOkHttpNetworkFetcher;
+    @Inject @Named("default_preferences") JsonKvStore defaultPrefs;
 
     /**
      * Constants begin
@@ -157,7 +148,6 @@ public void onCreate() {
 
 //        Set DownsampleEnabled to True to downsample the image in case it's heavy
         ImagePipelineConfig config = ImagePipelineConfig.newBuilder(this)
-                .setNetworkFetcher(customOkHttpNetworkFetcher)
                 .setDownsampleEnabled(true)
                 .build();
         try {