Merge pull request #13074 from nextcloud/bugfix/fix-npe-FileDataStorageManager

Bugfix Fix NPE FileDataStorageManager

app/src/main/java/com/nextcloud/client/account/CurrentAccountProvider.java

@@ -24,7 +24,7 @@ public interface CurrentAccountProvider {
      * @return Currently selected {@link Account} or first valid {@link Account} registered in OS or null, if not available at all.
      */
     @Deprecated
-    @Nullable
+    @NonNull
     Account getCurrentAccount();
 
     /**

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

@@ -18,9 +18,9 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
-import android.util.Log;
 
 import com.nextcloud.common.NextcloudClient;
+import com.nextcloud.utils.extensions.AccountExtensionsKt;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AuthenticatorActivity;
@@ -39,6 +39,7 @@ import com.owncloud.android.lib.resources.users.GetUserInfoRemoteOperation;
 import java.io.IOException;
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
@@ -132,42 +133,42 @@ public class UserAccountManagerImpl implements UserAccountManager {
     }
 
     @Override
-    @Nullable
+    @NonNull
     public Account getCurrentAccount() {
         Account[] ocAccounts = getAccounts();
-        Account defaultAccount = null;
 
         ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(context);
-
         SharedPreferences appPreferences = PreferenceManager.getDefaultSharedPreferences(context);
         String accountName = appPreferences.getString(PREF_SELECT_OC_ACCOUNT, null);
 
-        // account validation: the saved account MUST be in the list of ownCloud Accounts known by the AccountManager
+        Account defaultAccount = Arrays.stream(ocAccounts)
-        if (accountName != null) {
+            .filter(account -> account.name.equals(accountName))
-            for (Account account : ocAccounts) {
+            .findFirst()
-                if (account.name.equals(accountName)) {
+            .orElse(null);
-                    defaultAccount = account;
+
-                    break;
+        // take first which is not pending for removal account as fallback
-                }
+        if (defaultAccount == null) {
-            }
+            defaultAccount = Arrays.stream(ocAccounts)
+                .filter(account -> !arbitraryDataProvider.getBooleanValue(account.name, PENDING_FOR_REMOVAL))
+                .findFirst()
+                .orElse(null);
         }
 
-        if (defaultAccount == null && ocAccounts.length > 0) {
+        if (defaultAccount == null) {
-            // take first which is not pending for removal account as fallback
+            if (ocAccounts.length > 0) {
-            for (Account account: ocAccounts) {
+                defaultAccount = ocAccounts[0];
-                boolean pendingForRemoval = arbitraryDataProvider.getBooleanValue(account.name,
+            } else {
-                                                                                  PENDING_FOR_REMOVAL);
+                defaultAccount = getAnonymousAccount();
-
-                if (!pendingForRemoval) {
-                    defaultAccount = account;
-                    break;
-                }
             }
         }
 
         return defaultAccount;
     }
 
+    private Account getAnonymousAccount() {
+        return new Account("Anonymous", context.getString(R.string.anonymous_account_type));
+    }
+
     /**
      * Temporary solution to convert platform account to user instance.
      * It takes null and returns null on error to ease error handling
@@ -177,8 +178,8 @@ public class UserAccountManagerImpl implements UserAccountManager {
      * @return User instance or null, if conversion failed
      */
     @Nullable
-    private User createUserFromAccount(@Nullable Account account) {
+    private User createUserFromAccount(@NonNull Account account) {
-        if (account == null) {
+        if (AccountExtensionsKt.isAnonymous(account, context)) {
             return null;
         }
 
@@ -260,7 +261,7 @@ public class UserAccountManagerImpl implements UserAccountManager {
     }
 
     @Override
-    @Nullable
+    @NonNull
     public Account getAccountByName(String name) {
         for (Account account : getAccounts()) {
             if (account.name.equals(name)) {
@@ -268,7 +269,7 @@ public class UserAccountManagerImpl implements UserAccountManager {
             }
         }
 
-        return null;
+        return getAnonymousAccount();
     }
 
     @Override

app/src/main/java/com/nextcloud/client/di/AppModule.java

@@ -100,8 +100,7 @@ class AppModule {
     @Provides
     UserAccountManager userAccountManager(
         Context context,
-        AccountManager accountManager
+        AccountManager accountManager) {
-                                         ) {
         return new UserAccountManagerImpl(context, accountManager);
     }
 

app/src/main/java/com/nextcloud/client/mixins/SessionMixin.kt

@@ -9,14 +9,12 @@ package com.nextcloud.client.mixins
 
 import android.accounts.Account
 import android.app.Activity
-import android.content.ContentResolver
 import android.content.Intent
 import android.os.Bundle
 import com.nextcloud.client.account.User
 import com.nextcloud.client.account.UserAccountManager
-import com.owncloud.android.datamodel.FileDataStorageManager
+import com.nextcloud.utils.extensions.isAnonymous
 import com.owncloud.android.lib.resources.status.OCCapability
-import com.owncloud.android.ui.activity.BaseActivity
 import com.owncloud.android.utils.theme.CapabilityUtils
 import java.util.Optional
 
@@ -27,36 +25,25 @@ import java.util.Optional
  * It is an intermediary step facilitating comprehensive rework of
  * account handling logic.
  */
-class SessionMixin constructor(
+class SessionMixin(
     private val activity: Activity,
-    private val contentResolver: ContentResolver,
     private val accountManager: UserAccountManager
 ) : ActivityMixin {
-
+    lateinit var currentAccount: Account
-    private companion object {
-        private val TAG = BaseActivity::class.java.simpleName
-    }
-
-    var currentAccount: Account? = null
-        private set
-    var storageManager: FileDataStorageManager? = null
         private set
+
     val capabilities: OCCapability?
         get() = getUser()
             .map { CapabilityUtils.getCapability(it, activity) }
             .orElse(null)
 
-    fun setAccount(account: Account?) {
+    fun setAccount(account: Account) {
-        val validAccount = account != null && accountManager.setCurrentOwnCloudAccount(account.name)
+        val validAccount = (accountManager.setCurrentOwnCloudAccount(account.name))
-        if (validAccount) {
-            currentAccount = account
-        } else {
-            swapToDefaultAccount()
-        }
 
-        currentAccount?.let {
+        currentAccount = if (validAccount) {
-            val storageManager = FileDataStorageManager(getUser().get(), contentResolver)
+            account
-            this.storageManager = storageManager
+        } else {
+            getDefaultAccount()
         }
     }
 
@@ -64,9 +51,12 @@ class SessionMixin constructor(
         setAccount(user.toPlatformAccount())
     }
 
-    fun getUser(): Optional<User> = when (val it = this.currentAccount) {
+    fun getUser(): Optional<User> {
-        null -> Optional.empty()
+        return if (currentAccount.isAnonymous(activity)) {
-        else -> accountManager.getUser(it.name)
+            Optional.empty()
+        } else {
+            accountManager.getUser(currentAccount.name)
+        }
     }
 
     /**
@@ -75,16 +65,14 @@ class SessionMixin constructor(
      * If no valid ownCloud [Account] exists, then the user is requested
      * to create a new ownCloud [Account].
      */
-    private fun swapToDefaultAccount() {
+    private fun getDefaultAccount(): Account {
-        // default to the most recently used account
+        val defaultAccount = accountManager.currentAccount
-        val newAccount = accountManager.currentAccount
+
-        if (newAccount == null) {
+        if (defaultAccount.isAnonymous(activity)) {
-            // no account available: force account creation
-            currentAccount = null
             startAccountCreation()
-        } else {
-            currentAccount = newAccount
         }
+
+        return defaultAccount
     }
 
     /**
@@ -98,7 +86,7 @@ class SessionMixin constructor(
         super.onNewIntent(intent)
         val current = accountManager.currentAccount
         val currentAccount = this.currentAccount
-        if (current != null && currentAccount != null && !currentAccount.name.equals(current.name)) {
+        if (!currentAccount.name.equals(current.name)) {
             this.currentAccount = current
         }
     }
@@ -109,9 +97,9 @@ class SessionMixin constructor(
      */
     override fun onRestart() {
         super.onRestart()
-        val validAccount = currentAccount != null && accountManager.exists(currentAccount)
+        val validAccount = accountManager.exists(currentAccount)
         if (!validAccount) {
-            swapToDefaultAccount()
+            getDefaultAccount()
         }
     }
 
@@ -120,11 +108,4 @@ class SessionMixin constructor(
         val account = accountManager.currentAccount
         setAccount(account)
     }
-
-    override fun onResume() {
-        super.onResume()
-        if (currentAccount == null) {
-            swapToDefaultAccount()
-        }
-    }
 }

app/src/main/java/com/nextcloud/utils/extensions/AccountExtensions.kt

@@ -0,0 +1,14 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2024 Your Name <your@email.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.nextcloud.utils.extensions
+
+import android.accounts.Account
+import android.content.Context
+import com.owncloud.android.R
+
+fun Account.isAnonymous(context: Context): Boolean = type.equals(context.getString(R.string.anonymous_account_type))

app/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java

@@ -48,6 +48,7 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab
 
     @Inject UserAccountManager accountManager;
     @Inject AppPreferences preferences;
+    @Inject FileDataStorageManager fileDataStorageManager;
 
     private AppPreferences.Listener onPreferencesChanged = new AppPreferences.Listener() {
         @Override
@@ -63,9 +64,7 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        sessionMixin = new SessionMixin(this,
+        sessionMixin = new SessionMixin(this, accountManager);
-                                        getContentResolver(),
-                                        accountManager);
         mixinRegistry.add(sessionMixin);
 
         if (enableAccountHandling) {
@@ -174,6 +173,6 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab
     }
 
     public FileDataStorageManager getStorageManager() {
-        return sessionMixin.getStorageManager();
+        return fileDataStorageManager;
     }
 }

app/src/main/res/values/strings.xml

@@ -30,6 +30,8 @@
     <string name="app_config_proxy_host_title">Proxy Host Name</string>
     <string name="app_config_proxy_port_title">Proxy Port</string>
 
+    <string name="anonymous_account_type" translatable="false">AnonymousAccountType</string>
+
     <string name="assistant_screen_task_types_error_state_message">Unable to fetch task types, please check your internet connection.</string>
     <string name="assistant_screen_task_list_error_state_message">Unable to fetch task list, please check your internet connection.</string>
 

app/src/test/java/com/nextcloud/client/mixins/SessionMixinTest.kt

@@ -8,9 +8,7 @@
 package com.nextcloud.client.mixins
 
 import android.app.Activity
-import android.content.ContentResolver
 import com.nextcloud.client.account.UserAccountManager
-import junit.framework.Assert.assertNull
 import org.junit.Before
 import org.junit.Test
 import org.mockito.Mock
@@ -24,9 +22,6 @@ class SessionMixinTest {
     @Mock
     private lateinit var activity: Activity
 
-    @Mock
-    private lateinit var contentResolver: ContentResolver
-
     @Mock
     private lateinit var userAccountManager: UserAccountManager
 
@@ -38,7 +33,6 @@ class SessionMixinTest {
         session = spy(
             SessionMixin(
                 activity,
-                contentResolver,
                 userAccountManager
             )
         )
@@ -55,15 +49,4 @@ class SessionMixinTest {
         //      account manager receives parent activity
         verify(userAccountManager).startAccountCreation(same(activity))
     }
-
-    @Test
-    fun `trigger accountCreation on resume when currentAccount is null`() {
-        // WHEN
-        //      start onResume and currentAccount is null
-        assertNull(session.currentAccount)
-        session.onResume()
-        // THEN
-        //      accountCreation flow is started
-        verify(session).startAccountCreation()
-    }
 }