From 6ec0e4df14869a6118537a97ea40b4d9897a930b Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Thu, 6 Nov 2025 23:44:55 +0800
Subject: [PATCH] Optimize home content load

---
 .../com/fongmi/android/tv/ui/activity/HomeActivity.java    | 7 ++++---
 app/src/leanback/res/layout/adapter_progress.xml           | 2 +-
 .../java/com/fongmi/android/tv/model/LiveViewModel.java    | 6 ++----
 .../java/com/fongmi/android/tv/model/SiteViewModel.java    | 6 ++----
 4 files changed, 9 insertions(+), 12 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 10fc5da61..ce85af455 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
@@ -243,10 +243,11 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
         setTitle();
         mResult = Result.empty();
         int index = getRecommendIndex();
-        if (mAdapter.size() > index) mAdapter.removeItems(index, mAdapter.size() - index);
-        if (getSite().getKey().isEmpty()) return;
+        boolean gone = mAdapter.indexOf("progress") == -1;
+        boolean hasItem = gone && mAdapter.size() > index;
+        if (hasItem) mAdapter.removeItems(index, mAdapter.size() - index);
+        if (gone) mAdapter.add("progress");
         mViewModel.homeContent();
-        mAdapter.add("progress");
     }
 
     private void addVideo(Result result) {
diff --git a/app/src/leanback/res/layout/adapter_progress.xml b/app/src/leanback/res/layout/adapter_progress.xml
index a58dd3545..9bab8ae8c 100644
--- a/app/src/leanback/res/layout/adapter_progress.xml
+++ b/app/src/leanback/res/layout/adapter_progress.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="64dp">
 
     <include
         layout="@layout/view_progress"
diff --git a/app/src/main/java/com/fongmi/android/tv/model/LiveViewModel.java b/app/src/main/java/com/fongmi/android/tv/model/LiveViewModel.java
index 9eb45cf0c..537e40ab7 100644
--- a/app/src/main/java/com/fongmi/android/tv/model/LiveViewModel.java
+++ b/app/src/main/java/com/fongmi/android/tv/model/LiveViewModel.java
@@ -27,6 +27,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
 import java.util.concurrent.Callable;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -144,15 +145,12 @@ public class LiveViewModel extends ViewModel {
         executor.execute(() -> {
             try {
                 T result = newFuture.get(type.timeout, TimeUnit.MILLISECONDS);
-                if (newFuture.isCancelled()) return;
                 if (type == TaskType.EPG) epg.postValue((Epg) result);
                 else if (type == TaskType.LIVE) live.postValue((Live) result);
                 else if (type == TaskType.XML) xml.postValue((Boolean) result);
                 else if (type == TaskType.URL) url.postValue((Channel) result);
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
             } catch (Throwable e) {
-                if (newFuture.isCancelled()) return;
+                if (e instanceof CancellationException) return;
                 if (e.getCause() instanceof ExtractException) url.postValue(Channel.error(e.getCause().getMessage()));
                 else if (type == TaskType.URL) url.postValue(new Channel());
                 else if (type == TaskType.LIVE) live.postValue(new Live());
diff --git a/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java b/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java
index cc21262d0..fbc34a2f2 100644
--- a/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java
+++ b/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java
@@ -32,6 +32,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.Callable;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -261,12 +262,9 @@ public class SiteViewModel extends ViewModel {
         executor.execute(() -> {
             try {
                 Result taskResult = future.get(Constant.TIMEOUT_VOD, TimeUnit.MILLISECONDS);
-                if (future.isCancelled()) return;
                 result.postValue(taskResult);
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
             } catch (Throwable e) {
-                if (future.isCancelled()) return;
+                if (e instanceof CancellationException) return;
                 if (e.getCause() instanceof ExtractException) result.postValue(Result.error(e.getCause().getMessage()));
                 else result.postValue(Result.empty());
                 e.printStackTrace();