Added copy, move, cancel options in permission dialog.

* Using the error message from string file instead of a hardcoded string.
kiwix · Sep 2, 2024 · 55a586d · 55a586d
1 parent a5b967f
commit 55a586d
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 27 deletions.
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryFragment.kt
@@ -629,8 +629,7 @@ class LocalLibraryFragment : BaseFragment(), CopyMoveFileHandler.FileCopyMoveCal
   }
 
   override fun filesystemDoesNotSupportedCopyMoveFilesOver4GB() {
-    val message = "Your fileSystem does not support files over 4GB"
-    showStorageSelectionSnackBar(message)
+    showStorageSelectionSnackBar(getString(R.string.file_system_does_not_support_4gb))
   }
 
   override fun insufficientSpaceInStorage(availableSpace: Long) {

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/reader/CopyMoveFileHandler.kt b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/reader/CopyMoveFileHandler.kt
@@ -91,32 +91,54 @@ class CopyMoveFileHandler @Inject constructor(
     uri?.let { selectedFileUri = it }
     file?.let { selectedFile = it }
     if (!sharedPreferenceUtil.copyMoveZimFilePermissionDialog) {
-      alertDialogShower.show(
-        KiwixDialog.MoveFileToPublicDirectoryPermissionDialog,
-        {
-          sharedPreferenceUtil.copyMoveZimFilePermissionDialog = true
-          validateAndShowCopyMoveDialog()
-        }
-      )
+      showMoveToPublicDirectoryPermissionDialog()
     } else {
-      validateAndShowCopyMoveDialog()
+      if (validateZimFileCanCopyOrMove()) {
+        showCopyMoveDialog()
+      }
     }
   }
 
+  private fun showMoveToPublicDirectoryPermissionDialog() {
+    alertDialogShower.show(
+      KiwixDialog.MoveFileToPublicDirectoryPermissionDialog,
+      {
+        sharedPreferenceUtil.copyMoveZimFilePermissionDialog = true
+        if (validateZimFileCanCopyOrMove()) {
+          performCopyOperation()
+        }
+      },
+      {
+        sharedPreferenceUtil.copyMoveZimFilePermissionDialog = true
+        if (validateZimFileCanCopyOrMove()) {
+          performMoveOperation()
+        }
+      }
+    )
+  }
+
   private fun isBookLessThan4GB(): Boolean =
     (selectedFile?.length() ?: 0L) < FOUR_GIGABYTES_IN_KILOBYTES
 
-  private fun validateAndShowCopyMoveDialog() {
+  private fun validateZimFileCanCopyOrMove(): Boolean {
     hidePreparingCopyMoveDialog() // hide the dialog if already showing
     val availableSpace = storageCalculator.availableBytes()
     if (hasNotSufficientStorageSpace(availableSpace)) {
       fileCopyMoveCallback?.insufficientSpaceInStorage(availableSpace)
-      return
+      return false
     }
-    when (fat32Checker.fileSystemStates.value) {
-      DetectingFileSystem -> handleDetectingFileSystemState()
-      CannotWrite4GbFile -> handleCannotWrite4GbFileState()
-      else -> showCopyMoveDialog()
+    return when (fat32Checker.fileSystemStates.value) {
+      DetectingFileSystem -> {
+        handleDetectingFileSystemState()
+        false
+      }
+
+      CannotWrite4GbFile -> {
+        handleCannotWrite4GbFileState()
+        false
+      }
+
+      else -> true
     }
   }
 
@@ -143,24 +165,31 @@ class CopyMoveFileHandler @Inject constructor(
     fileSystemDisposable = fat32Checker.fileSystemStates
       .observeOn(AndroidSchedulers.mainThread())
       .subscribe {
-        validateAndShowCopyMoveDialog()
+        hidePreparingCopyMoveDialog()
+        if (validateZimFileCanCopyOrMove()) {
+          showCopyMoveDialog()
+        }
       }
   }
 
   private fun showCopyMoveDialog() {
     alertDialogShower.show(
       KiwixDialog.CopyMoveFileToPublicDirectoryDialog,
-      {
-        isMoveOperation = false
-        copyZimFileToPublicAppDirectory()
-      },
-      {
-        isMoveOperation = true
-        moveZimFileToPublicAppDirectory()
-      }
+      ::performCopyOperation,
+      ::performMoveOperation
     )
   }
 
+  private fun performCopyOperation() {
+    isMoveOperation = false
+    copyZimFileToPublicAppDirectory()
+  }
+
+  private fun performMoveOperation() {
+    isMoveOperation = true
+    moveZimFileToPublicAppDirectory()
+  }
+
   private fun copyZimFileToPublicAppDirectory() {
     lifecycleScope?.launch {
       val destinationFile = getDestinationFile()

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/dialog/KiwixDialog.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/dialog/KiwixDialog.kt
@@ -112,8 +112,9 @@ sealed class KiwixDialog(
   data object MoveFileToPublicDirectoryPermissionDialog : KiwixDialog(
     R.string.move_files_permission_dialog_title,
     R.string.move_files_permission_dialog_description,
-    R.string.yes,
-    R.string.no,
+    R.string.copy,
+    R.string.move,
+    neutralMessage = R.string.cancel,
     cancelable = false
   )