Cusom Mediawiki api layer

Author: maskara

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

@@ -13,6 +13,8 @@
 import static android.accounts.AccountManager.ERROR_CODE_REMOTE_EXCEPTION;
 import static android.accounts.AccountManager.KEY_ACCOUNT_NAME;
 import static android.accounts.AccountManager.KEY_ACCOUNT_TYPE;
+import static android.accounts.AccountManager.KEY_PASSWORD;
+import static android.icu.lang.UCharacter.GraphemeClusterBreak.L;
 import static fr.free.nrw.commons.contributions.ContributionsContentProvider.CONTRIBUTION_AUTHORITY;
 import static fr.free.nrw.commons.modifications.ModificationsContentProvider.MODIFICATIONS_AUTHORITY;
 
@@ -31,7 +33,7 @@ public void createAccount(@Nullable AccountAuthenticatorResponse response,
                               String username, String password) {
 
         Account account = new Account(username, ACCOUNT_TYPE);
-        boolean created = accountManager().addAccountExplicitly(account, password, null);
+        boolean created = accountManager(context).addAccountExplicitly(account, password, null);
 
         Timber.d("account creation " + (created ? "successful" : "failure"));
 
@@ -40,7 +42,7 @@ public void createAccount(@Nullable AccountAuthenticatorResponse response,
                 Bundle bundle = new Bundle();
                 bundle.putString(KEY_ACCOUNT_NAME, username);
                 bundle.putString(KEY_ACCOUNT_TYPE, ACCOUNT_TYPE);
-
+                bundle.putString(KEY_PASSWORD, password);
 
                 response.onResult(bundle);
             }
@@ -57,7 +59,35 @@ public void createAccount(@Nullable AccountAuthenticatorResponse response,
         ContentResolver.setSyncAutomatically(account, MODIFICATIONS_AUTHORITY, true); // Enable sync by default!
     }
 
-    private AccountManager accountManager() {
+    /**
+     * @return Account|null
+     */
+    @Nullable
+    public static Account account(Context context) {
+        try {
+            Account[] accounts = accountManager(context).getAccountsByType(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/SessionManager.java

@@ -45,6 +45,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();
@@ -53,12 +69,13 @@ public Boolean revalidateAuthToken() {
             return false; // This should never happen
         }
 
-        accountManager.invalidateAuthToken(ACCOUNT_TYPE, mediaWikiApi.getAuthCookie());
+        accountManager.invalidateAuthToken(ACCOUNT_TYPE, null);
         String authCookie = getAuthCookie();
 
         if (authCookie == null) {
             return false;
         }
+
         mediaWikiApi.setAuthCookie(authCookie);
         return true;
     }