only show dialog when there is something to delete

truefedex · Nov 20, 2022 · bd0a9ec · bd0a9ec
1 parent 8227b3c
commit bd0a9ec
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/app/src/main/java/com/phlox/tvwebbrowser/activity/history/HistoryActivity.kt b/app/src/main/java/com/phlox/tvwebbrowser/activity/history/HistoryActivity.kt
@@ -75,19 +75,19 @@ class HistoryActivity : AppCompatActivity(), AdapterView.OnItemClickListener, Ad
     }
 
     private fun showDeleteDialog(deleteAll: Boolean) {
-        val items = if (deleteAll) adapter!!.items else adapter!!.selectedItems
-        if (items.isEmpty()) return
+        if (adapter!!.items.isEmpty() || (adapter!!.selectedItems.isEmpty() && !deleteAll)) return
         AlertDialog.Builder(this)
                 .setTitle(R.string.delete)
                 .setMessage(if (deleteAll) R.string.msg_delete_history_all else R.string.msg_delete_history)
                 .setPositiveButton(android.R.string.ok) { _, _ ->
                     lifecycleScope.launch(Dispatchers.Main) {
                         if (deleteAll) {
                             AppDatabase.db.historyDao().deleteWhereTimeLessThan(Long.MAX_VALUE)
-                            return@launch
+                            adapter!!.erase()
+                        } else {
+                            AppDatabase.db.historyDao().delete(*(adapter!!.selectedItems).toTypedArray())
+                            adapter!!.remove(adapter!!.selectedItems)
                         }
-                        AppDatabase.db.historyDao().delete(*items.toTypedArray())
-                        adapter!!.remove(items)
                     }
                 }
                 .setNeutralButton(android.R.string.cancel) { dialogInterface, i -> }