Fix downloads confirm messages #160 No.4

hazuki0x0 · Feb 15, 2021 · 4f843f0 · 4f843f0
1 parent aec316d
commit 4f843f0
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 30 deletions.
diff --git a/languages/src/main/res/values-ja/strings.xml b/languages/src/main/res/values-ja/strings.xml
@@ -34,6 +34,8 @@
     <string name="confirm_delete_all_displayed_item">表示中の履歴を全て削除しますか？</string>
     <string name="confirm_delete_all_favicon">ファビコンを全て削除しますか？</string>
     <string name="confirm_delete_bookmark">このブックマークを削除しますか？</string>
+    <string name="confirm_delete_download">このファイルをデバイスから削除しますか?</string>
+    <string name="confirm_delete_download_list">このファイルをリストから削除しますか?</string>
     <string name="confirm_delete_button">このボタンを削除しますか？</string>
     <string name="confirm_delete_speedDial">このスピードダイアルを削除しますか？</string>
     <string name="confirm_delete_gesture">このジェスチャーを削除しますか？</string>

diff --git a/languages/src/main/res/values/strings.xml b/languages/src/main/res/values/strings.xml
@@ -35,6 +35,8 @@
     <string name="confirm_delete_all_displayed_item">Delete all displayed items?</string>
     <string name="confirm_delete_all_favicon">Delete all favicon?</string>
     <string name="confirm_delete_bookmark">Delete this bookmark?</string>
+    <string name="confirm_delete_download">Delete this file from device?</string>
+    <string name="confirm_delete_download_list">Delete this file from list?</string>
     <string name="confirm_delete_button">Delete this button?</string>
     <string name="confirm_delete_speedDial">Delete this speed dial?</string>
     <string name="confirm_delete_gesture">Delete this gesture?</string>

diff --git a/...download/src/main/java/jp/hazuki/yuzubrowser/download/ui/fragment/DownloadListFragment.kt b/...download/src/main/java/jp/hazuki/yuzubrowser/download/ui/fragment/DownloadListFragment.kt
@@ -208,44 +208,44 @@ class DownloadListFragment : Fragment(), ActivityClient.ActivityClientListener,
         return when (item.itemId) {
             R.id.delete -> {
                 AlertDialog.Builder(activity)
-                        .setTitle(R.string.confirm)
-                        .setMessage(R.string.confirm_delete_bookmark)
-                        .setPositiveButton(android.R.string.ok) { _, _ ->
-                            val roots = ArrayMap<String, HashMap<String, DocumentFile>>()
-                            val selectedItems = adapter.getSelectedItems()
-                            selectedItems.forEach {
-                                var items = roots[it.root.uri.toString()]
-                                if (items == null) {
-                                    val files = it.root.listFiles()
-                                    items = HashMap(files.size)
-                                    files.forEach { file -> file.name?.also { name -> items[name] = file } }
-                                    roots[it.root.uri.toString()] = items
-                                }
-                                items[it.name]?.delete()
+                    .setTitle(R.string.confirm)
+                    .setMessage(R.string.confirm_delete_download)
+                    .setPositiveButton(android.R.string.ok) { _, _ ->
+                        val roots = ArrayMap<String, HashMap<String, DocumentFile>>()
+                        val selectedItems = adapter.getSelectedItems()
+                        selectedItems.forEach {
+                            var items = roots[it.root.uri.toString()]
+                            if (items == null) {
+                                val files = it.root.listFiles()
+                                items = HashMap(files.size)
+                                files.forEach { file -> file.name?.also { name -> items[name] = file } }
+                                roots[it.root.uri.toString()] = items
                             }
-                            database.delete(selectedItems)
-                            adapter.reload()
+                            items[it.name]?.delete()
+                        }
+                        database.delete(selectedItems)
+                        adapter.reload()
 
-                            adapter.notifyDataSetChanged()
+                        adapter.notifyDataSetChanged()
 
-                            mode.finish()
-                        }
-                        .setNegativeButton(android.R.string.cancel, null)
-                        .show()
+                        mode.finish()
+                    }
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .show()
                 true
             }
             R.id.deleteFromList -> {
                 AlertDialog.Builder(activity)
-                        .setTitle(R.string.confirm)
-                        .setMessage(R.string.confirm_delete_bookmark)
-                        .setPositiveButton(android.R.string.ok) { _, _ ->
-                            database.delete(adapter.getSelectedItems())
-                            adapter.reload()
+                    .setTitle(R.string.confirm)
+                    .setMessage(R.string.confirm_delete_download_list)
+                    .setPositiveButton(android.R.string.ok) { _, _ ->
+                        database.delete(adapter.getSelectedItems())
+                        adapter.reload()
 
-                            mode.finish()
-                        }
-                        .setNegativeButton(android.R.string.cancel, null)
-                        .show()
+                        mode.finish()
+                    }
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .show()
 
                 true
             }