diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java index 7c9fb80d0..9b4dc12b4 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java @@ -60,6 +60,10 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit return getString(value ? R.string.setting_on : R.string.setting_off); } + private String getProxy(String proxy) { + return proxy.isEmpty() ? getString(R.string.none) : UrlUtil.scheme(proxy); + } + private int getDohIndex() { return Math.max(0, VodConfig.get().getDoh().indexOf(Doh.objectFrom(Setting.getDoh()))); } @@ -84,7 +88,7 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit mBinding.backupText.setText(AppDatabase.getDate()); mBinding.dohText.setText(getDohList()[getDohIndex()]); mBinding.versionText.setText(BuildConfig.VERSION_NAME); - mBinding.proxyText.setText(UrlUtil.scheme(Setting.getProxy())); + mBinding.proxyText.setText(getProxy(Setting.getProxy())); mBinding.incognitoText.setText(getSwitch(Setting.isIncognito())); mBinding.sizeText.setText((size = ResUtil.getStringArray(R.array.select_size))[Setting.getSize()]); mBinding.qualityText.setText((quality = ResUtil.getStringArray(R.array.select_quality))[Setting.getQuality()]); @@ -325,7 +329,7 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit OkHttp.get().setProxy(proxy); Notify.progress(getActivity()); VodConfig.load(Config.vod(), getCallback()); - mBinding.proxyText.setText(UrlUtil.scheme(proxy)); + mBinding.proxyText.setText(getProxy(proxy)); } private void onCache(View view) { diff --git a/app/src/main/java/com/fongmi/android/tv/db/AppDatabase.java b/app/src/main/java/com/fongmi/android/tv/db/AppDatabase.java index 0aa0a2b54..3d8cb260b 100644 --- a/app/src/main/java/com/fongmi/android/tv/db/AppDatabase.java +++ b/app/src/main/java/com/fongmi/android/tv/db/AppDatabase.java @@ -54,7 +54,7 @@ public abstract class AppDatabase extends RoomDatabase { } public static String getDate() { - return Setting.isBackupAuto() ? ResUtil.getString(R.string.setting_backup_auto) : getBackup().exists() ? Util.format(new SimpleDateFormat("MMddHHmmss", Locale.getDefault()), getBackup().lastModified()) : ""; + return Setting.isBackupAuto() ? ResUtil.getString(R.string.setting_backup_auto) : getBackup().exists() ? Util.format(new SimpleDateFormat("MMdd", Locale.getDefault()), getBackup().lastModified()) : ""; } public static void backup() { diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 933ef5ac0..635f842fa 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -132,6 +132,7 @@ 全部 + diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 2f624fefa..f8a1b14c6 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -132,6 +132,7 @@ 全部 + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f01873fa9..f18183174 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -132,6 +132,7 @@ All + None times lines diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java index 2d24a1357..3656e9aaa 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java @@ -65,6 +65,10 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit return getString(value ? R.string.setting_on : R.string.setting_off); } + private String getProxy(String proxy) { + return proxy.isEmpty() ? getString(R.string.none) : UrlUtil.scheme(proxy); + } + private int getDohIndex() { return Math.max(0, VodConfig.get().getDoh().indexOf(Doh.objectFrom(Setting.getDoh()))); } @@ -92,7 +96,7 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit mBinding.backupText.setText(AppDatabase.getDate()); mBinding.dohText.setText(getDohList()[getDohIndex()]); mBinding.versionText.setText(BuildConfig.VERSION_NAME); - mBinding.proxyText.setText(UrlUtil.scheme(Setting.getProxy())); + mBinding.proxyText.setText(getProxy(Setting.getProxy())); mBinding.incognitoText.setText(getSwitch(Setting.isIncognito())); mBinding.sizeText.setText((size = ResUtil.getStringArray(R.array.select_size))[Setting.getSize()]); setCacheText(); @@ -329,7 +333,7 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit OkHttp.get().setProxy(proxy); Notify.progress(getActivity()); VodConfig.load(Config.vod(), getCallback()); - mBinding.proxyText.setText(UrlUtil.scheme(proxy)); + mBinding.proxyText.setText(getProxy(proxy)); } private void onCache(View view) {