Further reduce code calling back to the CommonsApplication by pulling out a SessionManager to manage our current account.

Author: psh

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

@@ -1,11 +1,5 @@
 package fr.free.nrw.commons;
 
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.accounts.AccountManagerCallback;
-import android.accounts.AccountManagerFuture;
-import android.accounts.AuthenticatorException;
-import android.accounts.OperationCanceledException;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
@@ -20,13 +14,12 @@
 import org.acra.annotation.ReportsCrashes;
 
 import java.io.File;
-import java.io.IOException;
 
 import javax.inject.Inject;
 
 import dagger.android.AndroidInjector;
 import dagger.android.DaggerApplication;
-import fr.free.nrw.commons.auth.AccountUtil;
+import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.contributions.Contribution;
 import fr.free.nrw.commons.data.Category;
 import fr.free.nrw.commons.data.DBOpenHelper;
@@ -37,6 +30,8 @@
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import fr.free.nrw.commons.theme.NavigationBaseActivity;
 import fr.free.nrw.commons.utils.FileUtils;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 import timber.log.Timber;
 
 // TODO: Use ProGuard to rip out reporting when publishing
@@ -51,10 +46,9 @@
 public class CommonsApplication extends DaggerApplication {
 
     @Inject MediaWikiApi mediaWikiApi;
-    @Inject AccountUtil accountUtil;
+    @Inject SessionManager sessionManager;
     @Inject DBOpenHelper dbOpenHelper;
 
-    private Account currentAccount = null; // Unlike a savings account...
     public static final String API_URL = "https://commons.wikimedia.org/w/api.php";
     public static final String IMAGE_URL_BASE = "https://upload.wikimedia.org/wikipedia/commons";
     public static final String HOME_URL = "https://commons.wikimedia.org/wiki/";
@@ -113,39 +107,6 @@ public CommonsApplicationComponent injector() {
         return component;
     }
 
-    /**
-     * @return Account|null
-     */
-    public Account getCurrentAccount() {
-        if (currentAccount == null) {
-            AccountManager accountManager = AccountManager.get(this);
-            Account[] allAccounts = accountManager.getAccountsByType(accountUtil.accountType());
-            if (allAccounts.length != 0) {
-                currentAccount = allAccounts[0];
-            }
-        }
-        return currentAccount;
-    }
-
-    public Boolean revalidateAuthToken() {
-        AccountManager accountManager = AccountManager.get(this);
-        Account curAccount = getCurrentAccount();
-
-        if (curAccount == null) {
-            return false; // This should never happen
-        }
-
-        accountManager.invalidateAuthToken(accountUtil.accountType(), mediaWikiApi.getAuthCookie());
-        try {
-            String authCookie = accountManager.blockingGetAuthToken(curAccount, "", false);
-            mediaWikiApi.setAuthCookie(authCookie);
-            return true;
-        } catch (OperationCanceledException | NullPointerException | IOException | AuthenticatorException e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
     public void clearApplicationData(Context context, NavigationBaseActivity.LogoutListener logoutListener) {
         File cacheDirectory = context.getCacheDir();
         File applicationDirectory = new File(cacheDirectory.getParent());
@@ -158,36 +119,10 @@ public void clearApplicationData(Context context, NavigationBaseActivity.LogoutL
             }
         }
 
-        AccountManager accountManager = AccountManager.get(this);
-        Account[] allAccounts = accountManager.getAccountsByType(accountUtil.accountType());
-
-        AccountManagerCallback<Boolean> amCallback = new AccountManagerCallback<Boolean>() {
-
-            private int index = 0;
-
-            void setIndex(int index) {
-                this.index = index;
-            }
-
-            int getIndex() {
-                return index;
-            }
-
-            @Override
-            public void run(AccountManagerFuture<Boolean> accountManagerFuture) {
-                setIndex(getIndex() + 1);
-
-                try {
-                    if (accountManagerFuture != null) {
-                        if (accountManagerFuture.getResult()) {
-                            Timber.d("Account removed successfully.");
-                        }
-                    }
-                } catch (OperationCanceledException | IOException | AuthenticatorException e) {
-                    e.printStackTrace();
-                }
-
-                if (getIndex() == allAccounts.length) {
+        sessionManager.clearAllAccounts()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(() -> {
                     Timber.d("All accounts have been removed");
                     //TODO: fix preference manager
                     PreferenceManager.getDefaultSharedPreferences(CommonsApplication.this).edit().clear().commit();
@@ -197,22 +132,15 @@ public void run(AccountManagerFuture<Boolean> accountManagerFuture) {
                     context.getSharedPreferences("prefs", Context.MODE_PRIVATE).edit().clear().commit();
                     preferences.edit().putBoolean("firstrun", false).apply();
                     updateAllDatabases();
-                    currentAccount = null;
 
                     logoutListener.onLogoutComplete();
-                }
-            }
-        };
-
-        for (Account account : allAccounts) {
-            accountManager.removeAccount(account, amCallback, null);
-        }
+                });
     }
 
     /**
      * Deletes all tables and re-creates them.
      */
-    public void updateAllDatabases() {
+    private void updateAllDatabases() {
         dbOpenHelper.getReadableDatabase().close();
         SQLiteDatabase db = dbOpenHelper.getWritableDatabase();
 

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

@@ -18,7 +18,6 @@
 import timber.log.Timber;
 
 public class MediaWikiImageView extends SimpleDraweeView {
-    @Inject CommonsApplication application;
     @Inject MediaWikiApi mwApi;
     @Inject LruCache<String, String> thumbnailUrlCache;
 

app/src/main/java/fr/free/nrw/commons/auth/AccountUtil.java

@@ -4,24 +4,21 @@
 import android.accounts.AccountAuthenticatorResponse;
 import android.accounts.AccountManager;
 import android.content.ContentResolver;
+import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import javax.inject.Inject;
-
-import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.contributions.ContributionsContentProvider;
 import fr.free.nrw.commons.modifications.ModificationsContentProvider;
 import timber.log.Timber;
 
 public class AccountUtil {
 
-    private final CommonsApplication application;
+    private Context context;
 
-    @Inject
-    public AccountUtil(CommonsApplication application) {
-        this.application = application;
+    public AccountUtil(Context context) {
+        this.context = context;
     }
 
     public void createAccount(@Nullable AccountAuthenticatorResponse response,
@@ -60,7 +57,7 @@ public String accountType() {
     }
 
     private AccountManager accountManager() {
-        return AccountManager.get(application);
+        return AccountManager.get(context);
     }
 
 }

app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java

@@ -7,8 +7,6 @@
 
 import javax.inject.Inject;
 
-import dagger.android.AndroidInjection;
-import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.theme.NavigationBaseActivity;
 import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -17,8 +15,8 @@
 
 public abstract class AuthenticatedActivity extends NavigationBaseActivity {
 
-    @Inject CommonsApplication app;
     @Inject AccountUtil accountUtil;
+    @Inject SessionManager sessionManager;
 
     private String authCookie;
 
@@ -59,7 +57,7 @@ protected void requestAuthToken() {
             return;
         }
         AccountManager accountManager = AccountManager.get(this);
-        Account curAccount = app.getCurrentAccount();
+        Account curAccount = sessionManager.getCurrentAccount();
         if(curAccount == null) {
             addAccount(accountManager);
         } else {

app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java

@@ -19,11 +19,9 @@
 
 import dagger.android.AndroidInjection;
 import fr.free.nrw.commons.BuildConfig;
-import fr.free.nrw.commons.CommonsApplication;
+import fr.free.nrw.commons.PageTitle;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.WelcomeActivity;
-
-import fr.free.nrw.commons.PageTitle;
 import fr.free.nrw.commons.contributions.ContributionsActivity;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import timber.log.Timber;
@@ -36,9 +34,9 @@ public class LoginActivity extends AccountAuthenticatorActivity {
 
     public static final String PARAM_USERNAME = "fr.free.nrw.commons.login.username";
 
-    @Inject CommonsApplication application;
     @Inject MediaWikiApi mwApi;
     @Inject AccountUtil accountUtil;
+    @Inject SessionManager sessionManager;
 
     private SharedPreferences prefs = null;
 
@@ -114,7 +112,7 @@ protected void onResume() {
             WelcomeActivity.startYourself(this);
             prefs.edit().putBoolean("firstrun", false).apply();
         }
-        if (application.getCurrentAccount() != null) {
+        if (sessionManager.getCurrentAccount() != null) {
             startMainActivity();
         }
     }
@@ -147,7 +145,7 @@ private LoginTask getLoginTask() {
                 canonicializeUsername(usernameEdit.getText().toString()),
                 passwordEdit.getText().toString(),
                 twoFactorEdit.getText().toString(),
-                accountUtil, application, mwApi
+                accountUtil, this, mwApi
         );
     }
 

app/src/main/java/fr/free/nrw/commons/auth/LoginTask.java

@@ -3,6 +3,7 @@
 import android.accounts.AccountAuthenticatorResponse;
 import android.accounts.AccountManager;
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
 
@@ -21,16 +22,18 @@ class LoginTask extends AsyncTask<String, String, String> {
     private String password;
     private String twoFactorCode = "";
     private AccountUtil accountUtil;
-    private CommonsApplication app;
+    private Context context;
     private MediaWikiApi mwApi;
 
-    public LoginTask(LoginActivity loginActivity, String username, String password, String twoFactorCode, AccountUtil accountUtil, CommonsApplication application, MediaWikiApi mwApi) {
+    public LoginTask(LoginActivity loginActivity, String username, String password,
+                     String twoFactorCode, AccountUtil accountUtil,
+                     Context context, MediaWikiApi mwApi) {
         this.loginActivity = loginActivity;
         this.username = username;
         this.password = password;
         this.twoFactorCode = twoFactorCode;
         this.accountUtil = accountUtil;
-        this.app = application;
+        this.context = context;
         this.mwApi = mwApi;
     }
 
@@ -64,7 +67,7 @@ protected void onPostExecute(String result) {
         super.onPostExecute(result);
         Timber.d("Login done!");
 
-        EventLog.schema(CommonsApplication.EVENT_LOGIN_ATTEMPT, app, mwApi)
+        EventLog.schema(CommonsApplication.EVENT_LOGIN_ATTEMPT, context, mwApi)
                 .param("username", username)
                 .param("result", result)
                 .log();

app/src/main/java/fr/free/nrw/commons/auth/SessionManager.java

@@ -0,0 +1,71 @@
+package fr.free.nrw.commons.auth;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AuthenticatorException;
+import android.accounts.OperationCanceledException;
+import android.content.Context;
+
+import java.io.IOException;
+
+import fr.free.nrw.commons.mwapi.MediaWikiApi;
+import io.reactivex.Completable;
+import io.reactivex.Observable;
+
+/**
+ * Manage the current logged in user session.
+ */
+public class SessionManager {
+    private final Context context;
+    private final AccountUtil accountUtil;
+    private final MediaWikiApi mediaWikiApi;
+    private Account currentAccount; // Unlike a savings account...  ;-)
+
+    public SessionManager(Context context, AccountUtil accountUtil, MediaWikiApi mediaWikiApi) {
+        this.context = context;
+        this.accountUtil = accountUtil;
+        this.mediaWikiApi = mediaWikiApi;
+        this.currentAccount = null;
+    }
+
+    /**
+     * @return Account|null
+     */
+    public Account getCurrentAccount() {
+        if (currentAccount == null) {
+            AccountManager accountManager = AccountManager.get(context);
+            Account[] allAccounts = accountManager.getAccountsByType(accountUtil.accountType());
+            if (allAccounts.length != 0) {
+                currentAccount = allAccounts[0];
+            }
+        }
+        return currentAccount;
+    }
+
+    public Boolean revalidateAuthToken() {
+        AccountManager accountManager = AccountManager.get(context);
+        Account curAccount = getCurrentAccount();
+
+        if (curAccount == null) {
+            return false; // This should never happen
+        }
+
+        accountManager.invalidateAuthToken(accountUtil.accountType(), mediaWikiApi.getAuthCookie());
+        try {
+            String authCookie = accountManager.blockingGetAuthToken(curAccount, "", false);
+            mediaWikiApi.setAuthCookie(authCookie);
+            return true;
+        } catch (OperationCanceledException | NullPointerException | IOException | AuthenticatorException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public Completable clearAllAccounts() {
+        AccountManager accountManager = AccountManager.get(context);
+        Account[] allAccounts = accountManager.getAccountsByType(accountUtil.accountType());
+        return Completable.fromObservable(Observable.fromArray(allAccounts)
+                .map(a -> accountManager.removeAccount(a, null, null).getResult()))
+                .doOnComplete(() -> currentAccount = null);
+    }
+}