AbstractOnServerIT file deletion now ignores non-empty encrypted folders

TODO: helper function to check mime type for folder should probably move
to the RemoteFile class in the Nextcloud Library.

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

Author: PhilLab

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

@@ -36,6 +36,7 @@
 import com.owncloud.android.lib.resources.files.model.RemoteFile;
 import com.owncloud.android.operations.RefreshFolderOperation;
 import com.owncloud.android.operations.UploadFileOperation;
+import com.owncloud.android.utils.MimeType;
 
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.GetMethod;
@@ -127,6 +128,11 @@ public void after() {
         super.after();
     }
 
+    private static boolean isFolder(RemoteFile file) {
+        // TODO: should probably move to RemoteFile class
+        return MimeType.DIRECTORY.equals(file.getMimeType()) || MimeType.WEBDAV_FOLDER.equals(file.getMimeType());
+    }
+
     public static void deleteAllFilesOnServer() {
         RemoteOperationResult result = new ReadFolderRemoteOperation("/").execute(client);
         assertTrue(result.getLogMessage(), result.isSuccess());
@@ -144,6 +150,13 @@ public static void deleteAllFilesOnServer() {
                         .execute(client)
                         .isSuccess();
 
+                    if (!operationResult && isFolder(remoteFile)) {
+                        // Deleting encrypted folder is not possible due to bug
+                        // https://github.com/nextcloud/end_to_end_encryption/issues/421
+                        // Toggling encryption also fails, when the folder is not empty. So we ignore this folder
+                        continue;
+                    }
+
                     assertTrue(operationResult);
                 }