From cc16c8d5350957116ae8c35bb9786c8dd4e31440 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Sat, 4 May 2024 22:09:03 +0800
Subject: [PATCH] Clean code

---
 .../com/fongmi/android/tv/ui/activity/HomeActivity.java  | 3 ++-
 .../java/com/fongmi/android/tv/event/RefreshEvent.java   | 6 +++++-
 .../com/fongmi/android/tv/ui/activity/MainActivity.java  | 6 +++---
 .../com/fongmi/android/tv/ui/fragment/VodFragment.java   | 9 ++++++---
 4 files changed, 16 insertions(+), 8 deletions(-)

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 caf940b92..f5783b8fd 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
@@ -96,6 +96,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
     protected void initView() {
         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(this);
         mResult = Result.empty();
         Server.get().start();
@@ -160,7 +161,6 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
         WallConfig.get().init();
         LiveConfig.get().init().load();
         VodConfig.get().init().load(getCallback());
-        mBinding.progressLayout.showProgress();
         setLoading(true);
     }
 
@@ -348,6 +348,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
         PermissionX.init(this).permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE).request((allGranted, grantedList, deniedList) -> AppDatabase.restore(new Callback() {
             @Override
             public void success() {
+                if (allGranted) mBinding.progressLayout.showProgress();
                 if (allGranted) initConfig();
             }
         }));
diff --git a/app/src/main/java/com/fongmi/android/tv/event/RefreshEvent.java b/app/src/main/java/com/fongmi/android/tv/event/RefreshEvent.java
index c9b3201ad..382710cd1 100644
--- a/app/src/main/java/com/fongmi/android/tv/event/RefreshEvent.java
+++ b/app/src/main/java/com/fongmi/android/tv/event/RefreshEvent.java
@@ -11,6 +11,10 @@ public class RefreshEvent {
         EventBus.getDefault().post(new RefreshEvent(Type.EMPTY));
     }
 
+    public static void restore() {
+        EventBus.getDefault().post(new RefreshEvent(Type.RESTORE));
+    }
+
     public static void config() {
         EventBus.getDefault().post(new RefreshEvent(Type.CONFIG));
     }
@@ -69,6 +73,6 @@ public class RefreshEvent {
     }
 
     public enum Type {
-        EMPTY, CONFIG, IMAGE, VIDEO, HISTORY, KEEP, SIZE, WALL, DETAIL, PLAYER, SUBTITLE
+        EMPTY, RESTORE, CONFIG, IMAGE, VIDEO, HISTORY, KEEP, SIZE, WALL, DETAIL, PLAYER, SUBTITLE
     }
 }
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java
index 408fb0ac5..fd13dc58c 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java
@@ -118,23 +118,23 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
             @Override
             public void error(String msg) {
                 if (TextUtils.isEmpty(msg) && AppDatabase.getBackup().exists()) showDialog();
-                else RefreshEvent.empty();
                 RefreshEvent.config();
+                RefreshEvent.empty();
                 Notify.show(msg);
             }
         };
     }
 
     private void showDialog() {
-        new MaterialAlertDialogBuilder(this).setTitle(R.string.dialog_restore).setMessage(R.string.dialog_restore_msg).setNegativeButton(R.string.dialog_negative, (dialog, which) -> RefreshEvent.empty()).setPositiveButton(R.string.dialog_positive, (dialog, which) -> onRestore()).show();
+        new MaterialAlertDialogBuilder(this).setTitle(R.string.dialog_restore).setMessage(R.string.dialog_restore_msg).setNegativeButton(R.string.dialog_negative, null).setPositiveButton(R.string.dialog_positive, (dialog, which) -> onRestore()).show();
     }
 
     private void onRestore() {
         PermissionX.init(this).permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE).request((allGranted, grantedList, deniedList) -> AppDatabase.restore(new Callback() {
             @Override
             public void success() {
+                if (allGranted) RefreshEvent.restore();
                 if (allGranted) initConfig();
-                else RefreshEvent.empty();
             }
         }));
     }
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
index a2c0b17fc..d86fb6934 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
@@ -276,12 +276,15 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onRefreshEvent(RefreshEvent event) {
         switch (event.getType()) {
-            case CONFIG:
-                setLogo();
-                break;
             case EMPTY:
                 hideProgress();
                 break;
+            case RESTORE:
+                showProgress();
+                break;
+            case CONFIG:
+                setLogo();
+                break;
             case VIDEO:
             case SIZE:
                 homeContent();