From 860c24a01ebdd96e886d2581a1e15c7ebedbb8d2 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 22 Jul 2022 17:49:48 +0800 Subject: [PATCH] Clean code --- app/src/main/java/com/fongmi/bear/ApiConfig.java | 12 ++++-------- .../com/fongmi/bear/ui/activity/HomeActivity.java | 2 +- .../com/fongmi/bear/ui/activity/SettingActivity.java | 1 + 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/fongmi/bear/ApiConfig.java b/app/src/main/java/com/fongmi/bear/ApiConfig.java index b7c26208d..511be915e 100644 --- a/app/src/main/java/com/fongmi/bear/ApiConfig.java +++ b/app/src/main/java/com/fongmi/bear/ApiConfig.java @@ -72,15 +72,11 @@ public class ApiConfig { } public void loadConfig(Callback callback) { - String url = Prefers.getUrl(); new Thread(() -> { - if (url.startsWith("file://")) { - getFileConfig(url, callback); - } else if (Patterns.WEB_URL.matcher(url).matches()) { - getWebConfig(url, callback); - } else { - handler.post(() -> callback.error(0)); - } + String url = Prefers.getUrl(); + if (url.startsWith("file://")) getFileConfig(url, callback); + else if (Patterns.WEB_URL.matcher(url).matches()) getWebConfig(url, callback); + else handler.post(() -> callback.error(0)); }).start(); } diff --git a/app/src/main/java/com/fongmi/bear/ui/activity/HomeActivity.java b/app/src/main/java/com/fongmi/bear/ui/activity/HomeActivity.java index 82c6b7313..9e45c69ed 100644 --- a/app/src/main/java/com/fongmi/bear/ui/activity/HomeActivity.java +++ b/app/src/main/java/com/fongmi/bear/ui/activity/HomeActivity.java @@ -125,6 +125,6 @@ public class HomeActivity extends BaseActivity implements VodPresenter.OnClickLi @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); - getVideo(); + if (resultCode == RESULT_OK) getVideo(); } } \ No newline at end of file diff --git a/app/src/main/java/com/fongmi/bear/ui/activity/SettingActivity.java b/app/src/main/java/com/fongmi/bear/ui/activity/SettingActivity.java index eb4ca4ed6..84102621c 100644 --- a/app/src/main/java/com/fongmi/bear/ui/activity/SettingActivity.java +++ b/app/src/main/java/com/fongmi/bear/ui/activity/SettingActivity.java @@ -92,6 +92,7 @@ public class SettingActivity extends BaseActivity { @Override public void error(int resId) { mBinding.home.setText(ApiConfig.get().getHome().getName()); + setResult(RESULT_OK); Notify.dismiss(); Notify.show(resId); }