From 3414c6ca8a61a6b5d3fc262f34ade85b697b0b3b Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Sat, 4 Jan 2025 13:23:05 +0800
Subject: [PATCH] Fix bug

---
 .../com/fongmi/android/tv/ui/adapter/ConfigAdapter.java     | 6 ++++--
 .../com/fongmi/android/tv/ui/adapter/RestoreAdapter.java    | 5 +++--
 .../java/com/fongmi/android/tv/ui/dialog/HistoryDialog.java | 3 ++-
 .../java/com/fongmi/android/tv/ui/dialog/RestoreDialog.java | 4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/ConfigAdapter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/ConfigAdapter.java
index e4179b807..9370f7352 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/ConfigAdapter.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/ConfigAdapter.java
@@ -36,9 +36,11 @@ public class ConfigAdapter extends RecyclerView.Adapter<ConfigAdapter.ViewHolder
     }
 
     public int remove(Config item) {
+        int position = mItems.indexOf(item);
+        if (position == -1) return -1;
         item.delete();
-        mItems.remove(item);
-        notifyDataSetChanged();
+        mItems.remove(position);
+        notifyItemRemoved(position);
         return getItemCount();
     }
 
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/RestoreAdapter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/RestoreAdapter.java
index 2d4780776..0c3484fff 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/RestoreAdapter.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/RestoreAdapter.java
@@ -40,12 +40,13 @@ public class RestoreAdapter extends RecyclerView.Adapter<RestoreAdapter.ViewHold
         notifyDataSetChanged();
     }
 
-    public void remove(File item) {
+    public int remove(File item) {
         int position = mItems.indexOf(item);
-        if (position == -1) return;
+        if (position == -1) return -1;
         Path.clear(item);
         mItems.remove(position);
         notifyItemRemoved(position);
+        return getItemCount();
     }
 
     @Override
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/HistoryDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/HistoryDialog.java
index 8a661b9e9..6be3d5b53 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/HistoryDialog.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/HistoryDialog.java
@@ -44,7 +44,8 @@ public class HistoryDialog implements ConfigAdapter.OnClickListener {
     }
 
     private void setRecyclerView() {
-        binding.recycler.setHasFixedSize(true);
+        binding.recycler.setItemAnimator(null);
+        binding.recycler.setHasFixedSize(false);
         binding.recycler.setAdapter(adapter.addAll(type));
         binding.recycler.addItemDecoration(new SpaceItemDecoration(1, 16));
     }
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/RestoreDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/RestoreDialog.java
index 3253477b1..3f73775ae 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/RestoreDialog.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/RestoreDialog.java
@@ -41,6 +41,7 @@ public class RestoreDialog implements RestoreAdapter.OnClickListener {
 
     private void setRecyclerView() {
         binding.recycler.setAdapter(adapter);
+        binding.recycler.setItemAnimator(null);
         binding.recycler.setHasFixedSize(false);
         binding.recycler.addItemDecoration(new SpaceItemDecoration(1, 16));
     }
@@ -62,7 +63,6 @@ public class RestoreDialog implements RestoreAdapter.OnClickListener {
 
     @Override
     public void onDeleteClick(File item) {
-        if (adapter.getItemCount() == 1) dialog.dismiss();
-        adapter.remove(item);
+        if (adapter.remove(item) == 0) dialog.dismiss();
     }
 }
\ No newline at end of file