From 2c2334dea3442689673c138b8a4794860690f611 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 25 May 2018 20:04:07 +0200
Subject: [PATCH] persist Skip Delete Confirmation in the whole app launch
 session

---
 .../com/simplemobiletools/gallery/activities/MainActivity.kt | 1 +
 .../simplemobiletools/gallery/activities/MediaActivity.kt    | 1 +
 .../gallery/activities/ViewPagerActivity.kt                  | 5 ++---
 .../com/simplemobiletools/gallery/adapters/MediaAdapter.kt   | 5 ++---
 .../kotlin/com/simplemobiletools/gallery/helpers/Config.kt   | 4 ++++
 .../com/simplemobiletools/gallery/helpers/Constants.kt       | 1 +
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
index 5b9170149..977ab66ca 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
@@ -188,6 +188,7 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
     override fun onDestroy() {
         super.onDestroy()
         config.temporarilyShowHidden = false
+        config.tempSkipDeleteConfirmation = false
         mTempShowHiddenHandler.removeCallbacksAndMessages(null)
         removeTempFolder()
         if (!isChangingConfigurations) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
index 877fcf228..fa5ebcb5f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
@@ -175,6 +175,7 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
         super.onDestroy()
         if (config.showAll) {
             config.temporarilyShowHidden = false
+            config.tempSkipDeleteConfirmation = false
         }
 
         mTempShowHiddenHandler.removeCallbacksAndMessages(null)
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 95a5ed982..31a23202a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
@@ -58,7 +58,6 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
     private var mPos = -1
     private var mShowAll = false
     private var mIsSlideshowActive = false
-    private var mSkipConfirmationDialog = false
     private var mRotationDegrees = 0
     private var mPrevHashcode = 0
 
@@ -728,7 +727,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
     }
 
     private fun checkDeleteConfirmation() {
-        if (mSkipConfirmationDialog || config.skipDeleteConfirmation) {
+        if (config.tempSkipDeleteConfirmation || config.skipDeleteConfirmation) {
             deleteConfirmed()
         } else {
             askConfirmDelete()
@@ -737,7 +736,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
 
     private fun askConfirmDelete() {
         DeleteWithRememberDialog(this, getString(R.string.proceed_with_deletion)) {
-            mSkipConfirmationDialog = it
+            config.tempSkipDeleteConfirmation = it
             deleteConfirmed()
         }
     }
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 ee335b249..d1ed183ec 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
@@ -31,7 +31,6 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList<Medium>,
 
     private val config = activity.config
     private val isListViewType = config.viewTypeFiles == VIEW_TYPE_LIST
-    private var skipConfirmationDialog = false
     private var visibleItemPaths = ArrayList<String>()
     private var loadImageInstantly = false
     private var delayHandler = Handler(Looper.getMainLooper())
@@ -202,7 +201,7 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList<Medium>,
     }
 
     private fun checkDeleteConfirmation() {
-        if (skipConfirmationDialog || config.skipDeleteConfirmation) {
+        if (config.tempSkipDeleteConfirmation || config.skipDeleteConfirmation) {
             deleteFiles()
         } else {
             askConfirmDelete()
@@ -213,7 +212,7 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList<Medium>,
         val items = resources.getQuantityString(R.plurals.delete_items, selectedPositions.size, selectedPositions.size)
         val question = String.format(resources.getString(R.string.deletion_confirmation), items)
         DeleteWithRememberDialog(activity, question) {
-            skipConfirmationDialog = it
+            config.tempSkipDeleteConfirmation = it
             deleteFiles()
         }
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
index b4af46227..f52fc5215 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
@@ -318,4 +318,8 @@ class Config(context: Context) : BaseConfig(context) {
     var wasOTGHandled: Boolean
         get() = prefs.getBoolean(WAS_OTG_HANDLED, false)
         set(wasOTGHandled) = prefs.edit().putBoolean(WAS_OTG_HANDLED, wasOTGHandled).apply()
+
+    var tempSkipDeleteConfirmation: Boolean
+        get() = prefs.getBoolean(TEMP_SKIP_DELETE_CONFIRMATION, false)
+        set(tempSkipDeleteConfirmation) = prefs.edit().putBoolean(TEMP_SKIP_DELETE_CONFIRMATION, tempSkipDeleteConfirmation).apply()
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt
index 23d190fab..9d73f8dfe 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt
@@ -48,6 +48,7 @@ const val DO_EXTRA_CHECK = "do_extra_check"
 const val WAS_NEW_APP_SHOWN = "was_new_app_shown_clock"
 const val LAST_FILEPICKER_PATH = "last_filepicker_path"
 const val WAS_OTG_HANDLED = "was_otg_handled"
+const val TEMP_SKIP_DELETE_CONFIRMATION = "temp_skip_delete_confirmation"
 
 // slideshow
 const val SLIDESHOW_INTERVAL = "slideshow_interval"