Merge pull request #9335 from nextcloud/remove-account-from-arbitrary-data-provider

Remove Account from ArbitraryDataProvider

src/gplay/java/com/owncloud/android/utils/PushUtils.java

@@ -167,7 +167,7 @@ public final class PushUtils {
 
             if (remoteOperationResult.getHttpCode() == HttpStatus.SC_ACCEPTED) {
                 String arbitraryValue;
-                if (!TextUtils.isEmpty(arbitraryValue = arbitraryDataProvider.getValue(account, KEY_PUSH))) {
+                if (!TextUtils.isEmpty(arbitraryValue = arbitraryDataProvider.getValue(account.name, KEY_PUSH))) {
                     Gson gson = new Gson();
                     PushConfigurationState pushArbitraryData = gson.fromJson(arbitraryValue,
                             PushConfigurationState.class);
@@ -213,7 +213,7 @@ public final class PushUtils {
                 PushConfigurationState accountPushData;
                 Gson gson = new Gson();
                 for (Account account : accountManager.getAccounts()) {
-                    providerValue = arbitraryDataProvider.getValue(account, KEY_PUSH);
+                    providerValue = arbitraryDataProvider.getValue(account.name, KEY_PUSH);
                     if (!TextUtils.isEmpty(providerValue)) {
                         accountPushData = gson.fromJson(providerValue,
                                 PushConfigurationState.class);
@@ -430,7 +430,7 @@ public final class PushUtils {
             signature = Signature.getInstance("SHA512withRSA");
             if (accounts.length > 0) {
                 for (Account account : accounts) {
-                    if (!TextUtils.isEmpty(arbitraryValue = arbitraryDataProvider.getValue(account, KEY_PUSH))) {
+                    if (!TextUtils.isEmpty(arbitraryValue = arbitraryDataProvider.getValue(account.name, KEY_PUSH))) {
                         pushArbitraryData = gson.fromJson(arbitraryValue, PushConfigurationState.class);
                         if (!pushArbitraryData.isShouldBeDeleted()) {
                             publicKey = (PublicKey) readKeyFromString(true, pushArbitraryData.getUserPublicKey());

src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java

@@ -164,7 +164,7 @@ public class UserAccountManagerImpl implements UserAccountManager {
         if (defaultAccount == null && ocAccounts.length > 0) {
             // take first which is not pending for removal account as fallback
             for (Account account: ocAccounts) {
-                boolean pendingForRemoval = arbitraryDataProvider.getBooleanValue(account,
+                boolean pendingForRemoval = arbitraryDataProvider.getBooleanValue(account.name,
                                                                                   PENDING_FOR_REMOVAL);
 
                 if (!pendingForRemoval) {

src/main/java/com/owncloud/android/datamodel/ArbitraryDataProvider.java

@@ -20,7 +20,6 @@
  */
 package com.owncloud.android.datamodel;
 
-import android.accounts.Account;
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.database.Cursor;
@@ -138,11 +137,6 @@ public class ArbitraryDataProvider {
         return getBooleanValue(user.getAccountName(), key);
     }
 
-    @Deprecated
-    public boolean getBooleanValue(Account account, String key) {
-        return getBooleanValue(account.name, key);
-    }
-
     /**
      * returns integer if found else -1
      *
@@ -160,17 +154,6 @@ public class ArbitraryDataProvider {
         }
     }
 
-    /**
-     * Returns stored value as string or empty string
-     *
-     * @return string if value found or empty string
-     */
-    @NonNull
-    @Deprecated
-    public String getValue(Account account, String key) {
-        return account != null ? getValue(account.name, key) : "";
-    }
-
     /**
      * Returns stored value as string or empty string
      *