From 8e67656719f25832bb6462ceae01d1e74a292c1a Mon Sep 17 00:00:00 2001
From: fatih ergin <erginfatih@yahoo.com>
Date: Wed, 21 Jun 2023 23:20:29 +0300
Subject: [PATCH] remember last used copy destination on "Select a folder"
 picker

---
 app/build.gradle                              |  2 +-
 .../filemanager/pro/adapters/ItemsAdapter.kt  | 31 +++++++++++++------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4b537fc1..20bdeee3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -64,7 +64,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:4c83ec8740'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:30e6321592'
     implementation 'com.github.tibbi:PdfViewPager:d2af24208d'
     implementation 'com.github.Stericson:RootTools:df729dcb13'
     implementation 'com.github.Stericson:RootShell:1.6'
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt
index 8c1ae430..9bc7df7f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt
@@ -85,7 +85,7 @@ class ItemsAdapter(
         setupDragListener(true)
         initDrawables()
         updateFontSizes()
-        dateFormat = activity.config.dateFormat
+        dateFormat = config.dateFormat
         timeFormat = activity.getTimeFormat()
     }
 
@@ -223,19 +223,21 @@ class ItemsAdapter(
             paths.size == 1 -> {
                 val oldPath = paths.first()
                 RenameItemDialog(activity, oldPath) {
-                    activity.config.moveFavorite(oldPath, it)
+                    config.moveFavorite(oldPath, it)
                     activity.runOnUiThread {
                         listener?.refreshFragment()
                         finishActMode()
                     }
                 }
             }
+
             fileDirItems.any { it.isDirectory } -> RenameItemsDialog(activity, paths) {
                 activity.runOnUiThread {
                     listener?.refreshFragment()
                     finishActMode()
                 }
             }
+
             else -> RenameDialog(activity, paths, false) {
                 activity.runOnUiThread {
                     listener?.refreshFragment()
@@ -247,10 +249,10 @@ class ItemsAdapter(
 
     private fun showProperties() {
         if (selectedKeys.size <= 1) {
-            PropertiesDialog(activity, getFirstSelectedItemPath(), activity.config.shouldShowHidden)
+            PropertiesDialog(activity, getFirstSelectedItemPath(), config.shouldShowHidden)
         } else {
             val paths = getSelectedFileDirItems().map { it.path }
-            PropertiesDialog(activity, paths, activity.config.shouldShowHidden)
+            PropertiesDialog(activity, paths, config.shouldShowHidden)
         }
     }
 
@@ -338,7 +340,7 @@ class ItemsAdapter(
     @SuppressLint("NewApi")
     private fun addFileUris(path: String, paths: ArrayList<String>) {
         if (activity.getIsPathDirectory(path)) {
-            val shouldShowHidden = activity.config.shouldShowHidden
+            val shouldShowHidden = config.shouldShowHidden
             when {
                 activity.isRestrictedSAFOnlyRoot(path) -> {
                     activity.getAndroidSAFFileItems(path, shouldShowHidden, false) { files ->
@@ -403,11 +405,20 @@ class ItemsAdapter(
         val files = getSelectedFileDirItems()
         val firstFile = files[0]
         val source = firstFile.getParentPath()
-        FilePickerDialog(activity, source, false, activity.config.shouldShowHidden, true, true, showFavoritesButton = true) {
+        FilePickerDialog(
+            activity,
+            activity.getDefaultCopyDestinationPath(config.shouldShowHidden, source),
+            false,
+            config.shouldShowHidden,
+            true,
+            true,
+            showFavoritesButton = true
+        ) {
+            config.lastCopyPath = it
             if (activity.isPathOnRoot(it) || activity.isPathOnRoot(firstFile.path)) {
                 copyMoveRootItems(files, it, isCopyOperation)
             } else {
-                activity.copyMoveFilesTo(files, source, it, isCopyOperation, false, activity.config.shouldShowHidden) {
+                activity.copyMoveFilesTo(files, source, it, isCopyOperation, false, config.shouldShowHidden) {
                     if (!isCopyOperation) {
                         files.forEach { sourceFileDir ->
                             val sourcePath = sourceFileDir.path
@@ -737,7 +748,7 @@ class ItemsAdapter(
             val files = ArrayList<FileDirItem>(selectedKeys.size)
             val positions = ArrayList<Int>()
             selectedKeys.forEach {
-                activity.config.removeFavorite(getItemWithKey(it)?.path ?: "")
+                config.removeFavorite(getItemWithKey(it)?.path ?: "")
                 val key = it
                 val position = listItems.indexOfFirst { it.path.hashCode() == key }
                 if (position != -1) {
@@ -779,13 +790,13 @@ class ItemsAdapter(
     }
 
     fun updateDateTimeFormat() {
-        dateFormat = activity.config.dateFormat
+        dateFormat = config.dateFormat
         timeFormat = activity.getTimeFormat()
         notifyDataSetChanged()
     }
 
     fun updateDisplayFilenamesInGrid() {
-        displayFilenamesInGrid = activity.config.displayFilenames
+        displayFilenamesInGrid = config.displayFilenames
         notifyDataSetChanged()
     }