Remove the data-client app adapter implementation (commons-app#5499)

* logErrorsInsteadOfCrashing only ever returned false, so remove it and simplify logger

* Removed unused getMediaWikiBaseUrl()

* Removed getDesiredLeadImageDp() from commons app adapter, since it's unused

* Inlined the isLoggedIn() method of the app adapter

* Inline the app adapter username/password

* Removed the unused getRestbaseUriFormat() from the commons app adapter

* Remove references to the data-client SharedPreferenceCookieManager

* Manage our own OkHttpClient and remove the AppAdapter implementation

Author: psh

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

@@ -41,6 +41,7 @@
 import fr.free.nrw.commons.settings.Prefs;
 import fr.free.nrw.commons.upload.FileUtils;
 import fr.free.nrw.commons.utils.ConfigUtils;
+import fr.free.nrw.commons.wikidata.cookies.CommonsCookieJar;
 import io.reactivex.Completable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.internal.functions.Functions;
@@ -58,7 +59,6 @@
 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;
 
@@ -94,6 +94,9 @@ public class CommonsApplication extends MultiDexApplication {
     @Named("default_preferences")
     JsonKvStore defaultPrefs;
 
+    @Inject
+    CommonsCookieJar cookieJar;
+
     @Inject
     CustomOkHttpNetworkFetcher customOkHttpNetworkFetcher;
 
@@ -161,8 +164,6 @@ public void onCreate() {
             .getCommonsApplicationComponent()
             .inject(this);
 
-        AppAdapter.set(new CommonsAppAdapter(sessionManager, defaultPrefs));
-
         initTimber();
 
         if (!defaultPrefs.getBoolean("has_user_manually_removed_location")) {

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

@@ -1,9 +1,9 @@
 package fr.free.nrw.commons;
 
 import androidx.annotation.NonNull;
+import fr.free.nrw.commons.wikidata.cookies.CommonsCookieJar;
 import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -15,28 +15,27 @@
 import okhttp3.ResponseBody;
 import okhttp3.logging.HttpLoggingInterceptor;
 import okhttp3.logging.HttpLoggingInterceptor.Level;
-import org.wikipedia.dataclient.SharedPreferenceCookieManager;
 import org.wikipedia.dataclient.okhttp.HttpStatusException;
 import timber.log.Timber;
 
 public final class OkHttpConnectionFactory {
     private static final String CACHE_DIR_NAME = "okhttp-cache";
     private static final long NET_CACHE_SIZE = 64 * 1024 * 1024;
-    @NonNull private static final Cache NET_CACHE = new Cache(new File(CommonsApplication.getInstance().getCacheDir(),
-            CACHE_DIR_NAME), NET_CACHE_SIZE);
 
-    @NonNull
-    private static final OkHttpClient CLIENT = createClient();
+    public static OkHttpClient CLIENT;
 
-    @NonNull public static OkHttpClient getClient() {
+    @NonNull public static OkHttpClient getClient(final CommonsCookieJar cookieJar) {
+        if (CLIENT == null) {
+            CLIENT = createClient(cookieJar);
+        }
         return CLIENT;
     }
 
     @NonNull
-    private static OkHttpClient createClient() {
+    private static OkHttpClient createClient(final CommonsCookieJar cookieJar) {
         return new OkHttpClient.Builder()
-                .cookieJar(SharedPreferenceCookieManager.getInstance())
-                .cache(NET_CACHE)
+                .cookieJar(cookieJar)
+                .cache(new Cache(new File(CommonsApplication.getInstance().getCacheDir(), CACHE_DIR_NAME), NET_CACHE_SIZE))
                 .connectTimeout(120, TimeUnit.SECONDS)
                 .writeTimeout(120, TimeUnit.SECONDS)
                 .readTimeout(120, TimeUnit.SECONDS)

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

@@ -2,8 +2,6 @@ package fr.free.nrw.commons.auth.csrf
 
 import androidx.annotation.VisibleForTesting
 import fr.free.nrw.commons.auth.SessionManager
-import org.wikipedia.AppAdapter
-import org.wikipedia.dataclient.SharedPreferenceCookieManager
 import org.wikipedia.dataclient.mwapi.MwQueryResponse
 import fr.free.nrw.commons.auth.login.LoginClient
 import fr.free.nrw.commons.auth.login.LoginCallback
@@ -19,16 +17,17 @@ import java.util.concurrent.Executors.newSingleThreadExecutor
 class CsrfTokenClient(
     private val sessionManager: SessionManager,
     private val csrfTokenInterface: CsrfTokenInterface,
-    private val loginClient: LoginClient
+    private val loginClient: LoginClient,
+    private val logoutClient: LogoutClient
 ) {
     private var retries = 0
     private var csrfTokenCall: Call<MwQueryResponse?>? = null
 
     @Throws(Throwable::class)
     fun getTokenBlocking(): String {
         var token = ""
-        val userName = AppAdapter.get().getUserName()
-        val password = AppAdapter.get().getPassword()
+        val userName = sessionManager.userName ?: ""
+        val password = sessionManager.password ?: ""
 
         for (retry in 0 until MAX_RETRIES_OF_LOGIN_BLOCKING) {
             try {
@@ -47,7 +46,7 @@ class CsrfTokenClient(
                 }
 
                 token = response.body()!!.query()!!.csrfToken()!!
-                if (AppAdapter.get().isLoggedIn() && token == ANON_TOKEN) {
+                if (sessionManager.isUserLoggedIn && token == ANON_TOKEN) {
                     throw RuntimeException("App believes we're logged in, but got anonymous token.")
                 }
                 break
@@ -66,7 +65,7 @@ class CsrfTokenClient(
     fun request(service: CsrfTokenInterface, cb: Callback): Call<MwQueryResponse?> =
         requestToken(service, object : Callback {
             override fun success(token: String?) {
-                if (AppAdapter.get().isLoggedIn() && token == ANON_TOKEN) {
+                if (sessionManager.isUserLoggedIn && token == ANON_TOKEN) {
                     retryWithLogin(cb) {
                         RuntimeException("App believes we're logged in, but got anonymous token.")
                     }
@@ -102,11 +101,11 @@ class CsrfTokenClient(
     }
 
     private fun retryWithLogin(callback: Callback, caught: () -> Throwable?) {
-        val userName = AppAdapter.get().getUserName()
-        val password = AppAdapter.get().getPassword()
+        val userName = sessionManager.userName
+        val password = sessionManager.password
         if (retries < MAX_RETRIES && !userName.isNullOrEmpty() && !password.isNullOrEmpty()) {
             retries++
-            SharedPreferenceCookieManager.getInstance().clearAllCookies()
+            logoutClient.logout()
             login(userName, password, callback) {
                 Timber.i("retrying...")
                 cancel()

app/src/main/java/fr/free/nrw/commons/auth/csrf/CsrfTokenClient.kt

@@ -0,0 +1,8 @@
+package fr.free.nrw.commons.auth.csrf
+
+import fr.free.nrw.commons.wikidata.cookies.CommonsCookieStorage
+import javax.inject.Inject
+
+class LogoutClient @Inject constructor(private val store: CommonsCookieStorage) {
+    fun logout() = store.clear()
+}

app/src/main/java/fr/free/nrw/commons/auth/csrf/LogoutClient.kt

@@ -257,8 +257,8 @@ public Scheduler providesMainThread() {
 
     @Named("username")
     @Provides
-    public String provideLoggedInUsername() {
-        return Objects.toString(AppAdapter.get().getUserName(), "");
+    public String provideLoggedInUsername(SessionManager sessionManager) {
+        return Objects.toString(sessionManager.getUserName(), "");
     }
 
     @Provides

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

@@ -12,7 +12,10 @@
 import fr.free.nrw.commons.actions.PageEditInterface;
 import fr.free.nrw.commons.actions.ThanksInterface;
 import fr.free.nrw.commons.auth.SessionManager;
+import fr.free.nrw.commons.auth.csrf.CsrfTokenClient;
 import fr.free.nrw.commons.auth.csrf.CsrfTokenInterface;
+import fr.free.nrw.commons.auth.csrf.LogoutClient;
+import fr.free.nrw.commons.auth.login.LoginClient;
 import fr.free.nrw.commons.auth.login.LoginInterface;
 import fr.free.nrw.commons.category.CategoryInterface;
 import fr.free.nrw.commons.explore.depictions.DepictsClient;
@@ -30,6 +33,8 @@
 import fr.free.nrw.commons.upload.depicts.DepictsInterface;
 import fr.free.nrw.commons.wikidata.CommonsServiceFactory;
 import fr.free.nrw.commons.wikidata.WikidataInterface;
+import fr.free.nrw.commons.wikidata.cookies.CommonsCookieJar;
+import fr.free.nrw.commons.wikidata.cookies.CommonsCookieStorage;
 import java.io.File;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
@@ -40,11 +45,8 @@
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;
 import okhttp3.logging.HttpLoggingInterceptor.Level;
-import fr.free.nrw.commons.auth.csrf.CsrfTokenClient;
-import org.wikipedia.AppAdapter;
 import org.wikipedia.dataclient.WikiSite;
 import org.wikipedia.json.GsonUtil;
-import fr.free.nrw.commons.auth.login.LoginClient;
 import timber.log.Timber;
 
 @Module
@@ -78,8 +80,8 @@ public OkHttpClient provideOkHttpClient(Context context,
 
     @Provides
     @Singleton
-    public CommonsServiceFactory serviceFactory() {
-        return new CommonsServiceFactory(AppAdapter.get().getOkHttpClient());
+    public CommonsServiceFactory serviceFactory(CommonsCookieJar cookieJar) {
+        return new CommonsServiceFactory(OkHttpConnectionFactory.getClient(cookieJar));
     }
 
     @Provides
@@ -107,12 +109,27 @@ public OkHttpJsonApiClient provideOkHttpJsonApiClient(OkHttpClient okHttpClient,
             gson);
     }
 
+    @Provides
+    @Singleton
+    public CommonsCookieStorage provideCookieStorage(
+        @Named("default_preferences") JsonKvStore preferences) {
+        CommonsCookieStorage cookieStorage = new CommonsCookieStorage(preferences);
+        cookieStorage.load();
+        return cookieStorage;
+    }
+
+    @Provides
+    @Singleton
+    public CommonsCookieJar provideCookieJar(CommonsCookieStorage storage) {
+        return new CommonsCookieJar(storage);
+    }
+
     @Named(NAMED_COMMONS_CSRF)
     @Provides
     @Singleton
     public CsrfTokenClient provideCommonsCsrfTokenClient(SessionManager sessionManager,
-        CsrfTokenInterface tokenInterface, LoginClient loginClient) {
-        return new CsrfTokenClient(sessionManager, tokenInterface, loginClient);
+        CsrfTokenInterface tokenInterface, LoginClient loginClient, LogoutClient logoutClient) {
+        return new CsrfTokenClient(sessionManager, tokenInterface, loginClient, logoutClient);
     }
 
     @Provides