From d2a1e5bd6b14b5b49a9b1eb0e29a05d289b44832 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Thu, 27 Oct 2022 23:02:25 +0800
Subject: [PATCH] Fix config delete

---
 .../android/tv/ui/adapter/ConfigAdapter.java     |  5 ++++-
 .../tv/ui/custom/dialog/ConfigDialog.java        |  9 +++++----
 app/src/leanback/res/layout/activity_live.xml    |  2 +-
 .../java/com/fongmi/android/tv/bean/Config.java  | 16 +++++++++++-----
 .../com/fongmi/android/tv/db/dao/ConfigDao.java  |  3 ---
 5 files changed, 21 insertions(+), 14 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 6956c7dab..83f4bbcac 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
@@ -6,6 +6,8 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.fongmi.android.tv.api.ApiConfig;
+import com.fongmi.android.tv.api.LiveConfig;
 import com.fongmi.android.tv.bean.Config;
 import com.fongmi.android.tv.databinding.AdapterConfigBinding;
 
@@ -28,7 +30,8 @@ public class ConfigAdapter extends RecyclerView.Adapter<ConfigAdapter.ViewHolder
     }
 
     public ConfigAdapter addAll(int type) {
-        this.mItems = Config.getAll(type);
+        mItems = Config.getAll(type);
+        mItems.remove(type == 0 ? ApiConfig.get().getConfig() : LiveConfig.get().getConfig());
         return this;
     }
 
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/ConfigDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/ConfigDialog.java
index a4eb40f29..0f00286a6 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/ConfigDialog.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/ConfigDialog.java
@@ -31,6 +31,7 @@ public class ConfigDialog implements DialogInterface.OnDismissListener {
     private final DialogConfigBinding binding;
     private final ConfigCallback callback;
     private final AlertDialog dialog;
+    private String url;
     private int type;
 
     public static ConfigDialog create(Activity activity) {
@@ -65,7 +66,7 @@ public class ConfigDialog implements DialogInterface.OnDismissListener {
 
     private void initView() {
         String address = Server.get().getAddress(false);
-        String url = type == 0 ? ApiConfig.getUrl() : LiveConfig.getUrl();
+        url = type == 0 ? ApiConfig.getUrl() : LiveConfig.getUrl();
         binding.text.setText(url);
         binding.text.setSelection(url.length());
         binding.code.setImageBitmap(QRCode.getBitmap(address, 200, 0));
@@ -83,9 +84,9 @@ public class ConfigDialog implements DialogInterface.OnDismissListener {
     }
 
     private void onPositive(View view) {
-        String url = binding.text.getText().toString().trim();
-        Config item = Config.find(Utils.checkClan(url), type);
-        if (url.isEmpty()) Config.delete(type);
+        String text = binding.text.getText().toString().trim();
+        Config item = Config.find(Utils.checkClan(text), type);
+        if (text.isEmpty()) Config.delete(url);
         callback.setConfig(item);
         dialog.dismiss();
     }
diff --git a/app/src/leanback/res/layout/activity_live.xml b/app/src/leanback/res/layout/activity_live.xml
index 446949675..c79dd4bf1 100644
--- a/app/src/leanback/res/layout/activity_live.xml
+++ b/app/src/leanback/res/layout/activity_live.xml
@@ -73,7 +73,7 @@
 
         <androidx.leanback.widget.VerticalGridView
             android:id="@+id/channel"
-            android:layout_width="240dp"
+            android:layout_width="260dp"
             android:layout_height="match_parent"
             tools:itemCount="5"
             tools:listitem="@layout/adapter_channel" />
diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Config.java b/app/src/main/java/com/fongmi/android/tv/bean/Config.java
index fcdc39990..cc660ff90 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Config.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Config.java
@@ -102,13 +102,11 @@ public class Config {
     }
 
     public static List<Config> getAll(int type) {
-        List<Config> items = AppDatabase.get().getConfigDao().findByType(type);
-        if (items.size() > 0) items.remove(0);
-        return items;
+        return AppDatabase.get().getConfigDao().findByType(type);
     }
 
-    public static void delete(int type) {
-        if (getAll(type).size() == 0) AppDatabase.get().getConfigDao().delete(type);
+    public static void delete(String url) {
+        AppDatabase.get().getConfigDao().delete(url);
     }
 
     public static Config vod() {
@@ -145,4 +143,12 @@ public class Config {
         History.delete(getId());
         Keep.delete(getId());
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (!(obj instanceof Config)) return false;
+        Config it = (Config) obj;
+        return getId() == it.getId();
+    }
 }
diff --git a/app/src/main/java/com/fongmi/android/tv/db/dao/ConfigDao.java b/app/src/main/java/com/fongmi/android/tv/db/dao/ConfigDao.java
index 3a2708ad6..53b12ea98 100644
--- a/app/src/main/java/com/fongmi/android/tv/db/dao/ConfigDao.java
+++ b/app/src/main/java/com/fongmi/android/tv/db/dao/ConfigDao.java
@@ -24,7 +24,4 @@ public abstract class ConfigDao extends BaseDao<Config> {
 
     @Query("DELETE FROM Config WHERE url = :url")
     public abstract void delete(String url);
-
-    @Query("DELETE FROM Config WHERE type = :type")
-    public abstract void delete(int type);
 }