From 8f7aecd0d45e8e6d4ee52d9b43bd1eff94d27879 Mon Sep 17 00:00:00 2001
From: jhengazuki <jhengazuki3@gmail.com>
Date: Mon, 27 Oct 2025 12:56:52 +0800
Subject: [PATCH] Optimize live progress

---
 .../fongmi/android/tv/ui/activity/LiveActivity.java    | 10 ++++------
 .../fongmi/android/tv/ui/activity/LiveActivity.java    | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
index ad96f2a9f..733d313d6 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
@@ -225,7 +225,6 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
         mViewModel.epg.observeForever(mObserveEpg);
         mViewModel.live.observe(this, live -> {
             mViewModel.getXml(live);
-            hideProgress();
             setGroup(live);
             setWidth(live);
         });
@@ -689,25 +688,24 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
 
     @Override
     public void setConfig(Config config) {
-        Notify.progress(this);
         Config current = LiveConfig.get().getConfig();
         LiveConfig.load(config, getCallback(current));
+        showProgress();
     }
 
     private Callback getCallback(Config config) {
         return new Callback() {
             @Override
             public void success() {
-                Notify.dismiss();
-                setLive(getHome());
                 RefreshEvent.config();
+                setLive(getHome());
             }
 
             @Override
             public void error(String msg) {
-                Notify.dismiss();
-                Notify.show(msg);
                 LiveConfig.get().clear().config(config).load();
+                Notify.show(msg);
+                hideProgress();
             }
         };
     }
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
index de65a6e28..d3725f0d4 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
@@ -232,7 +232,6 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener
         mViewModel.epg.observeForever(mObserveEpg);
         mViewModel.live.observe(this, live -> {
             mViewModel.getXml(live);
-            hideProgress();
             setGroup(live);
             setWidth(live);
         });
@@ -711,25 +710,24 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener
 
     @Override
     public void setConfig(Config config) {
-        Notify.progress(this);
         Config current = LiveConfig.get().getConfig();
         LiveConfig.load(config, getCallback(current));
+        showProgress();
     }
 
     private Callback getCallback(Config config) {
         return new Callback() {
             @Override
             public void success() {
-                Notify.dismiss();
-                setLive(getHome());
                 RefreshEvent.config();
+                setLive(getHome());
             }
 
             @Override
             public void error(String msg) {
-                Notify.dismiss();
-                Notify.show(msg);
                 LiveConfig.get().clear().config(config).load();
+                Notify.show(msg);
+                hideProgress();
             }
         };
     }