From 59e83f3e91603faed81a783b9058f34b5c523a7f Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Fri, 22 Apr 2022 12:25:06 -0400
Subject: [PATCH] Fixes to locked manga details page when it shouldnt be

---
 .../eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt | 7 +++++--
 .../eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt  | 2 +-
 .../ui/source/globalsearch/GlobalSearchController.kt       | 7 +++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt
index d6a89c01bc..fc0bf84d72 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt
@@ -130,7 +130,8 @@ class MangaDetailsController :
         manga: Manga?,
         fromCatalogue: Boolean = false,
         smartSearchConfig: BrowseController.SmartSearchConfig? = null,
-        update: Boolean = false
+        update: Boolean = false,
+        shouldLockIfNeeded: Boolean = false,
     ) : super(
         Bundle().apply {
             putLong(MANGA_EXTRA, manga?.id ?: 0)
@@ -143,6 +144,7 @@ class MangaDetailsController :
         if (manga != null) {
             source = Injekt.get<SourceManager>().getOrStub(manga.source)
         }
+        this.shouldLockIfNeeded = shouldLockIfNeeded
         presenter = MangaDetailsPresenter(manga!!, source!!)
     }
 
@@ -169,6 +171,7 @@ class MangaDetailsController :
     private var headerColor: Int? = null
     private var toolbarIsColored = false
     private var snack: Snackbar? = null
+    val shouldLockIfNeeded: Boolean
     val fromCatalogue = args.getBoolean(FROM_CATALOGUE_EXTRA, false)
     private var trackingBottomSheet: TrackingBottomSheet? = null
     private var startingRangeChapterPos: Int? = null
@@ -535,7 +538,7 @@ class MangaDetailsController :
     //region Lifecycle methods
     override fun onActivityResumed(activity: Activity) {
         super.onActivityResumed(activity)
-        presenter.isLockedFromSearch = SecureActivityDelegate.shouldBeLocked()
+        presenter.isLockedFromSearch = shouldLockIfNeeded && SecureActivityDelegate.shouldBeLocked()
         presenter.headerItem.isLocked = presenter.isLockedFromSearch
         manga!!.thumbnail_url = presenter.refreshMangaFromDb().thumbnail_url
         presenter.fetchChapters(refreshTracker == null)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt
index 385e837b06..ae72095491 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt
@@ -115,7 +115,7 @@ class MangaDetailsPresenter(
             tabletChapterHeaderItem = MangaHeaderItem(manga, false)
             tabletChapterHeaderItem?.isChapterHeader = true
         }
-        isLockedFromSearch = SecureActivityDelegate.shouldBeLocked()
+        isLockedFromSearch = controller.shouldLockIfNeeded && SecureActivityDelegate.shouldBeLocked()
         headerItem.isLocked = isLockedFromSearch
         downloadManager.addListener(this)
         LibraryUpdateService.setListener(this)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/globalsearch/GlobalSearchController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/globalsearch/GlobalSearchController.kt
index 0b0b1d2720..3a6790a312 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/globalsearch/GlobalSearchController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/globalsearch/GlobalSearchController.kt
@@ -104,7 +104,10 @@ open class GlobalSearchController(
      */
     override fun onMangaClick(manga: Manga) {
         // Open MangaController.
-        router.pushController(MangaDetailsController(manga, true).withFadeTransaction())
+        router.pushController(
+            MangaDetailsController(manga, true, shouldLockIfNeeded = activity is SearchActivity)
+                .withFadeTransaction()
+        )
     }
 
     /**
@@ -269,7 +272,7 @@ open class GlobalSearchController(
             if (results != null && searchResult.size == 1 && results.size == 1) {
                 val manga = results.first().manga
                 router.replaceTopController(
-                    MangaDetailsController(manga, true)
+                    MangaDetailsController(manga, true, shouldLockIfNeeded = true)
                         .withFadeTransaction()
                 )
                 return