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 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 getAll(int type) { - List 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 { @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); }