Feature/remove main thread queries

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

@@ -22,7 +22,6 @@
 
 import java.lang.ref.WeakReference;
 
-import com.amaze.filemanager.database.CloudHandler;
 import com.amaze.filemanager.ui.activities.MainActivity;
 
 import android.database.Cursor;
@@ -34,7 +33,7 @@ public class CloudLoaderAsyncTask extends AsyncTask<Void, Void, Boolean> {
 
  private final WeakReference<MainActivity> mainActivity;
 
- public CloudLoaderAsyncTask(MainActivity mainActivity, CloudHandler unused1, Cursor unused2) {
+ public CloudLoaderAsyncTask(MainActivity mainActivity, Cursor unused2) {
  this.mainActivity = new WeakReference<>(mainActivity);
  }
 

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

@@ -122,8 +122,7 @@ protected final AsyncTaskResult<Boolean> doInBackground(
 
  // delete file entry from encrypted database
  if (file.getName(applicationContext).endsWith(CryptUtil.CRYPT_EXTENSION)) {
- CryptHandler handler = CryptHandler.INSTANCE;
- handler.clear(file.getPath());
+ CryptHandler.clear(file.getPath());
  }
  }
 

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

@@ -122,7 +122,7 @@ class MoveFilesTask(
  newEntry.id = oldEntry.id
  newEntry.password = oldEntry.password
  newEntry.path = paths[i] + "/" + file.getName(applicationContext)
- CryptHandler.updateEntry(oldEntry, newEntry)
+ CryptHandler.updateEntry(newEntry)
  }
  }
  }

app/src/main/java/com/amaze/filemanager/asynchronous/services/CopyService.java

