Merge branch 'dev' into release

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.fongmi.android.tv"
         minSdk 21
         targetSdk 28
-        versionCode 229
-        versionName "0308"
+        versionCode 230
+        versionName "2.3.0"
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]

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

@@ -120,4 +120,10 @@ public class HistoryActivity extends BaseActivity implements HistoryAdapter.OnCl
         else super.onBackPressed();
     }
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        RefreshEvent.history();
+    }
+
 }

app/src/leanback/java/com/fongmi/android/tv/ui/dialog/ConfigDialog.java

@@ -23,6 +23,7 @@ import com.fongmi.android.tv.server.Server;
 import com.fongmi.android.tv.ui.custom.CustomTextListener;
 import com.fongmi.android.tv.utils.QRCode;
 import com.fongmi.android.tv.utils.ResUtil;
+import com.fongmi.android.tv.utils.UrlUtil;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.permissionx.guolindev.PermissionX;
 
@@ -140,7 +141,7 @@ public class ConfigDialog implements DialogInterface.OnDismissListener {
 
     private void onPositive(View view) {
         String name = binding.name.getText().toString().trim();
-        String text = binding.text.getText().toString().trim();
+        String text = UrlUtil.fixUrl(binding.text.getText().toString().trim());
         if (edit) Config.find(url, type).url(text).update();
         if (text.isEmpty()) Config.delete(url, type);
         if (name.isEmpty()) callback.setConfig(Config.find(text, type));

app/src/leanback/java/com/fongmi/android/tv/ui/fragment/HomeFragment.java

@@ -85,7 +85,7 @@ public class HomeFragment extends BaseFragment implements VodPresenter.OnClickLi
         mBinding.recycler.addOnChildViewHolderSelectedListener(new OnChildViewHolderSelectedListener() {
             @Override
             public void onChildViewHolderSelected(@NonNull RecyclerView parent, @Nullable RecyclerView.ViewHolder child, int position, int subposition) {
-                if (position < 2) getHomeActicity().showToolBar();
+                if (position < 4) getHomeActicity().showToolBar();
                 else getHomeActicity().hideToolBar();
                 if (mPresenter != null && mPresenter.isDelete()) setHistoryDelete(false);
             }

app/src/main/java/com/fongmi/android/tv/api/Decoder.java

@@ -33,7 +33,7 @@ public class Decoder {
     }
 
     private static String fix(String url, String data) {
-        if (url.startsWith("file") || url.startsWith("assets")) url = UrlUtil.convert(url);
+        if (url.startsWith("file") || url.startsWith("clan") || url.startsWith("assets")) url = UrlUtil.convert(url);
         data = data.replace("./", url.substring(0, url.split("\\?")[0].lastIndexOf("/") + 1));
         return data;
     }

app/src/main/java/com/fongmi/android/tv/api/LiveParser.java

@@ -113,7 +113,7 @@ public class LiveParser {
     private static String getText(String url) {
         if (url.startsWith("file")) return Path.read(url);
         if (url.startsWith("http")) return OkHttp.string(url);
-        if (url.startsWith("assets") || url.startsWith("proxy")) return getText(UrlUtil.convert(url));
+        if (url.startsWith("assets") || url.startsWith("clan") ||  url.startsWith("proxy")) return getText(UrlUtil.convert(url));
         if (url.length() > 0 && url.length() % 4 == 0) return getText(new String(Base64.decode(url, Base64.DEFAULT)));
         return "";
     }

app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ConfigDialog.java

@@ -18,6 +18,7 @@ import com.fongmi.android.tv.databinding.DialogConfigBinding;
 import com.fongmi.android.tv.impl.ConfigCallback;
 import com.fongmi.android.tv.ui.custom.CustomTextListener;
 import com.fongmi.android.tv.utils.FileChooser;
+import com.fongmi.android.tv.utils.UrlUtil;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 public class ConfigDialog {
@@ -121,7 +122,7 @@ public class ConfigDialog {
     }
 
     private void onPositive(DialogInterface dialog, int which) {
-        String url = binding.url.getText().toString().trim();
+        String url = UrlUtil.fixUrl(binding.url.getText().toString().trim());
         String name = binding.name.getText().toString().trim();
         if (edit) Config.find(ori, type).url(url).name(name).update();
         if (url.isEmpty()) Config.delete(ori, type);