WIP

Add Dropbox/Onedrive plugins
TranceLove · Sep 10, 2024 · f39ba14 · f39ba14
1 parent ba93d8f
commit f39ba14
Show file tree

Hide file tree

Showing 30 changed files with 1,125 additions and 1,135 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -39,6 +39,7 @@ android {
         properties.load(project.rootProject.file('local.properties').newDataInputStream())
 
         buildConfigField "String", "GOOGLE_CLIENT_ID", "\"${properties.getProperty('GOOGLE_CLIENT_ID')}\""
+        buildConfigField "String", "DROPBOX_APP_KEY", "\"${properties.getProperty('DROPBOX_APP_KEY')}\""
     }
 
     signingConfigs {
@@ -266,11 +267,15 @@ dependencies {
     implementation libs.gson
     implementation libs.amaze.trashBin
 
-    implementation("com.openmobilehub.android.auth:plugin-google-gms:2.0.0")
-    implementation("com.openmobilehub.android.auth:plugin-google-non-gms:2.0.0")
+    implementation("com.openmobilehub.android.auth:plugin-google-gms:2.0.4")
+    implementation("com.openmobilehub.android.auth:plugin-google-non-gms:2.0.4")
+    implementation("com.openmobilehub.android.auth:plugin-microsoft:2.0.4")
+    implementation("com.openmobilehub.android.auth:plugin-dropbox:2.0.4")
 
-    implementation("com.openmobilehub.android.storage:plugin-googledrive-gms:2.0.0-alpha")
-    implementation("com.openmobilehub.android.storage:plugin-googledrive-non-gms:2.0.0-alpha")
+    implementation("com.openmobilehub.android.storage:plugin-googledrive-gms:2.0.4-alpha")
+    implementation("com.openmobilehub.android.storage:plugin-googledrive-non-gms:2.0.4-alpha")
+    implementation("com.openmobilehub.android.storage:plugin-onedrive:2.0.4-alpha")
+    implementation("com.openmobilehub.android.storage:plugin-dropbox:2.0.4-alpha")
 }
 
 kotlin {

diff --git a/app/src/main/java/com/amaze/filemanager/adapters/HiddenAdapter.kt b/app/src/main/java/com/amaze/filemanager/adapters/HiddenAdapter.kt
@@ -94,7 +94,7 @@ class HiddenAdapter(
                 val task = DeleteTask(context, false)
                 task.execute(filesToDelete)
             }
-            DataUtils.getInstance().removeHiddenFile(hiddenFiles[position].path)
+            DataUtils.removeHiddenFile(hiddenFiles[position].path)
             hiddenFiles.remove(hiddenFiles[position])
             notifyItemRemoved(position)
         }

diff --git a/app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/DeleteTask.java b/app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/DeleteTask.java
@@ -70,7 +70,7 @@ public class DeleteTask
   private CompressedExplorerFragment compressedExplorerFragment;
 
   private boolean doDeletePermanently;
-  private final DataUtils dataUtils = DataUtils.getInstance();
+  private final DataUtils dataUtils = DataUtils.INSTANCE;
 
   public DeleteTask(@NonNull Context applicationContext, @NonNull boolean doDeletePermanently) {
     this.applicationContext = applicationContext.getApplicationContext();
@@ -174,14 +174,15 @@ private boolean doDeleteFile(@NonNull HybridFileParcelable file) throws Exceptio
       case BOX:
       case GDRIVE:
       case ONEDRIVE:
-        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;
-        }
+        return false;
+//        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

diff --git a/app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/LoadFilesListTask.java b/app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/LoadFilesListTask.java
@@ -98,7 +98,7 @@ public class LoadFilesListTask
   private WeakReference<Context> context;
   private OpenMode openmode;
   private boolean showHiddenFiles, showThumbs;
-  private DataUtils dataUtils = DataUtils.getInstance();
+  private DataUtils dataUtils = DataUtils.INSTANCE;
   private OnAsyncTaskFinished<Pair<OpenMode, List<LayoutElementParcelable>>> listener;
   private boolean forceReload;
 
@@ -761,16 +761,16 @@ private List<LayoutElementParcelable> listCloud(
     if (cloudCache != null && !forceReload) {
       list = cloudCache;
     } else {
-      CloudStorage cloudStorage = dataUtils.getAccount(openmode);
+//      CloudStorage cloudStorage = dataUtils.getAccount(openmode);
       list = new ArrayList<>();
-      listCloudInternal(
-          path,
-          cloudStorage,
-          openmode,
-          file -> {
-            LayoutElementParcelable elem = createListParcelables(file);
-            if (elem != null) list.add(elem);
-          });
+//      listCloudInternal(
+//          path,
+//          cloudStorage,
+//          openmode,
+//          file -> {
+//            LayoutElementParcelable elem = createListParcelables(file);
+//            if (elem != null) list.add(elem);
+//          });
       mainActivityViewModel.putInCache(path, list);
     }
     return list;

diff --git a/app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/movecopy/MoveFiles.java b/app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/movecopy/MoveFiles.java
@@ -133,24 +133,24 @@ private MoveFilesReturn processFile(
       case BOX:
       case ONEDRIVE:
       case GDRIVE:
-        DataUtils dataUtils = DataUtils.getInstance();
-
-        CloudStorage cloudStorage = dataUtils.getAccount(mode);
-        if (baseFile.getMode() == mode) {
-          // source and target both in same filesystem, use API method
-          try {
-            cloudStorage.move(
-                CloudUtil.stripPath(mode, baseFile.getPath()), CloudUtil.stripPath(mode, destPath));
-          } catch (RuntimeException e) {
-            LOG.warn("failed to move file in cloud filesystem", e);
-            return new MoveFilesReturn(false, false, destinationSize, totalBytes);
-          }
-        } else {
-          // not in same filesystem, execute service
-          return new MoveFilesReturn(false, false, destinationSize, totalBytes);
-        }
-      default:
-        return new MoveFilesReturn(false, false, destinationSize, totalBytes);
+//        DataUtils dataUtils = DataUtils.INSTANCE;
+//
+//        CloudStorage cloudStorage = dataUtils.getAccount(mode);
+//        if (baseFile.getMode() == mode) {
+//          // source and target both in same filesystem, use API method
+//          try {
+//            cloudStorage.move(
+//                CloudUtil.stripPath(mode, baseFile.getPath()), CloudUtil.stripPath(mode, destPath));
+//          } catch (RuntimeException e) {
+//            LOG.warn("failed to move file in cloud filesystem", e);
+//            return new MoveFilesReturn(false, false, destinationSize, totalBytes);
+//          }
+//        } else {
+//          // not in same filesystem, execute service
+//          return new MoveFilesReturn(false, false, destinationSize, totalBytes);
+//        }
+//      default:
+//        return new MoveFilesReturn(false, false, destinationSize, totalBytes);
     }
 
     return null;

diff --git a/app/src/main/java/com/amaze/filemanager/filesystem/FileUtil.java b/app/src/main/java/com/amaze/filemanager/filesystem/FileUtil.java
@@ -140,7 +140,7 @@ public static final void writeUriToStorage(
                   }
 
                   String finalFilePath = currentPath + "/" + filename;
-                  DataUtils dataUtils = DataUtils.getInstance();
+                  DataUtils dataUtils = DataUtils.INSTANCE;
 
                   HybridFile hFile = new HybridFile(OpenMode.UNKNOWN, currentPath);
                   hFile.generateMode(mainActivity);
@@ -199,12 +199,12 @@ public static final void writeUriToStorage(
                     case BOX:
                     case ONEDRIVE:
                     case GDRIVE:
-                      OpenMode mode = hFile.getMode();
-
-                      CloudStorage cloudStorage = dataUtils.getAccount(mode);
-                      String path = CloudUtil.stripPath(mode, finalFilePath);
-                      cloudStorage.upload(path, bufferedInputStream, documentFile.length(), true);
-                      retval.add(path);
+//                      OpenMode mode = hFile.getMode();
+//
+//                      CloudStorage cloudStorage = dataUtils.getAccount(mode);
+//                      String path = CloudUtil.stripPath(mode, finalFilePath);
+//                      cloudStorage.upload(path, bufferedInputStream, documentFile.length(), true);
+//                      retval.add(path);
                       break;
                     case OTG:
                       DocumentFile documentTargetFile =