Fixed some static warnings in AbstractIT and AbstractOnServerIT

- UserAccountManagerImpl#getAccountByName() is never null because since
  #13074 it rather returns an anonymous account. To detect an account
  lookup failure, the type needs to be compared
- The getMaterialSchemesProvider() object returned null for most functions,
  even though they were annotated with @nonnull. Extracted the only
  actually used function getMaterialSchemesForCurrentUser()

Signed-off-by: Philipp Hasper <[email protected]>

Author: PhilLab

app/src/androidTest/java/com/owncloud/android/AbstractIT.java

@@ -12,7 +12,6 @@
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
 import android.app.Activity;
-import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
@@ -56,7 +55,6 @@
 import com.owncloud.android.operations.CreateFolderOperation;
 import com.owncloud.android.operations.UploadFileOperation;
 import com.owncloud.android.utils.FileStorageUtils;
-import com.owncloud.android.utils.theme.MaterialSchemesProvider;
 
 import org.apache.commons.io.FileUtils;
 import org.junit.After;
@@ -431,7 +429,7 @@ public boolean isPowerSavingEnabled() {
 
         newUpload.setRemoteFolderToBeCreated();
 
-        RemoteOperationResult result = newUpload.execute(client);
+        var result = newUpload.execute(client);
         assertTrue(result.getLogMessage(), result.isSuccess());
     }
 
@@ -536,8 +534,8 @@ protected static Account createAccount(String name) {
         platformAccountManager.setUserData(temp, KEY_USER_ID, name.substring(0, atPos));
 
         Account account = UserAccountManagerImpl.fromContext(targetContext).getAccountByName(name);
-        if (account == null) {
-            throw new ActivityNotFoundException();
+        if (Objects.equals(account.type, targetContext.getString(R.string.anonymous_account_type))) {
+            throw new RuntimeException("Could not get account with name " + name);
         }
         return account;
     }
@@ -546,37 +544,7 @@ protected static boolean removeAccount(Account account) {
         return AccountManager.get(targetContext).removeAccountExplicitly(account);
     }
 
-    protected MaterialSchemesProvider getMaterialSchemesProvider() {
-        return new MaterialSchemesProvider() {
-            @NonNull
-            @Override
-            public MaterialSchemes getMaterialSchemesForUser(@NonNull User user) {
-                return null;
-            }
-
-            @NonNull
-            @Override
-            public MaterialSchemes getMaterialSchemesForCapability(@NonNull OCCapability capability) {
-                return null;
-            }
-
-            @NonNull
-            @Override
-            public MaterialSchemes getMaterialSchemesForCurrentUser() {
-                return new MaterialSchemesImpl(R.color.primary, false);
-            }
-
-            @NonNull
-            @Override
-            public MaterialSchemes getDefaultMaterialSchemes() {
-                return null;
-            }
-
-            @NonNull
-            @Override
-            public MaterialSchemes getMaterialSchemesForPrimaryBackground() {
-                return null;
-            }
-        };
+    protected MaterialSchemes getMaterialSchemesForCurrentUser() {
+        return new MaterialSchemesImpl(R.color.primary, false);
     }
 }

app/src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java

@@ -10,7 +10,6 @@
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
-import android.content.ActivityNotFoundException;
 import android.net.Uri;
 import android.os.Bundle;
 
@@ -29,7 +28,6 @@
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.OwnCloudClientFactory;
 import com.owncloud.android.lib.common.accounts.AccountUtils;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.resources.e2ee.ToggleEncryptionRemoteOperation;
 import com.owncloud.android.lib.resources.files.ReadFolderRemoteOperation;
 import com.owncloud.android.lib.resources.files.RemoveFileRemoteOperation;
@@ -46,6 +44,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Objects;
 import java.util.Optional;
 
 import androidx.annotation.NonNull;
@@ -97,8 +96,8 @@ public static void beforeAll() {
             final UserAccountManager userAccountManager = UserAccountManagerImpl.fromContext(targetContext);
             account = userAccountManager.getAccountByName(loginName + "@" + baseUrl);
 
-            if (account == null) {
-                throw new ActivityNotFoundException();
+            if (Objects.equals(account.type, targetContext.getString(R.string.anonymous_account_type))) {
+                throw new RuntimeException("Could not get account with name " + loginName + "@" + baseUrl);
             }
 
             Optional<User> optionalUser = userAccountManager.getUser(account.name);
@@ -134,13 +133,13 @@ private static boolean isFolder(RemoteFile file) {
     }
 
     public static void deleteAllFilesOnServer() {
-        RemoteOperationResult result = new ReadFolderRemoteOperation("/").execute(client);
-        assertTrue(result.getLogMessage(), result.isSuccess());
+        var result = new ReadFolderRemoteOperation("/").execute(client);
+        assertTrue(result.getLogMessage(targetContext), result.isSuccess());
 
         for (Object object : result.getData()) {
             RemoteFile remoteFile = (RemoteFile) object;
 
-            if (!remoteFile.getRemotePath().equals("/")) {
+            if (!Objects.equals(remoteFile.getRemotePath(), "/")) {
                 if (remoteFile.isEncrypted()) {
                     ToggleEncryptionRemoteOperation operation = new ToggleEncryptionRemoteOperation(remoteFile.getLocalId(),
                                                                                                     remoteFile.getRemotePath(),
@@ -262,7 +261,7 @@ public boolean isPowerSavingEnabled() {
 
         newUpload.setRemoteFolderToBeCreated();
 
-        RemoteOperationResult result = newUpload.execute(client);
+        var result = newUpload.execute(client);
         assertTrue(result.getLogMessage(), result.isSuccess());
 
         OCFile parentFolder = getStorageManager()
@@ -271,6 +270,7 @@ public boolean isPowerSavingEnabled() {
         OCFile uploadedFile = getStorageManager().
             getFileByDecryptedRemotePath(parentFolder.getDecryptedRemotePath() + uploadedFileName);
 
+        assertNotNull(uploadedFile);
         assertNotNull(uploadedFile.getRemoteId());
         assertNotNull(uploadedFile.getPermissions());
 

app/src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.kt

@@ -504,9 +504,8 @@ class DialogFragmentIT : AbstractIT() {
                         throw UnsupportedOperationException("Document scan is not available")
                 }
 
-                val materialSchemesProvider = getMaterialSchemesProvider()
                 val viewThemeUtils = ViewThemeUtils(
-                    materialSchemesProvider.getMaterialSchemesForCurrentUser(),
+                    materialSchemesForCurrentUser,
                     ColorUtil(targetContext)
                 )