From a04597cee2b0d57540ba7f566df4cd93ebb1a32d Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 17 Nov 2023 15:40:48 +0800 Subject: [PATCH] Fix crash --- app/src/leanback/java/com/fongmi/android/tv/Updater.java | 8 ++++---- .../com/fongmi/android/tv/ui/activity/HomeActivity.java | 2 +- .../fongmi/android/tv/ui/activity/SettingActivity.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/Updater.java b/app/src/leanback/java/com/fongmi/android/tv/Updater.java index 38ed360a9..499ce8fc7 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/Updater.java +++ b/app/src/leanback/java/com/fongmi/android/tv/Updater.java @@ -68,21 +68,21 @@ public class Updater implements Download.Callback { return this; } - public void start() { - App.execute(this::doInBackground); + public void start(Activity activity) { + App.execute(() -> doInBackground(activity)); } private boolean need(int code, String name) { return Setting.getUpdate() && (dev ? !name.equals(BuildConfig.VERSION_NAME) && code >= BuildConfig.VERSION_CODE : code > BuildConfig.VERSION_CODE); } - private void doInBackground() { + private void doInBackground(Activity activity) { try { JSONObject object = new JSONObject(OkHttp.string(getJson())); String name = object.optString("name"); String desc = object.optString("desc"); int code = object.optInt("code"); - if (need(code, name)) App.post(() -> show(App.activity(), name, desc)); + if (need(code, name)) App.post(() -> show(activity, name, desc)); } catch (Exception e) { e.printStackTrace(); } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java index c99ea50f2..14deada3f 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java @@ -97,7 +97,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen DLNARendererService.Companion.start(this, R.drawable.ic_logo); mClock = Clock.create(mBinding.time).format("MM/dd HH:mm:ss"); mBinding.progressLayout.showProgress(); - Updater.get().release().start(); + Updater.get().release().start(this); Server.get().start(); setRecyclerView(); setViewModel(); 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 c53262585..de8183c98 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 @@ -258,11 +258,11 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit } private void onVersion(View view) { - Updater.get().force().release().start(); + Updater.get().force().release().start(this); } private boolean onVersionDev(View view) { - Updater.get().force().dev().start(); + Updater.get().force().dev().start(this); return true; }