Post merge WIP

Author: TranceLove

app/libs/com.openmobilehub.android.storage.core-2.1.1-alpha+thumbnail.aar

@@ -195,14 +195,6 @@ private boolean doDeleteFile(@NonNull HybridFileParcelable file) throws Exceptio
               });
         }
         return true;
-        //        CloudStorage cloudStorage = dataUtils.getAccount(file.getMode());
-        //        try {
-        //          cloudStorage.delete(CloudUtil.stripPath(file.getMode(), file.getPath()));
-        //          return true;
-        //        } catch (Exception e) {
-        //          LOG.warn("failed to delete cloud files", e);
-        //          return false;
-        //        }
       default:
         try {
           /* SMB and SFTP (or any remote files that may support in the future) should not be

app/libs/com.openmobilehub.android.storage.core-restful-common-2.1.0-alpha+thumbnail.aar

@@ -21,26 +21,38 @@
 package com.amaze.filemanager.asynchronous.asynctasks.movecopy;
 
 import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.concurrent.Callable;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.amaze.filemanager.application.AppConfig;
 import com.amaze.filemanager.fileoperations.exceptions.ShellNotRunningException;
 import com.amaze.filemanager.fileoperations.filesystem.OpenMode;
 import com.amaze.filemanager.filesystem.HybridFile;
 import com.amaze.filemanager.filesystem.HybridFileParcelable;
 import com.amaze.filemanager.filesystem.Operations;
+import com.amaze.filemanager.filesystem.cloud.CloudUtil;
 import com.amaze.filemanager.filesystem.files.FileUtils;
 import com.amaze.filemanager.filesystem.root.RenameFileCommand;
+import com.amaze.filemanager.utils.omh.OMHClientHelper;
+import com.amaze.filemanager.utils.omh.OmhAuthClientExtKt;
+import com.amaze.filemanager.utils.omh.OmhStorageClientExtKt;
+import com.openmobilehub.android.storage.core.OmhStorageClient;
+import com.openmobilehub.android.storage.core.model.OmhStorageEntity;
 
 import android.content.Context;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 
+import kotlin.Unit;
+import kotlin.text.StringsKt;
+
 /**
  * AsyncTask that moves files from source to destination by trying to rename files first, if they're
  * in the same filesystem, else starting the copy service. Be advised - do not start this AsyncTask
@@ -130,7 +142,56 @@ private MoveFilesReturn processFile(
       case BOX:
       case ONEDRIVE:
       case GDRIVE:
-        // FIXME: OmhStorageClient should support move operation
+        OmhStorageClient storageClient = OMHClientHelper.getStorageClient(mode);
+        if (storageClient == null) {
+          LOG.warn("No storage client available for mode: {}", mode);
+          return new MoveFilesReturn(false, false, destinationSize, totalBytes);
+        }
+        try {
+          OmhAuthClientExtKt.retryOnUnauthorizedBlocking(
+              mode,
+              AppConfig.getInstance().getCloudAuthTrigger(),
+              () -> {
+                // 1. Download source file into a local temp file
+                String name = baseFile.getName(context);
+                String baseName = StringsKt.substringBeforeLast(name, ".", name);
+                String ext = StringsKt.substringAfterLast(name, ".", "");
+                File tmpFile;
+                try {
+                  tmpFile =
+                      File.createTempFile(
+                          baseName, "." + ext, AppConfig.getInstance().getCacheDir());
+                } catch (IOException e) {
+                  throw new RuntimeException(e);
+                }
+                tmpFile.deleteOnExit();
+                try {
+                  OmhStorageClientExtKt.downloadFileBlocking(
+                          storageClient, baseFile.getCloudFileId())
+                      .writeTo(new FileOutputStream(tmpFile));
+                } catch (IOException e) {
+                  throw new RuntimeException(e);
+                }
+                // 2. Resolve destination parent folder
+                OmhStorageEntity destFolder =
+                    OmhStorageClientExtKt.resolvePathBlocking(
+                        storageClient, CloudUtil.stripCloudPath(mode, path));
+                String parentId =
+                    (destFolder != null && destFolder.getId() != null)
+                        ? destFolder.getId()
+                        : storageClient.getRootFolder();
+                // 3. Upload to destination
+                OmhStorageClientExtKt.uploadFileBlocking(storageClient, tmpFile, parentId);
+                tmpFile.delete();
+                // 4. Delete original source
+                OmhStorageClientExtKt.deleteFileBlocking(storageClient, baseFile.getCloudFileId());
+                return Unit.INSTANCE;
+              });
+        } catch (Exception e) {
+          LOG.warn("Cloud move failed for {}", baseFile.getPath(), e);
+          return new MoveFilesReturn(false, false, destinationSize, totalBytes);
+        }
+        break;
       default:
         return new MoveFilesReturn(false, false, destinationSize, totalBytes);
     }

app/libs/com.openmobilehub.android.storage.plugin-box-restful-2.1.0-alpha+thumbnail.aar

@@ -59,6 +59,7 @@ object CloudContract {
             OpenMode.GDRIVE,
             OpenMode.DROPBOX,
             OpenMode.ONEDRIVE,
+            OpenMode.BOX,
         )
 
     val ENABLED_PROVIDER_IDS: Array<String> =

app/libs/com.openmobilehub.android.storage.plugin-dropbox-restful-2.1.0-alpha+thumbnail.aar

@@ -327,7 +327,70 @@ abstract class ExplorerDatabase : RoomDatabase() {
         internal val MIGRATION_11_12: Migration =
             object : Migration(11, DATABASE_VERSION) {
                 override fun migrate(database: SupportSQLiteDatabase) {
-                    database.execSQL("DROP TABLE IF EXISTS $TABLE_CLOUD_PERSIST")
+                    database.execSQL(
+                        "CREATE TABLE " +
+                            TEMP_TABLE_PREFIX +
+                            TABLE_TAB +
+                            "(" +
+                            COLUMN_TAB_NO +
+                            " INTEGER PRIMARY KEY NOT NULL, " +
+                            COLUMN_PATH +
+                            " TEXT NOT NULL, " +
+                            COLUMN_HOME +
+                            " TEXT NOT NULL)",
+                    )
+                    database.execSQL(
+                        "INSERT INTO " +
+                            TEMP_TABLE_PREFIX +
+                            TABLE_TAB +
+                            "(" +
+                            COLUMN_TAB_NO +
+                            "," +
+                            COLUMN_PATH +
+                            "," +
+                            COLUMN_HOME +
+                            ")" +
+                            " SELECT " +
+                            COLUMN_TAB_NO +
+                            "," +
+                            COLUMN_PATH +
+                            "," +
+                            COLUMN_HOME +
+                            " FROM " +
+                            TABLE_TAB,
+                    )
+                    database.execSQL("DROP TABLE $TABLE_TAB")
+                    database.execSQL(
+                        "ALTER TABLE $TEMP_TABLE_PREFIX$TABLE_TAB RENAME TO $TABLE_TAB",
+                    )
+
+                    database.execSQL(
+                        "CREATE TABLE " +
+                            TEMP_TABLE_PREFIX +
+                            TABLE_ENCRYPTED +
+                            "(" +
+                            COLUMN_ENCRYPTED_ID +
+                            " INTEGER PRIMARY KEY NOT NULL," +
+                            COLUMN_ENCRYPTED_PATH +
+                            " TEXT NOT NULL," +
+                            COLUMN_ENCRYPTED_PASSWORD +
+                            " TEXT NOT NULL)",
+                    )
+                    database.execSQL(
+                        "INSERT INTO " +
+                            TEMP_TABLE_PREFIX +
+                            TABLE_ENCRYPTED +
+                            " SELECT * FROM " +
+                            TABLE_ENCRYPTED,
+                    )
+                    database.execSQL("DROP TABLE $TABLE_ENCRYPTED")
+                    database.execSQL(
+                        "ALTER TABLE " +
+                            TEMP_TABLE_PREFIX +
+                            TABLE_ENCRYPTED +
+                            " RENAME TO " +
+                            TABLE_ENCRYPTED,
+                    )
                 }
             }