From 15f714b3599d4b3d550b4092ce84b26c9abe2deb Mon Sep 17 00:00:00 2001
From: Nikola Trubitsyn <nikola.trubitsyn@gmail.com>
Date: Wed, 31 Jan 2018 01:07:56 +0300
Subject: [PATCH] Update favorites when renaming or removing a directory

Fixes #163
---
 .../filemanager/adapters/ItemsAdapter.kt         |  5 ++++-
 .../filemanager/helpers/Config.kt                | 16 +++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
index 422ea9df..2f18caca 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
@@ -113,7 +113,9 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
     }
 
     private fun displayRenameDialog() {
-        RenameItemDialog(activity, getSelectedMedia()[0].path) {
+        val oldPath = getSelectedMedia()[0].path
+        RenameItemDialog(activity, oldPath) {
+            activity.config.moveFavorite(oldPath, it)
             activity.runOnUiThread {
                 listener?.refreshItems()
                 finishActMode()
@@ -358,6 +360,7 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
                 val file = fileDirItems[it]
                 files.add(File(file.path))
                 removeFiles.add(file)
+                activity.config.removeFavorite(file.path)
             }
 
             fileDirItems.removeAll(removeFiles)
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/helpers/Config.kt
index c8bf4fa1..32018123 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/helpers/Config.kt
@@ -5,7 +5,6 @@ import com.simplemobiletools.commons.extensions.getInternalStoragePath
 import com.simplemobiletools.commons.helpers.BaseConfig
 import com.simplemobiletools.commons.helpers.SORT_BY_NAME
 import java.io.File
-import java.util.*
 
 class Config(context: Context) : BaseConfig(context) {
     companion object {
@@ -38,7 +37,22 @@ class Config(context: Context) : BaseConfig(context) {
         favorites = currFavorites
     }
 
+    fun moveFavorite(oldPath: String, newPath: String) {
+        if (!favorites.contains(oldPath)) {
+            return
+        }
+
+        val currFavorites = HashSet<String>(favorites)
+        currFavorites.remove(oldPath)
+        currFavorites.add(newPath)
+        favorites = currFavorites
+    }
+
     fun removeFavorite(path: String) {
+        if (!favorites.contains(path)) {
+            return
+        }
+
         val currFavorites = HashSet<String>(favorites)
         currFavorites.remove(path)
         favorites = currFavorites