Merge remote-tracking branch 'refs/remotes/origin/2.8-release'

Author: misaochan

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

@@ -1,10 +1,15 @@
 package fr.free.nrw.commons.auth;
 
+import android.accounts.Account;
+import android.accounts.AccountManager;
 import android.content.Context;
+import android.support.annotation.Nullable;
+
+import fr.free.nrw.commons.BuildConfig;
+import timber.log.Timber;
 
 public class AccountUtil {
 
-    public static final String ACCOUNT_TYPE = "fr.free.nrw.commons";
     public static final String AUTH_COOKIE = "authCookie";
     public static final String AUTH_TOKEN_TYPE = "CommonsAndroid";
     private final Context context;
@@ -13,4 +18,36 @@ public AccountUtil(Context context) {
         this.context = context;
     }
 
+    /**
+     * @return Account|null
+     */
+    @Nullable
+    public static Account account(Context context) {
+        try {
+            Account[] accounts = accountManager(context).getAccountsByType(BuildConfig.ACCOUNT_TYPE);
+            if (accounts.length > 0) {
+                return accounts[0];
+            }
+        } catch (SecurityException e) {
+            Timber.e(e);
+        }
+        return null;
+    }
+
+    @Nullable
+    public static String getUserName(Context context) {
+        Account account = account(context);
+        return account == null ? null : account.name;
+    }
+
+    @Nullable
+    public static String getPassword(Context context) {
+        Account account = account(context);
+        return account == null ? null : accountManager(context).getPassword(account);
+    }
+
+    private static AccountManager accountManager(Context context) {
+        return AccountManager.get(context);
+    }
+
 }

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

@@ -55,7 +55,6 @@
 import static android.view.KeyEvent.KEYCODE_ENTER;
 import static android.view.View.VISIBLE;
 import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE;
-import static fr.free.nrw.commons.auth.AccountUtil.ACCOUNT_TYPE;
 import static fr.free.nrw.commons.auth.AccountUtil.AUTH_TOKEN_TYPE;
 
 public class LoginActivity extends AccountAuthenticatorActivity {
@@ -242,7 +241,7 @@ private void handlePassResult(String username, String password) {
             if (response != null) {
                 Bundle authResult = new Bundle();
                 authResult.putString(AccountManager.KEY_ACCOUNT_NAME, username);
-                authResult.putString(AccountManager.KEY_ACCOUNT_TYPE, ACCOUNT_TYPE);
+                authResult.putString(AccountManager.KEY_ACCOUNT_TYPE, BuildConfig.ACCOUNT_TYPE);
                 response.onResult(authResult);
             }
         }

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

@@ -76,10 +76,6 @@ public void createAccount(@Nullable AccountAuthenticatorResponse response,
         ContentResolver.setSyncAutomatically(account, BuildConfig.MODIFICATION_AUTHORITY, true); // Enable sync by default!
     }
 
-    private AccountManager accountManager() {
-        return AccountManager.get(context);
-    }
-
     /**
      * @return Account|null
      */
@@ -95,6 +91,22 @@ public Account getCurrentAccount() {
         return currentAccount;
     }
 
+    @Nullable
+    public String getUserName() {
+        Account account = getCurrentAccount();
+        return account == null ? null : account.name;
+    }
+
+    @Nullable
+    public String getPassword() {
+        Account account = getCurrentAccount();
+        return account == null ? null : accountManager().getPassword(account);
+    }
+
+    private AccountManager accountManager() {
+        return AccountManager.get(context);
+    }
+
     public Boolean revalidateAuthToken() {
         AccountManager accountManager = AccountManager.get(context);
         Account curAccount = getCurrentAccount();
@@ -103,12 +115,13 @@ public Boolean revalidateAuthToken() {
             return false; // This should never happen
         }
 
-        accountManager.invalidateAuthToken(BuildConfig.ACCOUNT_TYPE, mediaWikiApi.getAuthCookie());
+        accountManager.invalidateAuthToken(BuildConfig.ACCOUNT_TYPE, null);
         String authCookie = getAuthCookie();
 
         if (authCookie == null) {
             return false;
         }
+
         mediaWikiApi.setAuthCookie(authCookie);
         return true;
     }

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

@@ -13,10 +13,7 @@
 import android.support.annotation.Nullable;
 
 import fr.free.nrw.commons.BuildConfig;
-import fr.free.nrw.commons.contributions.ContributionsContentProvider;
-import fr.free.nrw.commons.modifications.ModificationsContentProvider;
 
-import static fr.free.nrw.commons.auth.AccountUtil.ACCOUNT_TYPE;
 import static fr.free.nrw.commons.auth.AccountUtil.AUTH_TOKEN_TYPE;
 
 public class WikiAccountAuthenticator extends AbstractAccountAuthenticator {
@@ -99,7 +96,7 @@ public Bundle hasFeatures(@NonNull AccountAuthenticatorResponse response,
     }
 
     private boolean supportedAccountType(@Nullable String type) {
-        return ACCOUNT_TYPE.equals(type);
+        return BuildConfig.ACCOUNT_TYPE.equals(type);
     }
 
     private Bundle addAccount(AccountAuthenticatorResponse response) {

app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java

@@ -95,7 +95,7 @@ public void startGalleryPick() {
 
     public void handleImagePicked(int requestCode, @Nullable Uri uri, boolean isDirectUpload, String wikiDataEntityId) {
         FragmentActivity activity = fragment.getActivity();
-        Timber.d("handleImagePicked() called with onActivityResult()");
+        Timber.d("handleImagePicked() called with onActivityResult(). Boolean isDirectUpload: " + isDirectUpload + "String wikiDataEntityId: " + wikiDataEntityId);
         Intent shareIntent = new Intent(activity, ShareActivity.class);
         shareIntent.setAction(ACTION_SEND);
         switch (requestCode) {
@@ -113,21 +113,26 @@ public void handleImagePicked(int requestCode, @Nullable Uri uri, boolean isDire
                 shareIntent.setType("image/jpeg");
                 shareIntent.putExtra(EXTRA_STREAM, lastGeneratedCaptureUri);
                 shareIntent.putExtra(EXTRA_SOURCE, SOURCE_CAMERA);
-
                 break;
             default:
                 break;
         }
+
         Timber.i("Image selected");
+        shareIntent.putExtra("isDirectUpload", isDirectUpload);
+        Timber.d("Put extras into image intent, isDirectUpload is " + isDirectUpload);
+
         try {
-            shareIntent.putExtra("isDirectUpload", isDirectUpload);
             if (wikiDataEntityId != null && !wikiDataEntityId.equals("")) {
                 shareIntent.putExtra(WIKIDATA_ENTITY_ID_PREF, wikiDataEntityId);
             }
-            activity.startActivity(shareIntent);
         } catch (SecurityException e) {
             Timber.e(e, "Security Exception");
         }
+
+        if (activity != null) {
+            activity.startActivity(shareIntent);
+        }
     }
 
     void saveState(Bundle outState) {