Merge backend-overhaul to master

app/build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id 'com.github.triplet.play' version '2.2.1' apply false
 }
-
 apply from: '../gitutils.gradle'
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
@@ -20,15 +19,18 @@ dependencies {
     // Utils
     implementation 'com.github.nicolas-raoul:Quadtree:ac16ea8035bf07'
     implementation 'in.yuvi:http.fluent:1.3'
-    implementation 'com.squareup.okhttp3:okhttp:3.12.1'
-    implementation 'com.squareup.okio:okio:1.15.0'
+    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.squareup.okhttp3:okhttp:4.2.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'
     implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1'
     implementation 'com.jakewharton.rxbinding2:rxbinding-support-v4:2.1.1'
     implementation 'com.jakewharton.rxbinding2:rxbinding-appcompat-v7:2.1.1'
     implementation 'com.jakewharton.rxbinding2:rxbinding-design:2.1.1'
     implementation 'com.facebook.fresco:fresco:1.13.0'
-    implementation 'com.dmitrybrant:wikimedia-android-data-client:0.0.18'
     implementation 'org.apache.commons:commons-lang3:3.8.1'
+    implementation 'com.github.maskaravivek:wikimedia-android-data-client:v0.0.28'
 
     // UI
     implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar'
@@ -49,6 +51,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"
 
     // Dependency injector
     implementation "com.google.dagger:dagger-android-support:$DAGGER_VERSION"
@@ -62,21 +65,21 @@ dependencies {
     testImplementation 'org.robolectric:robolectric:4.3'
     testImplementation 'androidx.test:core:1.2.0'
     testImplementation 'com.nhaarman:mockito-kotlin:1.5.0'
-    testImplementation 'com.squareup.okhttp3:mockwebserver:3.10.0'
+    testImplementation 'com.squareup.okhttp3:mockwebserver:3.12.1'
     testImplementation "org.powermock:powermock-module-junit4:2.0.0-beta.5"
     testImplementation "org.powermock:powermock-api-mockito2:2.0.0-beta.5"
 
     // Android testing
     androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION"
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.1'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test:rules:1.1.1'
-    androidTestImplementation 'androidx.annotation:annotation:1.0.2'
-    androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.10.0'
-    androidTestImplementation 'org.mockito:mockito-core:2.10.0'
-    androidTestUtil 'androidx.test:orchestrator:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.2.0'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test:rules:1.2.0'
+    androidTestImplementation 'androidx.annotation:annotation:1.1.0'
+    androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.12.1'
+    androidTestImplementation 'org.mockito:mockito-core:2.13.0'
+    androidTestUtil 'androidx.test:orchestrator:1.2.0'
 
     // Debugging
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$LEAK_CANARY_VERSION"
@@ -187,6 +190,7 @@ android {
             buildConfigField "String", "IMAGE_URL_BASE", "\"https://upload.wikimedia.org/wikipedia/commons\""
             buildConfigField "String", "HOME_URL", "\"https://commons.wikimedia.org/wiki/\""
             buildConfigField "String", "COMMONS_URL", "\"https://commons.wikimedia.org\""
+            buildConfigField "String", "WIKIDATA_URL", "\"https://wikidata.org\""
             buildConfigField "String", "MOBILE_HOME_URL", "\"https://commons.m.wikimedia.org/wiki/\""
             buildConfigField "String", "SIGNUP_LANDING_URL", "\"https://commons.m.wikimedia.org/w/index.php?title=Special:CreateAccount&returnto=Main+Page&returntoquery=welcome%3Dyes\""
             buildConfigField "String", "SIGNUP_SUCCESS_REDIRECTION_URL", "\"https://commons.m.wikimedia.org/w/index.php?title=Main_Page&welcome=yes\""
@@ -218,6 +222,7 @@ android {
             buildConfigField "String", "IMAGE_URL_BASE", "\"https://upload.beta.wmflabs.org/wikipedia/commons\""
             buildConfigField "String", "HOME_URL", "\"https://commons.wikimedia.beta.wmflabs.org/wiki/\""
             buildConfigField "String", "COMMONS_URL", "\"https://commons.wikimedia.beta.wmflabs.org\""
+            buildConfigField "String", "WIKIDATA_URL", "\"https://wikidata.org\""
             buildConfigField "String", "MOBILE_HOME_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/wiki/\""
             buildConfigField "String", "SIGNUP_LANDING_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/w/index.php?title=Special:CreateAccount&returnto=Main+Page&returntoquery=welcome%3Dyes\""
             buildConfigField "String", "SIGNUP_SUCCESS_REDIRECTION_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/w/index.php?title=Main_Page&welcome=yes\""

app/src/main/AndroidManifest.xml

@@ -152,7 +152,8 @@
         </service>
         <service
             android:name=".contributions.ContributionsSyncService"
-            android:exported="true">
+            android:exported="true"
+            android:process=":sync">
             <intent-filter>
                 <action android:name="android.content.SyncAdapter" />
             </intent-filter>
@@ -161,17 +162,6 @@
                 android:name="android.content.SyncAdapter"
                 android:resource="@xml/contributions_sync_adapter" />
         </service>
-        <service
-            android:name=".modifications.ModificationsSyncService"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.content.SyncAdapter" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.content.SyncAdapter"
-                android:resource="@xml/modifications_sync_adapter" />
-        </service>
 
         <service
             android:name="org.acra.sender.SenderService"
@@ -193,12 +183,7 @@
             android:exported="false"
             android:label="@string/provider_contributions"
             android:syncable="true" />
-        <provider
-            android:name=".modifications.ModificationsContentProvider"
-            android:authorities="${applicationId}.modifications.contentprovider"
-            android:exported="false"
-            android:label="@string/provider_modifications"
-            android:syncable="true" />
+
         <provider
             android:name=".category.CategoryContentProvider"
             android:authorities="${applicationId}.categories.contentprovider"

app/src/main/java/fr/free/nrw/commons/CommonsAppAdapter.java

@@ -61,15 +61,16 @@ public String getPassword() {
 
     @Override
     public void updateAccount(@NonNull LoginResult result) {
-        // TODO:  sessionManager.updateAccount(result);
+        sessionManager.updateAccount(result);
     }
 
     @Override
     public SharedPreferenceCookieManager getCookies() {
         if (!preferences.contains(COOKIE_STORE_NAME)) {
             return null;
         }
-        return GsonUnmarshaller.unmarshal(SharedPreferenceCookieManager.class, preferences.getString(COOKIE_STORE_NAME, null));
+        return GsonUnmarshaller.unmarshal(SharedPreferenceCookieManager.class,
+                preferences.getString(COOKIE_STORE_NAME, null));
     }
 
     @Override

app/src/main/java/fr/free/nrw/commons/CommonsApplication.java

@@ -1,5 +1,12 @@
 package fr.free.nrw.commons;
 
+import static org.acra.ReportField.ANDROID_VERSION;
+import static org.acra.ReportField.APP_VERSION_CODE;
+import static org.acra.ReportField.APP_VERSION_NAME;
+import static org.acra.ReportField.PHONE_MODEL;
+import static org.acra.ReportField.STACK_TRACE;
+import static org.acra.ReportField.USER_COMMENT;
+
 import android.annotation.SuppressLint;
 import android.app.Application;
 import android.app.NotificationChannel;
@@ -9,26 +16,12 @@
 import android.os.Build;
 import android.os.Process;
 import android.util.Log;
-
+import androidx.annotation.NonNull;
 import com.facebook.drawee.backends.pipeline.Fresco;
+import com.facebook.imagepipeline.core.ImagePipeline;
 import com.facebook.imagepipeline.core.ImagePipelineConfig;
 import com.squareup.leakcanary.LeakCanary;
 import com.squareup.leakcanary.RefWatcher;
-
-import org.acra.ACRA;
-import org.acra.annotation.AcraCore;
-import org.acra.annotation.AcraDialog;
-import org.acra.annotation.AcraMailSender;
-import org.acra.data.StringFormat;
-import org.wikipedia.AppAdapter;
-import org.wikipedia.language.AppLanguageLookUpTable;
-
-import java.io.File;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import androidx.annotation.NonNull;
 import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao;
 import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao;
@@ -41,22 +34,24 @@
 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.modifications.ModifierSequenceDao;
 import fr.free.nrw.commons.upload.FileUtils;
 import fr.free.nrw.commons.utils.ConfigUtils;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.internal.functions.Functions;
 import io.reactivex.plugins.RxJavaPlugins;
 import io.reactivex.schedulers.Schedulers;
+import java.io.File;
+import javax.inject.Inject;
+import javax.inject.Named;
+import org.acra.ACRA;
+import org.acra.annotation.AcraCore;
+import org.acra.annotation.AcraDialog;
+import org.acra.annotation.AcraMailSender;
+import org.acra.data.StringFormat;
+import org.wikipedia.AppAdapter;
+import org.wikipedia.language.AppLanguageLookUpTable;
 import timber.log.Timber;
 
-import static org.acra.ReportField.ANDROID_VERSION;
-import static org.acra.ReportField.APP_VERSION_CODE;
-import static org.acra.ReportField.APP_VERSION_NAME;
-import static org.acra.ReportField.PHONE_MODEL;
-import static org.acra.ReportField.STACK_TRACE;
-import static org.acra.ReportField.USER_COMMENT;
-
 @AcraCore(
         buildConfigClass = BuildConfig.class,
         resReportSendSuccessToast = R.string.crash_dialog_ok_toast,
@@ -250,6 +245,7 @@ public void clearApplicationData(Context context, LogoutListener logoutListener)
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(() -> {
                     Timber.d("All accounts have been removed");
+                    clearImageCache();
                     //TODO: fix preference manager
                     defaultPrefs.clearAll();
                     defaultPrefs.putBoolean("firstrun", false);
@@ -258,14 +254,21 @@ public void clearApplicationData(Context context, LogoutListener logoutListener)
                 });
     }
 
+    /**
+     * Clear all images cache held by Fresco
+     */
+    private void clearImageCache() {
+        ImagePipeline imagePipeline = Fresco.getImagePipeline();
+        imagePipeline.clearCaches();
+    }
+
     /**
      * Deletes all tables and re-creates them.
      */
     private void updateAllDatabases() {
         dbOpenHelper.getReadableDatabase().close();
         SQLiteDatabase db = dbOpenHelper.getWritableDatabase();
 
-        ModifierSequenceDao.Table.onDelete(db);
         CategoryDao.Table.onDelete(db);
         ContributionDao.Table.onDelete(db);
         BookmarkPicturesDao.Table.onDelete(db);

app/src/main/java/fr/free/nrw/commons/Media.java

@@ -4,6 +4,9 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.apache.commons.lang3.StringUtils;
 import org.wikipedia.dataclient.mwapi.MwQueryPage;
 import org.wikipedia.gallery.ExtMetadata;
@@ -20,14 +23,13 @@
 import java.util.Locale;
 import java.util.Map;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import fr.free.nrw.commons.location.LatLng;
 import fr.free.nrw.commons.utils.CommonsDateUtil;
 import fr.free.nrw.commons.utils.MediaDataExtractorUtil;
 
 public class Media implements Parcelable {
 
+    public static final Media EMPTY = new Media("");
     public static Creator<Media> CREATOR = new Creator<Media>() {
         @Override
         public Media createFromParcel(Parcel parcel) {
@@ -156,9 +158,9 @@ public static Media from(MwQueryPage page) {
                 page.title(),
                 "",
                 0,
-                safeParseDate(metadata.dateTimeOriginal().value()),
-                safeParseDate(metadata.dateTime().value()),
-                StringUtil.fromHtml(metadata.artist().value()).toString()
+                safeParseDate(metadata.dateTime()),
+                safeParseDate(metadata.dateTime()),
+                StringUtil.fromHtml(metadata.artist()).toString()
         );
 
         if (!StringUtils.isBlank(imageInfo.getThumbUrl())) {
@@ -170,17 +172,17 @@ public static Media from(MwQueryPage page) {
             language = "default";
         }
 
-        media.setDescriptions(Collections.singletonMap(language, metadata.imageDescription().value()));
-        media.setCategories(MediaDataExtractorUtil.extractCategoriesFromList(metadata.categories().value()));
-        String latitude = metadata.gpsLatitude().value();
-        String longitude = metadata.gpsLongitude().value();
+        media.setDescriptions(Collections.singletonMap(language, metadata.imageDescription()));
+        media.setCategories(MediaDataExtractorUtil.extractCategoriesFromList(metadata.getCategories()));
+        String latitude = metadata.getGpsLatitude();
+        String longitude = metadata.getGpsLongitude();
 
         if (!StringUtils.isBlank(latitude) && !StringUtils.isBlank(longitude)) {
             LatLng latLng = new LatLng(Double.parseDouble(latitude), Double.parseDouble(longitude), 0);
             media.setCoordinates(latLng);
         }
 
-        media.setLicenseInformation(metadata.licenseShortName().value(), metadata.licenseUrl().value());
+        media.setLicenseInformation(metadata.licenseShortName(), metadata.licenseUrl());
         return media;
     }
 

app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java

@@ -1,10 +1,11 @@
 package fr.free.nrw.commons;
 
+import androidx.core.text.HtmlCompat;
+
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import androidx.core.text.HtmlCompat;
-import fr.free.nrw.commons.mwapi.MediaWikiApi;
+import fr.free.nrw.commons.media.MediaClient;
 import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
 import io.reactivex.Single;
 import timber.log.Timber;
@@ -17,14 +18,14 @@
  */
 @Singleton
 public class MediaDataExtractor {
-    private final MediaWikiApi mediaWikiApi;
     private final OkHttpJsonApiClient okHttpJsonApiClient;
+    private final MediaClient mediaClient;
 
     @Inject
-    public MediaDataExtractor(MediaWikiApi mwApi,
-                              OkHttpJsonApiClient okHttpJsonApiClient) {
+    public MediaDataExtractor(OkHttpJsonApiClient okHttpJsonApiClient,
+                              MediaClient mediaClient) {
         this.okHttpJsonApiClient = okHttpJsonApiClient;
-        this.mediaWikiApi = mwApi;
+        this.mediaClient = mediaClient;
     }
 
     /**
@@ -35,7 +36,7 @@ public MediaDataExtractor(MediaWikiApi mwApi,
      */
     public Single<Media> fetchMediaDetails(String filename) {
         Single<Media> mediaSingle = getMediaFromFileName(filename);
-        Single<Boolean> pageExistsSingle = mediaWikiApi.pageExists("Commons:Deletion_requests/" + filename);
+        Single<Boolean> pageExistsSingle = mediaClient.checkPageExistsUsingTitle("Commons:Deletion_requests/" + filename);
         Single<String> discussionSingle = getDiscussion(filename);
         return Single.zip(mediaSingle, pageExistsSingle, discussionSingle, (media, deletionStatus, discussion) -> {
             media.setDiscussion(discussion);
@@ -52,7 +53,7 @@ public Single<Media> fetchMediaDetails(String filename) {
      * @return return data rich Media object
      */
     public Single<Media> getMediaFromFileName(String filename) {
-        return okHttpJsonApiClient.getMedia(filename, false);
+        return mediaClient.getMedia(filename);
     }
 
     /**
@@ -61,8 +62,7 @@ public Single<Media> getMediaFromFileName(String filename) {
      * @return
      */
     private Single<String> getDiscussion(String filename) {
-        return mediaWikiApi.fetchMediaByFilename(filename.replace("File", "File talk"))
-                .flatMap(mediaResult -> mediaWikiApi.parseWikicode(mediaResult.getWikiSource()))
+        return mediaClient.getPageHtml(filename.replace("File", "File talk"))
                 .map(discussion -> HtmlCompat.fromHtml(discussion, HtmlCompat.FROM_HTML_MODE_LEGACY).toString())
                 .onErrorReturn(throwable -> {
                     Timber.e(throwable, "Error occurred while fetching discussion");

app/src/main/java/fr/free/nrw/commons/OkHttpConnectionFactory.java

@@ -31,12 +31,22 @@ private static OkHttpClient createClient() {
         return new OkHttpClient.Builder()
                 .cookieJar(SharedPreferenceCookieManager.getInstance())
                 .cache(NET_CACHE)
-                .addInterceptor(new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY))
+                .addInterceptor(getLoggingInterceptor())
                 .addInterceptor(new UnsuccessfulResponseInterceptor())
                 .addInterceptor(new CommonHeaderRequestInterceptor())
                 .build();
     }
 
+    private static HttpLoggingInterceptor getLoggingInterceptor() {
+        HttpLoggingInterceptor httpLoggingInterceptor = new HttpLoggingInterceptor()
+                .setLevel(HttpLoggingInterceptor.Level.BASIC);
+
+        httpLoggingInterceptor.redactHeader("Authorization");
+        httpLoggingInterceptor.redactHeader("Cookie");
+
+        return httpLoggingInterceptor;
+    }
+
     private static class CommonHeaderRequestInterceptor implements Interceptor {
         @Override @NonNull public Response intercept(@NonNull Chain chain) throws IOException {
             Request request = chain.request().newBuilder()