From 914542e6489164983d9208e2f8216d48413018c3 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Wed, 7 Dec 2022 16:47:23 +0800
Subject: [PATCH] Fix bug

---
 .../com/fongmi/android/tv/ui/activity/DetailActivity.java     | 1 +
 .../java/com/fongmi/android/tv/ui/activity/LiveActivity.java  | 1 +
 app/src/main/java/com/fongmi/android/tv/App.java              | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
index c1f512631..630407d76 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
@@ -871,5 +871,6 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
     protected void onDestroy() {
         super.onDestroy();
         mPlayers.release();
+        App.removeCallbacks(mR1, mR2, mR3);
     }
 }
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 691fa4450..8f3c290eb 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
@@ -690,5 +690,6 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
         super.onDestroy();
         mPlayers.release();
         Force.get().stop();
+        App.removeCallbacks(mR1, mR2, mR3, mR4, mR5, mR6);
     }
 }
diff --git a/app/src/main/java/com/fongmi/android/tv/App.java b/app/src/main/java/com/fongmi/android/tv/App.java
index a1aeca467..1cb129207 100644
--- a/app/src/main/java/com/fongmi/android/tv/App.java
+++ b/app/src/main/java/com/fongmi/android/tv/App.java
@@ -46,6 +46,10 @@ public class App extends Application {
         get().handler.removeCallbacks(runnable);
     }
 
+    public static void removeCallbacks(Runnable... runnable) {
+        for (Runnable r : runnable) get().handler.removeCallbacks(r);
+    }
+
     @Override
     public void onCreate() {
         super.onCreate();