From 9e6ccbe67c7113ac3d0f6212e578494a0b64a350 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 30 Oct 2018 23:18:36 +0100
Subject: [PATCH] adding password protection to file move and deleting

---
 app/build.gradle                              |  2 +-
 .../gallery/activities/ViewPagerActivity.kt   | 14 +++++-
 .../gallery/adapters/DirectoryAdapter.kt      | 44 ++++++++++++-------
 .../gallery/adapters/MediaAdapter.kt          | 14 +++++-
 4 files changed, 52 insertions(+), 22 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 158049f58..233965a04 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,7 +48,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.2.17'
+    implementation 'com.simplemobiletools:commons:5.2.18'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.0'
     implementation 'androidx.multidex:multidex:2.0.0'
     implementation 'it.sephiroth.android.exif:library:1.0.1'
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
index eee326af9..920745ec6 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
@@ -202,7 +202,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
             R.id.menu_set_as -> setAs(getCurrentPath())
             R.id.menu_slideshow -> initSlideshow()
             R.id.menu_copy_to -> copyMoveTo(true)
-            R.id.menu_move_to -> copyMoveTo(false)
+            R.id.menu_move_to -> moveFileTo()
             R.id.menu_open_with -> openPath(getCurrentPath(), true)
             R.id.menu_hide -> toggleFileVisibility(true)
             R.id.menu_unhide -> toggleFileVisibility(false)
@@ -523,6 +523,12 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
         }
     }
 
+    private fun moveFileTo() {
+        handleDeletePasswordProtection {
+            copyMoveTo(false)
+        }
+    }
+
     private fun copyMoveTo(isCopyOperation: Boolean) {
         val currPath = getCurrentPath()
         if (!isCopyOperation && currPath.startsWith(recycleBinPath)) {
@@ -918,7 +924,11 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
             return
         }
 
-        if (config.tempSkipDeleteConfirmation || config.skipDeleteConfirmation) {
+        if (config.isDeletePasswordProtectionOn) {
+            handleDeletePasswordProtection {
+                deleteConfirmed()
+            }
+        } else if (config.tempSkipDeleteConfirmation || config.skipDeleteConfirmation) {
             deleteConfirmed()
         } else {
             askConfirmDelete()
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
index b40908788..58418c0fd 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
@@ -96,7 +96,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList<Directo
             R.id.cab_unhide -> toggleFoldersVisibility(false)
             R.id.cab_exclude -> tryExcludeFolder()
             R.id.cab_copy_to -> copyMoveTo(true)
-            R.id.cab_move_to -> copyMoveTo(false)
+            R.id.cab_move_to -> moveFilesTo()
             R.id.cab_select_all -> selectAll()
             R.id.cab_delete -> askConfirmDelete()
             R.id.cab_select_photo -> changeAlbumCover(false)
@@ -310,6 +310,12 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList<Directo
         listener?.recheckPinnedFolders()
     }
 
+    private fun moveFilesTo() {
+        activity.handleDeletePasswordProtection {
+            copyMoveTo(false)
+        }
+    }
+
     private fun copyMoveTo(isCopyOperation: Boolean) {
         val paths = ArrayList<String>()
         val showHidden = activity.config.shouldShowHidden
@@ -343,24 +349,28 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList<Directo
     }
 
     private fun askConfirmDelete() {
-        if (config.skipDeleteConfirmation) {
-            deleteFolders()
-        } else {
-            val itemsCnt = selectedKeys.size
-            val items = resources.getQuantityString(R.plurals.delete_items, itemsCnt, itemsCnt)
-            val fileDirItem = getFirstSelectedItem() ?: return
-            val baseString = if (!config.useRecycleBin || (isOneItemSelected() && fileDirItem.isRecycleBin()) || (isOneItemSelected() && fileDirItem.areFavorites())) {
-                R.string.deletion_confirmation
-            } else {
-                R.string.move_to_recycle_bin_confirmation
-            }
-
-            var question = String.format(resources.getString(baseString), items)
-            val warning = resources.getQuantityString(R.plurals.delete_warning, itemsCnt, itemsCnt)
-            question += "\n\n$warning"
-            ConfirmationDialog(activity, question) {
+        when {
+            config.isDeletePasswordProtectionOn -> activity.handleDeletePasswordProtection {
                 deleteFolders()
             }
+            config.skipDeleteConfirmation -> deleteFolders()
+            else -> {
+                val itemsCnt = selectedKeys.size
+                val items = resources.getQuantityString(R.plurals.delete_items, itemsCnt, itemsCnt)
+                val fileDirItem = getFirstSelectedItem() ?: return
+                val baseString = if (!config.useRecycleBin || (isOneItemSelected() && fileDirItem.isRecycleBin()) || (isOneItemSelected() && fileDirItem.areFavorites())) {
+                    R.string.deletion_confirmation
+                } else {
+                    R.string.move_to_recycle_bin_confirmation
+                }
+
+                var question = String.format(resources.getString(baseString), items)
+                val warning = resources.getQuantityString(R.plurals.delete_warning, itemsCnt, itemsCnt)
+                question += "\n\n$warning"
+                ConfirmationDialog(activity, question) {
+                    deleteFolders()
+                }
+            }
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
index 1e8324fde..14cb627d0 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
@@ -140,7 +140,7 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList<Thumbnai
             R.id.cab_restore_recycle_bin_files -> restoreFiles()
             R.id.cab_share -> shareMedia()
             R.id.cab_copy_to -> copyMoveTo(true)
-            R.id.cab_move_to -> copyMoveTo(false)
+            R.id.cab_move_to -> moveFilesTo()
             R.id.cab_select_all -> selectAll()
             R.id.cab_open_with -> openPath()
             R.id.cab_fix_date_taken -> fixDateTaken()
@@ -275,6 +275,12 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList<Thumbnai
         }
     }
 
+    private fun moveFilesTo() {
+        activity.handleDeletePasswordProtection {
+            copyMoveTo(false)
+        }
+    }
+
     private fun copyMoveTo(isCopyOperation: Boolean) {
         val paths = getSelectedPaths()
 
@@ -351,7 +357,11 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList<Thumbnai
     }
 
     private fun checkDeleteConfirmation() {
-        if (config.tempSkipDeleteConfirmation || config.skipDeleteConfirmation) {
+        if (config.isDeletePasswordProtectionOn) {
+            activity.handleDeletePasswordProtection {
+                deleteFiles()
+            }
+        } else if (config.tempSkipDeleteConfirmation || config.skipDeleteConfirmation) {
             deleteFiles()
         } else {
             askConfirmDelete()