Revert "Merge branch 'backend-overhaul' into master" (#3125)

* Revert "Merge branch 'backend-overhaul' into master"

This reverts commit 0090f24257, reversing
changes made to 9bccbfe443.

* fixed test handleSubmitTest

app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationComponent.java

@@ -1,5 +1,6 @@
 package fr.free.nrw.commons.di;
 
+import fr.free.nrw.commons.contributions.ContributionsModule;
 import javax.inject.Singleton;
 
 import dagger.Component;
@@ -9,8 +10,8 @@ import dagger.android.support.AndroidSupportInjectionModule;
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.auth.LoginActivity;
 import fr.free.nrw.commons.contributions.ContributionViewHolder;
-import fr.free.nrw.commons.contributions.ContributionsModule;
 import fr.free.nrw.commons.contributions.ContributionsSyncAdapter;
+import fr.free.nrw.commons.modifications.ModificationsSyncAdapter;
 import fr.free.nrw.commons.nearby.PlaceRenderer;
 import fr.free.nrw.commons.review.ReviewController;
 import fr.free.nrw.commons.settings.SettingsFragment;
@@ -35,6 +36,8 @@ public interface CommonsApplicationComponent extends AndroidInjector<Application
 
     void inject(ContributionsSyncAdapter syncAdapter);
 
+    void inject(ModificationsSyncAdapter syncAdapter);
+
     void inject(LoginActivity activity);
 
     void inject(SettingsFragment fragment);

app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java

@@ -5,11 +5,14 @@ import android.content.ContentProviderClient;
 import android.content.Context;
 import android.view.inputmethod.InputMethodManager;
 
-import androidx.collection.LruCache;
-
 import com.google.gson.Gson;
 
-import org.wikipedia.AppAdapter;
+import org.wikipedia.dataclient.WikiSite;
+
+import io.reactivex.Scheduler;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+import org.wikipedia.dataclient.WikiSite;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -19,6 +22,7 @@ import java.util.Map;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
+import androidx.collection.LruCache;
 import dagger.Module;
 import dagger.Provides;
 import fr.free.nrw.commons.BuildConfig;
@@ -33,9 +37,6 @@ import fr.free.nrw.commons.upload.UploadController;
 import fr.free.nrw.commons.utils.ConfigUtils;
 import fr.free.nrw.commons.wikidata.WikidataEditListener;
 import fr.free.nrw.commons.wikidata.WikidataEditListenerImpl;
-import io.reactivex.Scheduler;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
 
 @Module
 @SuppressWarnings({"WeakerAccess", "unused"})
@@ -84,7 +85,7 @@ public class CommonsApplicationModule {
 
     @Provides
     public AccountUtil providesAccountUtil(Context context) {
-        return new AccountUtil();
+        return new AccountUtil(context);
     }
 
     @Provides
@@ -187,13 +188,7 @@ public class CommonsApplicationModule {
 
     @Named(MAIN_THREAD)
     @Provides
-    public Scheduler providesMainThread() {
+    public Scheduler providesMainThread(){
         return AndroidSchedulers.mainThread();
     }
-
-    @Named("username")
-    @Provides
-    public String provideLoggedInUsername() {
-        return AppAdapter.get().getUserName();
-    }
 }

app/src/main/java/fr/free/nrw/commons/di/ContentProviderBuilderModule.java

@@ -7,6 +7,7 @@ import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesContentProvider;
 import fr.free.nrw.commons.category.CategoryContentProvider;
 import fr.free.nrw.commons.contributions.ContributionsContentProvider;
 import fr.free.nrw.commons.explore.recentsearches.RecentSearchesContentProvider;
+import fr.free.nrw.commons.modifications.ModificationsContentProvider;
 
 @Module
 @SuppressWarnings({"WeakerAccess", "unused"})
@@ -15,6 +16,9 @@ public abstract class ContentProviderBuilderModule {
     @ContributesAndroidInjector
     abstract ContributionsContentProvider bindContributionsContentProvider();
 
+    @ContributesAndroidInjector
+    abstract ModificationsContentProvider bindModificationsContentProvider();
+
     @ContributesAndroidInjector
     abstract CategoryContentProvider bindCategoryContentProvider();
 

app/src/main/java/fr/free/nrw/commons/di/NetworkingModule.java

@@ -2,16 +2,11 @@ package fr.free.nrw.commons.di;
 
 import android.content.Context;
 
-import androidx.annotation.NonNull;
-
 import com.google.gson.Gson;
 
-import org.wikipedia.csrf.CsrfTokenClient;
-import org.wikipedia.dataclient.Service;
 import org.wikipedia.dataclient.ServiceFactory;
 import org.wikipedia.dataclient.WikiSite;
 import org.wikipedia.json.GsonUtil;
-import org.wikipedia.login.LoginClient;
 
 import java.io.File;
 import java.util.concurrent.TimeUnit;
@@ -19,19 +14,15 @@ import java.util.concurrent.TimeUnit;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
+import androidx.annotation.NonNull;
 import dagger.Module;
 import dagger.Provides;
 import fr.free.nrw.commons.BuildConfig;
-import fr.free.nrw.commons.actions.PageEditClient;
-import fr.free.nrw.commons.actions.PageEditInterface;
-import fr.free.nrw.commons.category.CategoryInterface;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
-import fr.free.nrw.commons.media.MediaInterface;
 import fr.free.nrw.commons.mwapi.ApacheHttpClientMediaWikiApi;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
 import fr.free.nrw.commons.review.ReviewInterface;
-import fr.free.nrw.commons.upload.UploadInterface;
 import okhttp3.Cache;
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
@@ -48,12 +39,6 @@ public class NetworkingModule {
 
     public static final long OK_HTTP_CACHE_SIZE = 10 * 1024 * 1024;
 
-    public static final String NAMED_COMMONS_WIKI_SITE = "commons-wikisite";
-    private static final String NAMED_WIKI_DATA_WIKI_SITE = "wikidata-wikisite";
-
-    public static final String NAMED_COMMONS_CSRF = "commons-csrf";
-    public static final String NAMED_WIKI_DATA_CSRF = "wikidata-csrf";
-
     @Provides
     @Singleton
     public OkHttpClient provideOkHttpClient(Context context,
@@ -82,7 +67,7 @@ public class NetworkingModule {
     public MediaWikiApi provideMediaWikiApi(Context context,
                                             @Named("default_preferences") JsonKvStore defaultKvStore,
                                             Gson gson) {
-        return new ApacheHttpClientMediaWikiApi(BuildConfig.WIKIMEDIA_API_HOST);
+        return new ApacheHttpClientMediaWikiApi(context, BuildConfig.WIKIMEDIA_API_HOST, BuildConfig.WIKIDATA_API_HOST, defaultKvStore, gson);
     }
 
     @Provides
@@ -96,30 +81,10 @@ public class NetworkingModule {
                 WIKIDATA_SPARQL_QUERY_URL,
                 BuildConfig.WIKIMEDIA_CAMPAIGNS_URL,
                 BuildConfig.WIKIMEDIA_API_HOST,
+                defaultKvStore,
                 gson);
     }
 
-    @Named(NAMED_COMMONS_CSRF)
-    @Provides
-    @Singleton
-    public CsrfTokenClient provideCommonsCsrfTokenClient(@Named(NAMED_COMMONS_WIKI_SITE) WikiSite commonsWikiSite) {
-        return new CsrfTokenClient(commonsWikiSite, commonsWikiSite);
-    }
-
-    @Named(NAMED_WIKI_DATA_CSRF)
-    @Provides
-    @Singleton
-    public CsrfTokenClient provideWikidataCsrfTokenClient(@Named(NAMED_COMMONS_WIKI_SITE) WikiSite commonsWikiSite,
-                                                          @Named(NAMED_WIKI_DATA_WIKI_SITE) WikiSite wikidataWikiSite) {
-        return new CsrfTokenClient(wikidataWikiSite, commonsWikiSite);
-    }
-
-    @Provides
-    @Singleton
-    public LoginClient provideLoginClient() {
-        return new LoginClient();
-    }
-
     @Provides
     @Named("wikimedia_api_host")
     @NonNull
@@ -136,20 +101,6 @@ public class NetworkingModule {
         return HttpUrl.parse(TOOLS_FORGE_URL);
     }
 
-    @Provides
-    @Singleton
-    @Named(NAMED_COMMONS_WIKI_SITE)
-    public WikiSite provideCommonsWikiSite() {
-        return new WikiSite(BuildConfig.COMMONS_URL);
-    }
-
-    @Provides
-    @Singleton
-    @Named(NAMED_WIKI_DATA_WIKI_SITE)
-    public WikiSite provideWikidataWikiSite() {
-        return new WikiSite(BuildConfig.WIKIDATA_URL);
-    }
-
     /**
      * Gson objects are very heavy. The app should ideally be using just one instance of it instead of creating new instances everywhere.
      * @return returns a singleton Gson instance
@@ -162,71 +113,14 @@ public class NetworkingModule {
 
     @Provides
     @Singleton
-    @Named("commons-service")
-    public Service provideCommonsService(@Named(NAMED_COMMONS_WIKI_SITE) WikiSite commonsWikiSite) {
-        return ServiceFactory.get(commonsWikiSite);
+    @Named("commons-wikisite")
+    public WikiSite provideCommonsWikiSite() {
+        return new WikiSite(BuildConfig.COMMONS_URL);
     }
 
     @Provides
     @Singleton
-    @Named("wikidata-service")
-    public Service provideWikidataService(@Named(NAMED_WIKI_DATA_WIKI_SITE) WikiSite wikidataWikiSite) {
-        return ServiceFactory.get(wikidataWikiSite, BuildConfig.WIKIDATA_URL, Service.class);
-    }
-
-    @Provides
-    @Singleton
-    public ReviewInterface provideReviewInterface(@Named(NAMED_COMMONS_WIKI_SITE) WikiSite commonsWikiSite) {
+    public ReviewInterface provideReviewInterface(@Named("commons-wikisite") WikiSite commonsWikiSite) {
         return ServiceFactory.get(commonsWikiSite, BuildConfig.COMMONS_URL, ReviewInterface.class);
     }
-
-    @Provides
-    @Singleton
-    public UploadInterface provideUploadInterface(@Named(NAMED_COMMONS_WIKI_SITE) WikiSite commonsWikiSite) {
-        return ServiceFactory.get(commonsWikiSite, BuildConfig.COMMONS_URL, UploadInterface.class);
-    }
-
-    @Named("commons-page-edit-service")
-    @Provides
-    @Singleton
-    public PageEditInterface providePageEditService(@Named(NAMED_COMMONS_WIKI_SITE) WikiSite commonsWikiSite) {
-        return ServiceFactory.get(commonsWikiSite, BuildConfig.COMMONS_URL, PageEditInterface.class);
-    }
-
-    @Named("wikidata-page-edit-service")
-    @Provides
-    @Singleton
-    public PageEditInterface provideWikiDataPageEditService(@Named(NAMED_WIKI_DATA_WIKI_SITE) WikiSite wikiDataWikiSite) {
-        return ServiceFactory.get(wikiDataWikiSite, BuildConfig.WIKIDATA_URL, PageEditInterface.class);
-    }
-
-    @Named("commons-page-edit")
-    @Provides
-    @Singleton
-    public PageEditClient provideCommonsPageEditClient(@Named(NAMED_COMMONS_CSRF) CsrfTokenClient csrfTokenClient,
-                                                       @Named("commons-page-edit-service") PageEditInterface pageEditInterface,
-                                                       @Named("commons-service") Service service) {
-        return new PageEditClient(csrfTokenClient, pageEditInterface, service);
-    }
-
-    @Named("wikidata-page-edit")
-    @Provides
-    @Singleton
-    public PageEditClient provideWikidataPageEditClient(@Named(NAMED_WIKI_DATA_CSRF) CsrfTokenClient csrfTokenClient,
-                                                        @Named("wikidata-page-edit-service") PageEditInterface pageEditInterface,
-                                                        @Named("wikidata-service") Service service) {
-        return new PageEditClient(csrfTokenClient, pageEditInterface, service);
-    }
-
-    @Provides
-    @Singleton
-    public MediaInterface provideMediaInterface(@Named(NAMED_COMMONS_WIKI_SITE) WikiSite commonsWikiSite) {
-        return ServiceFactory.get(commonsWikiSite, BuildConfig.COMMONS_URL, MediaInterface.class);
-    }
-
-    @Provides
-    @Singleton
-    public CategoryInterface provideCategoryInterface(@Named(NAMED_COMMONS_WIKI_SITE) WikiSite commonsWikiSite) {
-        return ServiceFactory.get(commonsWikiSite, BuildConfig.COMMONS_URL, CategoryInterface.class);
-    }
 }