Fix: AlreadyRunning Method for DocumentFile actions

- chore: code cleanup
- bugfix: #7

Signed-off-by: Alex Yackers <7115964+yackers@users.noreply.github.com>

Author: yackers

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -20,6 +20,7 @@ body:
           - **Flutter**: 2.5.2
           - **Dart**: 2.14.3
           - **DocMan version**: 1.0.2
+        
         Android information (optional): 
           - **OS**: Android 11
           - **Device**: Pixel 5

android/src/main/kotlin/devdf/plugins/docman/DocManDocumentsProvider.kt

@@ -265,7 +265,7 @@ class DocManDocumentsProvider : DocumentsProvider() {
             )
             removeDocument(sourceDocumentId, sourceParentDocumentId)
             return newDocumentId
-        } catch (e: FileNotFoundException) {
+        } catch (_: FileNotFoundException) {
             throw FileNotFoundException("Couldn't move document '$sourceDocumentId'")
         }
     }

android/src/main/kotlin/devdf/plugins/docman/channels/DocManActivity.kt

@@ -42,8 +42,8 @@ internal class DocManActivity(private val plugin: DocManPlugin) : EngineBase,
 
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean {
-        return plugin.queue.methodCast<ActivityMethodBase>(requestCode)
-            ?.onActivityResult(resultCode, data) ?: false
+        return plugin.queue.methodCast<ActivityMethodBase>(requestCode.toString())
+            ?.onActivityResult(resultCode, data) == true
     }
 
     override fun onAttach() {

android/src/main/kotlin/devdf/plugins/docman/definitions/DocManInterface.kt

@@ -128,8 +128,8 @@ interface MethodMeta {
         get() = meta.errorCode
     val method: String
         get() = meta.methodName
-    val requestCode: Int
-        get() = meta.requestCode
+    val requestCode: String
+        get() = meta.requestCode.toString()
 }
 
 

android/src/main/kotlin/devdf/plugins/docman/extensions/DocumentFileExt.kt

@@ -156,7 +156,7 @@ fun DocumentFile.canCreate(context: Context): Boolean =
  */
 //TODO: add additional thumbnail types like docx, xls, maybe others
 fun DocumentFile.canThumbnailAlternate(context: Context): Boolean =
-    canRead() && (type == "application/pdf" || isVideo(context) || isImage(context))
+    canRead() && (isPDF() || isVideo(context) || isImage(context))
 
 /** Get the persisted URI of the [DocumentFile]
  *
@@ -320,6 +320,9 @@ fun DocumentFile.isVideo(context: Context): Boolean =
 fun DocumentFile.isVisualMedia(context: Context): Boolean =
     isImage(context) || isVideo(context)
 
+/** Check if the [DocumentFile] is a PDF file */
+fun DocumentFile.isPDF(): Boolean = type == "application/pdf"
+
 /** Copy the [DocumentFile] to the cache directory.
  *
  *  Must be called from a coroutine.

android/src/main/kotlin/devdf/plugins/docman/extensions/StringExt.kt

@@ -13,7 +13,7 @@ fun String.toUri(): Uri {
     return if (parsedScheme.isNullOrEmpty() || ("${this[0]}" == "/")) {
         try {
             Uri.fromFile(File(this))
-        } catch (e: Exception) {
+        } catch (_: Exception) {
             parsed
         }
     } else parsed

android/src/main/kotlin/devdf/plugins/docman/methods/AppDirsAction.kt

@@ -59,6 +59,7 @@ class AppDirsAction(
         dirPath?.let { success(it) } ?: dirPathError()
     }
 
+
     private fun clear() {
         // Clear the cache directory, currently only cache directory is supported
         if (dir == AppDirType.Cache) DocManFiles.clearCacheDirectories(plugin.context)

android/src/main/kotlin/devdf/plugins/docman/methods/DocumentFileAction.kt

@@ -40,6 +40,8 @@ class DocumentFileAction(
 
     override val meta: DocManMethod = DocManMethod.DocumentFileAction
 
+    /// Override the requestCode, to allow multiple actions on different documents
+    override val requestCode: String = call.argument<String>("uri") ?: meta.requestCode.toString()
     private lateinit var doc: DocumentFile
 
     override fun oMethodCall() {

android/src/main/kotlin/devdf/plugins/docman/methods/DocumentFileActivity.kt

@@ -53,8 +53,8 @@ class DocumentFileActivity(
         }
 
         try {
-            plugin.binding?.activity?.startActivityForResult(intent, requestCode)
-        } catch (e: Exception) {
+            plugin.binding?.activity?.startActivityForResult(intent, requestCode.toInt())
+        } catch (_: Exception) {
             plugin.queue.finishWithError(requestCode, "no_activity", action, null)
         }
     }
@@ -79,7 +79,7 @@ class DocumentFileActivity(
     }
 
     private fun actionCreateDocumentIntent(): Intent {
-        val localOnly = call.argument<Boolean>("localOnly") ?: false
+        val localOnly = call.argument<Boolean>("localOnly") == true
         val initDir = call.argument<String>("initDir")
         return Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
             addCategory(Intent.CATEGORY_OPENABLE)
@@ -104,7 +104,7 @@ class DocumentFileActivity(
     }
 
     private fun processSaveTo(data: Intent?) {
-        val deleteSource = call.argument<Boolean>("deleteSource") ?: false
+        val deleteSource = call.argument<Boolean>("deleteSource") == true
         if (data != null && data.data != null) {
             CoroutineScope(Dispatchers.IO).launch {
                 val newDoc = doc.saveToUri(data.data!!, deleteSource, plugin.context)

android/src/main/kotlin/devdf/plugins/docman/methods/PermissionsAction.kt

@@ -32,9 +32,9 @@ class PermissionsAction(
 
     private val uri: Uri? = call.argument<String>("uri")?.toUri()
 
-    private val dirs: Boolean = call.argument<Boolean>("dirs") ?: true
+    private val dirs: Boolean = call.argument<Boolean>("dirs") != false
 
-    private val files: Boolean = call.argument<Boolean>("files") ?: true
+    private val files: Boolean = call.argument<Boolean>("files") != false
 
     override fun oMethodCall() {
         //Validate the action