Contributions loading fix

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

@@ -24,6 +24,8 @@ protected void requestAuthToken() {
         authCookie = sessionManager.getAuthCookie();
         if (authCookie != null) {
             onAuthCookieAcquired(authCookie);
+        } else {
+            sessionManager.forceLogin(AuthenticatedActivity.this);
         }
     }
 

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

@@ -6,6 +6,7 @@
 import android.accounts.AccountManager;
 import android.app.Activity;
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
@@ -405,6 +406,11 @@ private void showMessage(@StringRes int resId, @ColorRes int colorResId) {
         errorMessageContainer.setVisibility(VISIBLE);
     }
 
+    public static void startYourself(Context context) {
+        Intent intent = new Intent(context, LoginActivity.class);
+        context.startActivity(intent);
+    }
+
     private AppCompatDelegate getDelegate() {
         if (delegate == null) {
             delegate = AppCompatDelegate.create(this, null);

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

@@ -4,6 +4,7 @@
 import android.accounts.AccountManager;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.support.annotation.Nullable;
 
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import io.reactivex.Completable;
@@ -60,21 +61,40 @@ public Boolean revalidateAuthToken() {
         return true;
     }
 
+    /**
+     * Anyone calling this function should check if the auth cookie was returned and accordingly handle exceptional scenario.
+     * @return
+     */
+    @Nullable
     public String getAuthCookie() {
         boolean isLoggedIn = sharedPreferences.getBoolean("isUserLoggedIn", false);
 
         if (!isLoggedIn) {
             Timber.e("User is not logged in");
             return null;
         } else {
-            String authCookie = sharedPreferences.getString("getAuthCookie", null);
+            String authCookie = getGetAuthCookieFromStorage();
             if (authCookie == null) {
-                Timber.e("Auth cookie is null even after login");
+                if (revalidateAuthToken()) {
+                    return getGetAuthCookieFromStorage();
+                } else {
+                    Timber.e("Auth cookie is null even after login");
+                }
             }
             return authCookie;
         }
     }
 
+    private String getGetAuthCookieFromStorage() {
+        return sharedPreferences.getString("getAuthCookie", null);
+    }
+
+    public void forceLogin(Context context) {
+        if (context != null) {
+            LoginActivity.startYourself(context);
+        }
+    }
+
     public Completable clearAllAccounts() {
         AccountManager accountManager = AccountManager.get(context);
         Account[] allAccounts = accountManager.getAccountsByType(ACCOUNT_TYPE);

app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncAdapter.java

@@ -57,6 +57,7 @@ public void onPerformSync(Account account, Bundle bundle, String s, ContentProvi
 
         String authCookie = sessionManager.getAuthCookie();
         if (isNullOrWhiteSpace(authCookie)) {
+            sessionManager.forceLogin(getContext());
             Timber.d("Could not authenticate :(");
             return;
         }

app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java

@@ -160,10 +160,14 @@ private String getErrorCodeToReturn(ApiResult loginApiResult) {
     }
 
     private void setAuthCookieOnLogin(boolean isLoggedIn) {
+        saveAuthCookie(isLoggedIn, api.getAuthCookie());
+    }
+
+    private void saveAuthCookie(boolean isLoggedIn, String authCookie) {
         SharedPreferences.Editor editor = sharedPreferences.edit();
         if (isLoggedIn) {
             editor.putBoolean("isUserLoggedIn", true);
-            editor.putString("getAuthCookie", api.getAuthCookie());
+            editor.putString("getAuthCookie", authCookie);
         } else {
             editor.putBoolean("isUserLoggedIn", false);
             editor.remove("getAuthCookie");
@@ -179,6 +183,7 @@ public String getAuthCookie() {
     @Override
     public void setAuthCookie(String authCookie) {
         api.setAuthCookie(authCookie);
+        saveAuthCookie(true, authCookie);
     }
 
     @Override