From b96ec0412f5a953cbcf32df877f70adc5c559899 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Tue, 12 Mar 2024 22:17:58 +0800
Subject: [PATCH] Remove back confirm

---
 .../fongmi/android/tv/ui/activity/HomeActivity.java    |  9 ---------
 .../fongmi/android/tv/ui/activity/LiveActivity.java    |  9 ---------
 app/src/main/res/values-zh-rCN/strings.xml             |  1 -
 app/src/main/res/values-zh-rTW/strings.xml             |  1 -
 app/src/main/res/values/strings.xml                    |  1 -
 .../fongmi/android/tv/ui/activity/MainActivity.java    | 10 +---------
 6 files changed, 1 insertion(+), 30 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 c2e0c0d57..1930041f5 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
@@ -72,7 +72,6 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
     private ArrayObjectAdapter mAdapter;
     private SiteViewModel mViewModel;
     private boolean loading;
-    private boolean confirm;
     private Result mResult;
     private Clock mClock;
 
@@ -278,12 +277,6 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
         return -1;
     }
 
-    private void setConfirm() {
-        confirm = true;
-        Notify.show(R.string.app_exit);
-        App.post(() -> confirm = false, 5000);
-    }
-
     public boolean isLoading() {
         return loading;
     }
@@ -457,8 +450,6 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
             setHistoryDelete(false);
         } else if (mBinding.recycler.getSelectedPosition() != 0) {
             mBinding.recycler.scrollToPosition(0);
-        } else if (!confirm) {
-            setConfirm();
         } else {
             finish();
         }
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 24ef0b0bb..56f8cdcf4 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
@@ -94,7 +94,6 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
     private Runnable mR3;
     private Runnable mR4;
     private Clock mClock;
-    private boolean confirm;
     private int toggleCount;
     private int count;
 
@@ -850,12 +849,6 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
         hideCenter();
     }
 
-    private void setConfirm() {
-        confirm = true;
-        Notify.show(R.string.app_exit);
-        App.post(() -> confirm = false, 5000);
-    }
-
     public int getToggleCount() {
         return toggleCount;
     }
@@ -1009,8 +1002,6 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
             hideEpg();
         } else if (isVisible(mBinding.recycler)) {
             hideUI();
-        } else if (!confirm) {
-            setConfirm();
         } else {
             super.onBackPressed();
         }
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 635f842fa..9c0276284 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2,7 +2,6 @@
 
     <!-- App -->
     <string name="app_name">影视</string>
-    <string name="app_exit">再按一次返回键退出</string>
 
     <!-- Vod -->
     <string name="vod_last">上次看到<xliff:g name="name">%s</xliff:g></string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index f8a1b14c6..5d04a4797 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -2,7 +2,6 @@
 
     <!-- App -->
     <string name="app_name">影視</string>
-    <string name="app_exit">再按一次返回鍵退出</string>
 
     <!-- Vod -->
     <string name="vod_last">上次看到<xliff:g name="name">%s</xliff:g></string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f18183174..80b76a45a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,7 +2,6 @@
 
     <!-- App -->
     <string name="app_name">TV</string>
-    <string name="app_exit">Press back again to exit</string>
 
     <!-- Vod -->
     <string name="vod_last">Last seen <xliff:g name="name">%s</xliff:g></string>
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 549a8922d..83b7ad5e8 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
@@ -49,7 +49,6 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
 
     private ActivityMainBinding mBinding;
     private FragmentStateManager mManager;
-    private boolean confirm;
 
     @Override
     protected ViewBinding getBinding() {
@@ -163,12 +162,6 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
         return true;
     }
 
-    private void setConfirm() {
-        confirm = true;
-        Notify.show(R.string.app_exit);
-        App.post(() -> confirm = false, 5000);
-    }
-
     public void change(int position) {
         mManager.change(position);
     }
@@ -213,8 +206,7 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
         } else if (mManager.isVisible(1)) {
             mBinding.navigation.setSelectedItemId(R.id.vod);
         } else if (mManager.canBack(0)) {
-            if (!confirm) setConfirm();
-            else finish();
+            finish();
         }
     }