Merge pull request #537 from okcaptain/dev

Dev

app/build.gradle

@@ -13,8 +13,8 @@ android {
         minSdk 21
         //noinspection ExpiredTargetSdkVersion
         targetSdk 28
-        versionCode 242
-        versionName "2.4.2"
+        versionCode 243
+        versionName "2.4.3"
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]

app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java

@@ -659,6 +659,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
 
     private void setFlagActivated(Flag item) {
         if (mFlagAdapter.size() == 0 || item.isActivated()) return;
+        if (mFlagAdapter.indexOf(item) == -1) item.setFlag(((Flag) mFlagAdapter.get(0)).getFlag());
         for (int i = 0; i < mFlagAdapter.size(); i++) ((Flag) mFlagAdapter.get(i)).setActivated(item);
         mBinding.flag.setSelectedPosition(mFlagAdapter.indexOf(item));
         notifyItemChanged(mBinding.flag, mFlagAdapter);

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

@@ -59,6 +59,10 @@ public class Flag implements Parcelable {
         return TextUtils.isEmpty(flag) ? "" : flag;
     }
 
+    public void setFlag(String flag) {
+        this.flag = flag;
+    }
+
     public String getUrls() {
         return urls;
     }

app/src/mobile/java/com/fongmi/android/tv/ui/adapter/FlagAdapter.java

@@ -49,6 +49,7 @@ public class FlagAdapter extends RecyclerView.Adapter<FlagAdapter.ViewHolder> {
     }
 
     public void setActivated(Flag flag) {
+        if (!mItems.contains(flag)) flag.setFlag(mItems.get(0).getFlag());
         for (Flag item : mItems) item.setActivated(flag);
         notifyItemRangeChanged(0, getItemCount());
     }