Emmanuelmess/refractor/files/1

app/build.gradle

@@ -196,7 +196,7 @@ dependencies {
     implementation "com.github.topjohnwu.libsu:core:${libsuVersion}"
     implementation "com.github.topjohnwu.libsu:io:${libsuVersion}"
 
-    implementation 'com.cloudrail:cloudrail-si-android:2.22.4'
+    implementation "com.cloudrail:cloudrail-si-android:$cloudRailVersion"
 
     implementation 'com.github.PhilJay:MPAndroidChart:v3.0.2'//Nice charts and graphs
 
@@ -234,11 +234,12 @@ dependencies {
 
     implementation 'org.tukaani:xz:1.8'
 
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    //ReactiveX
+    implementation "io.reactivex.rxjava2:rxandroid:$reactiveXAndroidVersion"
     // Because RxAndroid releases are few and far between, it is recommended you also
     // explicitly depend on RxJava's latest version for bug fixes and new features.
     // (see https://github.com/ReactiveX/RxJava/releases for latest 3.x.x version)
-    implementation group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.9'
+    implementation "io.reactivex.rxjava2:rxjava:$reactiveXVersion"
 
     implementation project(':commons_compress_7z')
     implementation project(':file_operations')

app/src/main/java/com/amaze/filemanager/adapters/AppsRecyclerAdapter.kt

@@ -52,6 +52,7 @@ import com.amaze.filemanager.asynchronous.asynctasks.DeleteTask
 import com.amaze.filemanager.asynchronous.management.ServiceWatcherUtil
 import com.amaze.filemanager.asynchronous.services.CopyService
 import com.amaze.filemanager.file_operations.filesystem.OpenMode
+import com.amaze.filemanager.filesystem.files.FileAmazeFilesystem
 import com.amaze.filemanager.filesystem.HybridFileParcelable
 import com.amaze.filemanager.filesystem.RootHelper
 import com.amaze.filemanager.filesystem.files.FileUtils

app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/CloudLoaderAsyncTask.java

@@ -28,6 +28,10 @@
 import com.amaze.filemanager.database.models.explorer.CloudEntry;
 import com.amaze.filemanager.file_operations.exceptions.CloudPluginException;
 import com.amaze.filemanager.file_operations.filesystem.OpenMode;
+import com.amaze.filemanager.file_operations.filesystem.filetypes.cloud.box.BoxAccount;
+import com.amaze.filemanager.file_operations.filesystem.filetypes.cloud.dropbox.DropboxAccount;
+import com.amaze.filemanager.file_operations.filesystem.filetypes.cloud.gdrive.GoogledriveAccount;
+import com.amaze.filemanager.file_operations.filesystem.filetypes.cloud.onedrive.OnedriveAccount;
 import com.amaze.filemanager.ui.activities.MainActivity;
 import com.amaze.filemanager.utils.DataUtils;
 import com.cloudrail.si.CloudRail;
@@ -130,7 +134,7 @@ public Boolean doInBackground(Void... voids) {
                 cloudHandler.addEntry(cloudEntryGdrive);
               }
 
-              dataUtils.addAccount(cloudStorageDrive);
+              GoogledriveAccount.INSTANCE.add(cloudStorageDrive);
               hasUpdatedDrawer = true;
             } catch (CloudPluginException e) {
               e.printStackTrace();
@@ -201,7 +205,7 @@ public Boolean doInBackground(Void... voids) {
                 cloudHandler.addEntry(cloudEntryDropbox);
               }
 
-              dataUtils.addAccount(cloudStorageDropbox);
+              DropboxAccount.INSTANCE.add(cloudStorageDropbox);
               hasUpdatedDrawer = true;
             } catch (CloudPluginException e) {
               e.printStackTrace();
@@ -265,7 +269,7 @@ public Boolean doInBackground(Void... voids) {
                 cloudHandler.addEntry(cloudEntryBox);
               }
 
-              dataUtils.addAccount(cloudStorageBox);
+              BoxAccount.INSTANCE.add(cloudStorageBox);
               hasUpdatedDrawer = true;
             } catch (CloudPluginException e) {
               e.printStackTrace();
@@ -330,7 +334,7 @@ public Boolean doInBackground(Void... voids) {
                 cloudHandler.addEntry(cloudEntryOnedrive);
               }
 
-              dataUtils.addAccount(cloudStorageOnedrive);
+              OnedriveAccount.INSTANCE.add(cloudStorageOnedrive);
               hasUpdatedDrawer = true;
             } catch (CloudPluginException e) {
               e.printStackTrace();

app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/DeleteTask.java

@@ -172,7 +172,7 @@ private boolean doDeleteFile(@NonNull HybridFileParcelable file) throws Exceptio
       case BOX:
       case GDRIVE:
       case ONEDRIVE:
-        CloudStorage cloudStorage = dataUtils.getAccount(file.getMode());
+        CloudStorage cloudStorage = dataUtils.getAccount(file.getMode()).getAccount();
         try {
           cloudStorage.delete(CloudUtil.stripPath(file.getMode(), file.getPath()));
           return true;

app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/LoadFilesListTask.java

@@ -24,6 +24,7 @@
 import static android.os.Build.VERSION_CODES.Q;
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -38,6 +39,7 @@
 import com.amaze.filemanager.database.UtilsHandler;
 import com.amaze.filemanager.file_operations.exceptions.CloudPluginException;
 import com.amaze.filemanager.file_operations.filesystem.OpenMode;
+import com.amaze.filemanager.file_operations.filesystem.filetypes.AmazeFile;
 import com.amaze.filemanager.filesystem.HybridFile;
 import com.amaze.filemanager.filesystem.HybridFileParcelable;
 import com.amaze.filemanager.filesystem.RootHelper;
@@ -69,8 +71,6 @@
 import androidx.core.util.Pair;
 
 import jcifs.smb.SmbAuthException;
-import jcifs.smb.SmbException;
-import jcifs.smb.SmbFile;
 
 public class LoadFilesListTask
     extends AsyncTask<Void, Void, Pair<OpenMode, ArrayList<LayoutElementParcelable>>> {
@@ -141,7 +141,7 @@ public LoadFilesListTask(
           hFile.setPath(hFile.getPath() + "/");
         }
         try {
-          SmbFile[] smbFile = hFile.getSmbFile(5000).listFiles();
+          AmazeFile[] smbFile = new AmazeFile(hFile.getPath()).listFiles(() -> context);
           list = mainFragment.addToSmb(smbFile, path, showHiddenFiles);
           openmode = OpenMode.SMB;
         } catch (SmbAuthException e) {
@@ -150,7 +150,7 @@ public LoadFilesListTask(
           }
           e.printStackTrace();
           return null;
-        } catch (SmbException | NullPointerException e) {
+        } catch (NullPointerException | IOException e) {
           Log.w(getClass().getSimpleName(), "Failed to load smb files for path: " + path, e);
           mainFragment.reauthenticateSmb();
           return null;
@@ -225,7 +225,7 @@ public LoadFilesListTask(
       case BOX:
       case GDRIVE:
       case ONEDRIVE:
-        CloudStorage cloudStorage = dataUtils.getAccount(openmode);
+        CloudStorage cloudStorage = dataUtils.getAccount(openmode).getAccount();
         list = new ArrayList<>();
 
         try {

app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/hashcalculator/CalculateHashCallback.java

@@ -27,6 +27,8 @@
 import java.util.Objects;
 import java.util.concurrent.Callable;
 
+import com.amaze.filemanager.file_operations.filesystem.filetypes.AmazeFile;
+import com.amaze.filemanager.file_operations.filesystem.filetypes.ContextProvider;
 import com.amaze.filemanager.filesystem.HybridFileParcelable;
 import com.amaze.filemanager.filesystem.files.GenericCopyUtil;
 
@@ -37,18 +39,12 @@
 /** Generates hashes from files (MD5 and SHA256) */
 public class CalculateHashCallback implements Callable<Hash> {
 
-  private final boolean isNotADirectory;
-  private final InputStream inputStreamMd5;
-  private final InputStream inputStreamSha;
+  private final AmazeFile file;
+  private final ContextProvider contextProvider;
 
-  public CalculateHashCallback(HybridFileParcelable file, final Context context) {
-    if (file.isSftp()) {
-      throw new IllegalArgumentException("Use CalculateHashSftpCallback");
-    }
-
-    this.isNotADirectory = !file.isDirectory(context);
-    this.inputStreamMd5 = file.getInputStream(context);
-    this.inputStreamSha = file.getInputStream(context);
+  public CalculateHashCallback(AmazeFile file, final Context context) {
+    this.file = file;
+    this.contextProvider = () -> context;
   }
 
   @WorkerThread
@@ -57,67 +53,14 @@ public Hash call() throws Exception {
     String md5 = null;
     String sha256 = null;
 
-    if (isNotADirectory) {
-      md5 = getMD5Checksum();
-      sha256 = getSHA256Checksum();
+    if (!file.isDirectory(contextProvider)) {
+      md5 = file.getHashMD5(contextProvider);
+      sha256 = file.getHashSHA256(contextProvider);
     }
 
     Objects.requireNonNull(md5);
     Objects.requireNonNull(sha256);
 
     return new Hash(md5, sha256);
   }
-
-  // see this How-to for a faster way to convert a byte array to a HEX string
-
-  private String getMD5Checksum() throws Exception {
-    byte[] b = createChecksum();
-    String result = "";
-
-    for (byte aB : b) {
-      result += Integer.toString((aB & 0xff) + 0x100, 16).substring(1);
-    }
-    return result;
-  }
-
-  private String getSHA256Checksum() throws NoSuchAlgorithmException, IOException {
-    MessageDigest messageDigest = MessageDigest.getInstance("SHA-256");
-    byte[] input = new byte[GenericCopyUtil.DEFAULT_BUFFER_SIZE];
-    int length;
-    InputStream inputStream = inputStreamMd5;
-    while ((length = inputStream.read(input)) != -1) {
-      if (length > 0) messageDigest.update(input, 0, length);
-    }
-
-    byte[] hash = messageDigest.digest();
-
-    StringBuilder hexString = new StringBuilder();
-
-    for (byte aHash : hash) {
-      // convert hash to base 16
-      String hex = Integer.toHexString(0xff & aHash);
-      if (hex.length() == 1) hexString.append('0');
-      hexString.append(hex);
-    }
-    inputStream.close();
-    return hexString.toString();
-  }
-
-  private byte[] createChecksum() throws Exception {
-    InputStream fis = inputStreamSha;
-
-    byte[] buffer = new byte[8192];
-    MessageDigest complete = MessageDigest.getInstance("MD5");
-    int numRead;
-
-    do {
-      numRead = fis.read(buffer);
-      if (numRead > 0) {
-        complete.update(buffer, 0, numRead);
-      }
-    } while (numRead != -1);
-
-    fis.close();
-    return complete.digest();
-  }
 }

app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/hashcalculator/CalculateHashTask.kt

@@ -28,6 +28,8 @@ import android.widget.TextView
 import android.widget.Toast
 import com.amaze.filemanager.R
 import com.amaze.filemanager.asynchronous.asynctasks.Task
+import com.amaze.filemanager.file_operations.filesystem.filetypes.AmazeFile
+import com.amaze.filemanager.file_operations.filesystem.filetypes.ContextProvider
 import com.amaze.filemanager.filesystem.HybridFileParcelable
 import com.amaze.filemanager.filesystem.files.FileUtils
 import java.lang.ref.WeakReference
@@ -37,7 +39,7 @@ import java.util.concurrent.Callable
 data class Hash(val md5: String, val sha: String)
 
 class CalculateHashTask(
-    private val file: HybridFileParcelable,
+    private val file: AmazeFile,
     context: Context,
     view: View
 ) : Task<Hash, Callable<Hash>> {
@@ -46,11 +48,7 @@ class CalculateHashTask(
         private val TAG = CalculateHashTask::class.java.simpleName
     }
 
-    private val task: Callable<Hash> = if (file.isSftp) {
-        CalculateHashSftpCallback(file)
-    } else {
-        CalculateHashCallback(file, context)
-    }
+    private val task: Callable<Hash> = CalculateHashCallback(file, context)
 
     private val context = WeakReference(context)
     private val view = WeakReference(view)
@@ -82,7 +80,11 @@ class CalculateHashTask(
         val mMD5LinearLayout = view.findViewById<LinearLayout>(R.id.properties_dialog_md5)
         val mSHA256LinearLayout = view.findViewById<LinearLayout>(R.id.properties_dialog_sha256)
 
-        if (!file.isDirectory(context) && file.getSize() != 0L) {
+        val contextProvider = object : ContextProvider {
+            override fun getContext(): Context? = context
+        }
+
+        if (!file.isDirectory(contextProvider) && file.safeLength(contextProvider) != 0L) {
             md5HashText.text = md5Text
             sha256Text.text = shaText
             mMD5LinearLayout.setOnLongClickListener {

app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/movecopy/MoveFiles.java

@@ -131,7 +131,7 @@ private MoveFilesReturn processFile(
       case GDRIVE:
         DataUtils dataUtils = DataUtils.getInstance();
 
-        CloudStorage cloudStorage = dataUtils.getAccount(mode);
+        CloudStorage cloudStorage = dataUtils.getAccount(mode).getAccount();
         if (baseFile.getMode() == mode) {
           // source and target both in same filesystem, use API method
           try {

app/src/main/java/com/amaze/filemanager/database/CloudHandler.java

@@ -25,6 +25,10 @@
 import com.amaze.filemanager.database.models.explorer.CloudEntry;
 import com.amaze.filemanager.file_operations.exceptions.CloudPluginException;
 import com.amaze.filemanager.file_operations.filesystem.OpenMode;
+import com.amaze.filemanager.file_operations.filesystem.filetypes.cloud.box.BoxAmazeFilesystem;
+import com.amaze.filemanager.file_operations.filesystem.filetypes.cloud.dropbox.DropboxAmazeFilesystem;
+import com.amaze.filemanager.file_operations.filesystem.filetypes.cloud.gdrive.GoogledriveAmazeFilesystem;
+import com.amaze.filemanager.file_operations.filesystem.filetypes.cloud.onedrive.OnedriveAmazeFilesystem;
 import com.amaze.filemanager.ui.fragments.CloudSheetFragment;
 
 import android.content.Context;
@@ -37,10 +41,10 @@
 /** Created by vishal on 18/4/17. */
 public class CloudHandler {
 
-  public static final String CLOUD_PREFIX_BOX = "box:/";
-  public static final String CLOUD_PREFIX_DROPBOX = "dropbox:/";
-  public static final String CLOUD_PREFIX_GOOGLE_DRIVE = "gdrive:/";
-  public static final String CLOUD_PREFIX_ONE_DRIVE = "onedrive:/";
+  public static final String CLOUD_PREFIX_BOX = BoxAmazeFilesystem.PREFIX;
+  public static final String CLOUD_PREFIX_DROPBOX = DropboxAmazeFilesystem.PREFIX;
+  public static final String CLOUD_PREFIX_GOOGLE_DRIVE = GoogledriveAmazeFilesystem.PREFIX;
+  public static final String CLOUD_PREFIX_ONE_DRIVE = OnedriveAmazeFilesystem.PREFIX;
 
   public static final String CLOUD_NAME_GOOGLE_DRIVE = "Google Drive™";
   public static final String CLOUD_NAME_DROPBOX = "Dropbox";

app/src/main/java/com/amaze/filemanager/filesystem/DeleteOperation.kt

@@ -27,6 +27,7 @@ import android.provider.MediaStore
 import android.util.Log
 import java.io.File
 
+@Deprecated("Use AmazeFile.delete()")
 object DeleteOperation {
     private val LOG = "DeleteFileOperation"
 

app/src/main/java/com/amaze/filemanager/filesystem/ExternalSdCardOperation.kt

@@ -26,12 +26,12 @@ import android.net.Uri
 import android.os.Build
 import android.util.Log
 import androidx.documentfile.provider.DocumentFile
-import androidx.preference.PreferenceManager
-import com.amaze.filemanager.ui.fragments.preference_fragments.PreferencesConstants
+import com.amaze.filemanager.file_operations.filesystem.filetypes.file.UriForSafPersistance
 import java.io.File
 import java.io.IOException
 import java.util.*
 
+@Deprecated("Use [com.amaze.filemanager.file_operations.filesystem.filetypes.file.ExternalSdCardOperation]")
 object ExternalSdCardOperation {
     val LOG = "ExternalSdCardOperation"
 
@@ -67,8 +67,7 @@ object ExternalSdCardOperation {
             return null
         }
 
-        val preferenceUri = PreferenceManager.getDefaultSharedPreferences(context)
-            .getString(PreferencesConstants.PREFERENCE_URI, null)
+        val preferenceUri = UriForSafPersistance.get(context)
         var treeUri: Uri? = null
         if (preferenceUri != null) {
             treeUri = Uri.parse(preferenceUri)

app/src/main/java/com/amaze/filemanager/filesystem/FileUtil.java

@@ -197,7 +197,7 @@ public static final void writeUriToStorage(
                     case GDRIVE:
                       OpenMode mode = hFile.getMode();
 
-                      CloudStorage cloudStorage = dataUtils.getAccount(mode);
+                      CloudStorage cloudStorage = dataUtils.getAccount(mode).getAccount();
                       String path = CloudUtil.stripPath(mode, finalFilePath);
                       cloudStorage.upload(path, bufferedInputStream, documentFile.length(), true);
                       retval.add(path);

app/src/main/java/com/amaze/filemanager/filesystem/FilesystemLoader.kt

@@ -0,0 +1,20 @@
+package com.amaze.filemanager.filesystem
+
+import com.amaze.filemanager.file_operations.filesystem.filetypes.AmazeFile
+import com.amaze.filemanager.file_operations.filesystem.filetypes.smb.SmbAmazeFilesystem
+import com.amaze.filemanager.filesystem.files.FileAmazeFilesystem
+import com.amaze.filemanager.filesystem.otg.OtgAmazeFilesystem
+import com.amaze.filemanager.filesystem.ssh.SshAmazeFilesystem
+
+/**
+ * TODO remove this by moving all Filesystem subclasses to file_operations
+ */
+object FilesystemLoader {
+    init {
+        AmazeFile //Loads all of the file_operations Filesystem subclasses
+        FileAmazeFilesystem
+        OtgAmazeFilesystem
+        SmbAmazeFilesystem
+        SshAmazeFilesystem.INSTANCE
+    }
+}