Merge branch 'dev' into release

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.fongmi.android.tv"
         minSdk 21
         targetSdk 28
-        versionCode 213
-        versionName "20231226#3"
+        versionCode 214
+        versionName "2.1.4"
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]

app/src/leanback/java/com/fongmi/android/tv/ui/adapter/SiteAdapter.java

@@ -62,7 +62,6 @@ public class SiteAdapter extends RecyclerView.Adapter<SiteAdapter.ViewHolder> {
         holder.binding.check.setChecked(getChecked(item));
         holder.binding.text.setSelected(item.isActivated());
         holder.binding.text.setActivated(item.isActivated());
-        holder.binding.check.setEnabled(type != 1 || item.getSearchable() != 0);
         holder.binding.check.setVisibility(type == 0 ? View.GONE : View.VISIBLE);
         holder.binding.getRoot().setOnLongClickListener(v -> setLongListener(item));
         holder.binding.getRoot().setOnClickListener(v -> setListener(item, position));

app/src/main/java/com/fongmi/android/tv/bean/Site.java

@@ -213,7 +213,7 @@ public class Site implements Parcelable {
     }
 
     public Site setChangeable(boolean changeable) {
-        setChangeable(changeable ? 1 : 0);
+        if (getChangeable() != 0) setChangeable(changeable ? 1 : 2);
         return this;
     }
 
@@ -222,7 +222,7 @@ public class Site implements Parcelable {
     }
 
     public Site setRecordable(boolean recordable) {
-        setRecordable(recordable ? 1 : 0);
+        if (getRecordable() != 0) setRecordable(recordable ? 1 : 2);
         return this;
     }
 
@@ -237,8 +237,8 @@ public class Site implements Parcelable {
     public Site sync() {
         Site item = find(getKey());
         if (item == null) return this;
-        setChangeable(item.getChangeable());
-        setRecordable(item.getRecordable());
+        if (getChangeable() != 0) setChangeable(Math.max(1, item.getChangeable()));
+        if (getRecordable() != 0) setRecordable(Math.max(1, item.getRecordable()));
         if (getSearchable() != 0) setSearchable(Math.max(1, item.getSearchable()));
         return this;
     }