@@ -323,8 +323,7 @@ private void findAndReplaceEncryptedEntry(HybridFileParcelable sourceFile) {
  if (sourceFile.getName(c).endsWith(CryptUtil.CRYPT_EXTENSION)) {
  try {
 
- CryptHandler cryptHandler = CryptHandler.INSTANCE;
- EncryptedEntry oldEntry = cryptHandler.findEntry(sourceFile.getPath());
+ EncryptedEntry oldEntry = CryptHandler.findEntry(sourceFile.getPath());
  EncryptedEntry newEntry = new EncryptedEntry();
 
  newEntry.setPassword(oldEntry.getPassword());
@@ -334,10 +333,10 @@ private void findAndReplaceEncryptedEntry(HybridFileParcelable sourceFile) {
 
  // file was been moved, update the existing entry
  newEntry.setId(oldEntry.getId());
- cryptHandler.updateEntry(oldEntry, newEntry);
+ CryptHandler.updateEntry(newEntry);
  } else {
  // file was copied, create a new entry with same data
- cryptHandler.addEntry(newEntry);
+ CryptHandler.addEntry(newEntry);
  }
  } catch (Exception e) {
  LOG.warn("failed to find and replace encrypted entry after copy", e);

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

@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2014-2023 Arpit Khurana <[email protected]>, Vishal Nehra <[email protected]>,
+ * Emmanuel Messulam<[email protected]>, Raymond Lai <airwave209gt at gmail.com> and Contributors.
+ *
+ * This file is part of Amaze File Manager.
+ *
+ * Amaze File Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.amaze.filemanager.database
+
+import android.annotation.SuppressLint
+import android.content.Context
+import com.amaze.filemanager.application.AppConfig
+import com.amaze.filemanager.database.daos.CloudEntryDao
+import com.amaze.filemanager.database.models.explorer.CloudEntry
+import com.amaze.filemanager.fileoperations.exceptions.CloudPluginException
+import com.amaze.filemanager.fileoperations.filesystem.OpenMode
+import com.amaze.filemanager.ui.fragments.CloudSheetFragment
+import io.reactivex.schedulers.Schedulers
+import org.slf4j.LoggerFactory
+
+/** Created by vishal on 18/4/17. */
+@SuppressLint("CheckResult")
+object CloudHandler {
+
+ private val LOG = LoggerFactory.getLogger(CloudHandler::class.java)
+
+ private val cloudEntryDao: CloudEntryDao by lazy {
+ AppConfig.getInstance().explorerDatabase.cloudEntryDao()
+ }
+
+ @JvmStatic
+ @Throws(CloudPluginException::class)
+ fun addEntry(context: Context, cloudEntry: CloudEntry?) {
+ if (!CloudSheetFragment.isCloudProviderAvailable(context)) throw CloudPluginException()
+
+ cloudEntryDao.insert(cloudEntry).subscribeOn(Schedulers.io()).subscribe()
+ }
+
+ @JvmStatic
+ fun clear(serviceType: OpenMode) {
+ cloudEntryDao
+ .findByServiceType(serviceType.ordinal)
+ .subscribeOn(Schedulers.io())
+ .subscribe(
+ ::deleteCloudEntry
+ ) { throwable ->
+ LOG.warn("failed to delete cloud connection", throwable)
+ }
+ }
+
+ @JvmStatic
+ @Throws(CloudPluginException::class)
+ fun updateEntry(context: Context, serviceType: OpenMode?, newCloudEntry: CloudEntry) {
+ if (!CloudSheetFragment.isCloudProviderAvailable(context)) throw CloudPluginException()
+
+ cloudEntryDao.update(newCloudEntry).subscribeOn(Schedulers.io()).subscribe()
+ }
+
+ @JvmStatic
+ private fun deleteCloudEntry(cloudEntry: CloudEntry) {
+ cloudEntryDao
+ .delete(cloudEntry)
+ .subscribeOn(Schedulers.io())
+ .subscribe()
+ }
+
+ @JvmStatic
+ fun clearAllCloudConnections() {
+ cloudEntryDao.clear().subscribeOn(Schedulers.io()).blockingGet()
+ }
+
+ @JvmStatic
+ @Throws(CloudPluginException::class)
+ fun findEntry(context: Context, serviceType: OpenMode): CloudEntry? {
+ if (!CloudSheetFragment.isCloudProviderAvailable(context)) throw CloudPluginException()
+
+ return try {
+ cloudEntryDao
+ .findByServiceType(serviceType.ordinal)
+ .subscribeOn(Schedulers.io())
+ .blockingGet()
+ } catch (e: Exception) {
+ // catch error to handle Single#onError for blockingGet
+ LOG.error(javaClass.simpleName, e)
+ null
+ }
+ }
+
+ @JvmStatic
+ @Throws(CloudPluginException::class)
+ fun getAllEntries(context: Context): List<CloudEntry> {
+ if (!CloudSheetFragment.isCloudProviderAvailable(context)) throw CloudPluginException()
+
+ return cloudEntryDao.list().subscribeOn(Schedulers.io()).blockingGet()
+ }
+
+ const val CLOUD_PREFIX_BOX = "box:/"
+ const val CLOUD_PREFIX_DROPBOX = "dropbox:/"
+ const val CLOUD_PREFIX_GOOGLE_DRIVE = "gdrive:/"
+ const val CLOUD_PREFIX_ONE_DRIVE = "onedrive:/"
+
+ const val CLOUD_NAME_GOOGLE_DRIVE = "Google Drive™"
+ const val CLOUD_NAME_DROPBOX = "Dropbox"
+ const val CLOUD_NAME_ONE_DRIVE = "One Drive"
+ const val CLOUD_NAME_BOX = "Box"
+}

app/src/main/java/com/amaze/filemanager/database/CryptHandler.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2020 Arpit Khurana <[email protected]>, Vishal Nehra <[email protected]>,
+ * Copyright (C) 2014-2023 Arpit Khurana <[email protected]>, Vishal Nehra <[email protected]>,
  * Emmanuel Messulam<[email protected]>, Raymond Lai <airwave209gt at gmail.com> and Contributors.
  *
  * This file is part of Amaze File Manager.
@@ -21,6 +21,7 @@
 package com.amaze.filemanager.database
 
 import com.amaze.filemanager.application.AppConfig
+import com.amaze.filemanager.database.daos.EncryptedEntryDao
 import com.amaze.filemanager.database.models.explorer.EncryptedEntry
 import io.reactivex.schedulers.Schedulers
 import org.slf4j.Logger
@@ -30,45 +31,48 @@ import org.slf4j.LoggerFactory
 object CryptHandler {
 
  private val log: Logger = LoggerFactory.getLogger(CryptHandler::class.java)
- private val database: ExplorerDatabase = AppConfig.getInstance().explorerDatabase
+
+ private val encryptedEntryDao: EncryptedEntryDao by lazy {
+ AppConfig.getInstance().explorerDatabase.encryptedEntryDao()
+ }
 
  /**
  * Add [EncryptedEntry] to database.
  */
+ @JvmStatic
  fun addEntry(encryptedEntry: EncryptedEntry) {
- database.encryptedEntryDao().insert(encryptedEntry).subscribeOn(Schedulers.io()).subscribe()
+ encryptedEntryDao.insert(encryptedEntry).subscribeOn(Schedulers.io()).subscribe()
  }
 
  /**
  * Remove [EncryptedEntry] of specified path.
  */
+ @JvmStatic
  fun clear(path: String) {
- database.encryptedEntryDao().delete(path).subscribeOn(Schedulers.io()).subscribe()
+ encryptedEntryDao.delete(path).subscribeOn(Schedulers.io()).subscribe()
  }
 
  /**
  * Update specified new [EncryptedEntry] in database.
  */
- fun updateEntry(oldEncryptedEntry: EncryptedEntry, newEncryptedEntry: EncryptedEntry) {
-  database.encryptedEntryDao().update(newEncryptedEntry).subscribeOn(Schedulers.io())
-  .subscribe()
+ @JvmStatic
+ fun updateEntry(newEncryptedEntry: EncryptedEntry) {
+ encryptedEntryDao.update(newEncryptedEntry).subscribeOn(Schedulers.io()).subscribe()
  }
 
  /**
  * Find [EncryptedEntry] of specified path. Returns null if not exist.
  */
+ @JvmStatic
  fun findEntry(path: String): EncryptedEntry? {
  return runCatching {
- database.encryptedEntryDao().select(path).subscribeOn(Schedulers.io()).blockingGet()
+ encryptedEntryDao.select(path).subscribeOn(Schedulers.io()).blockingGet()
  }.onFailure {
  log.error(it.message!!)
  }.getOrNull()
  }
 
+ @JvmStatic
  val allEntries: Array<EncryptedEntry>
- get() {
- val encryptedEntryList =
- database.encryptedEntryDao().list().subscribeOn(Schedulers.io()).blockingGet()
- return encryptedEntryList.toTypedArray()
- }
+ get() = encryptedEntryDao.list().subscribeOn(Schedulers.io()).blockingGet().toTypedArray()
 }