From 8c9cdf46db2f37d565bdbc278e365467ff25d241 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Thu, 10 Aug 2023 16:27:06 +0800
Subject: [PATCH] Remove predictive back support

Reland after #1322 resolved
---
 app/src/main/AndroidManifest.xml                     |  1 -
 .../main/java/com/hippo/ehviewer/ui/MainActivity.kt  | 12 +++---------
 .../com/hippo/ehviewer/ui/scene/SearchBarScene.kt    |  9 +++------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7e0631a2b..6384283eb 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,7 +23,6 @@
         android:allowBackup="true"
         android:appCategory="image"
         android:dataExtractionRules="@xml/data_extraction_rules"
-        android:enableOnBackInvokedCallback="true"
         android:fullBackupContent="@xml/backup_scheme"
         android:hasFragileUserData="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt
index def405143..88c4ae759 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt
@@ -191,11 +191,7 @@ class MainActivity : EhActivity() {
             supportFragmentManager.findFragmentById(R.id.fragment_container) as NavHostFragment
         navController = navHostFragment.navController
         if (!EhUtils.needSignedIn()) setNavGraph()
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-            binding.drawView.addDrawerListener(
-                mDrawerOnBackPressedCallback,
-            )
-        }
+        binding.drawView.addDrawerListener(mDrawerOnBackPressedCallback)
         binding.navView.setupWithNavController(navController)
 
         // Trick: Tweak NavigationUI to disable multiple backstack
@@ -323,10 +319,8 @@ class MainActivity : EhActivity() {
         super.onResume()
         lifecycleScope.launch {
             delay(300)
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-                mDrawerOnBackPressedCallback.remove()
-                onBackPressedDispatcher.addCallback(mDrawerOnBackPressedCallback)
-            }
+            mDrawerOnBackPressedCallback.remove()
+            onBackPressedDispatcher.addCallback(mDrawerOnBackPressedCallback)
             checkClipboardUrl()
         }
     }
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt
index a6596f367..d9bc1ff09 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt
@@ -1,6 +1,5 @@
 package com.hippo.ehviewer.ui.scene
 
-import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.MenuItem
@@ -103,10 +102,8 @@ abstract class SearchBarScene : BaseScene(), ToolBarScene {
         onCreateViewWithToolbar(inflater, binding.root, savedInstanceState)
         // This has to be placed after onCreateViewWithToolbar() since
         // callbacks are invoked in the reverse order in which they are added
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-            binding.searchview.addTransitionListener(mSearchViewOnBackPressedCallback)
-            requireActivity().onBackPressedDispatcher.addCallback(mSearchViewOnBackPressedCallback)
-        }
+        binding.searchview.addTransitionListener(mSearchViewOnBackPressedCallback)
+        requireActivity().onBackPressedDispatcher.addCallback(mSearchViewOnBackPressedCallback)
         binding.appbar.bringToFront()
         return binding.root
     }
@@ -125,7 +122,7 @@ abstract class SearchBarScene : BaseScene(), ToolBarScene {
 
     override fun onDestroyView() {
         super.onDestroyView()
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) mSearchViewOnBackPressedCallback.remove()
+        mSearchViewOnBackPressedCallback.remove()
         _binding = null
     }