From ee33c145a52890a15c12b102e54c33003efb6b35 Mon Sep 17 00:00:00 2001
From: Secozzi <49240133+Secozzi@users.noreply.github.com>
Date: Wed, 25 Oct 2023 08:55:58 +0000
Subject: [PATCH 1/2] fix(player): Don't open screenshot sheet when player is
 locked (#1172)

---
 .../java/eu/kanade/tachiyomi/ui/player/viewer/GestureHandler.kt  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/viewer/GestureHandler.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/viewer/GestureHandler.kt
index 08ec6a496..802c7052d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/player/viewer/GestureHandler.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/player/viewer/GestureHandler.kt
@@ -113,6 +113,7 @@ class GestureHandler(
     }
 
     override fun onLongPress(e: MotionEvent) {
+        if (SeekState.mode == SeekState.LOCKED) { playerControls.toggleControls(); return }
         activity.openScreenshotSheet()
     }
 }

From afb921a5a2a2bd1805c5719b988c87115b818efd Mon Sep 17 00:00:00 2001
From: Abdallah <54363735+abdallahmehiz@users.noreply.github.com>
Date: Wed, 25 Oct 2023 19:09:43 +0100
Subject: [PATCH 2/2] fix(tracking): Don't show unusable tracking services
 (#1174)

---
 .../tachiyomi/ui/entries/anime/track/AnimeTrackInfoDialog.kt | 5 ++++-
 .../tachiyomi/ui/entries/manga/track/MangaTrackInfoDialog.kt | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/entries/anime/track/AnimeTrackInfoDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/entries/anime/track/AnimeTrackInfoDialog.kt
index 57f982287..1e3daffb4 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/entries/anime/track/AnimeTrackInfoDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/entries/anime/track/AnimeTrackInfoDialog.kt
@@ -47,6 +47,7 @@ import eu.kanade.presentation.track.anime.AnimeTrackInfoDialogHome
 import eu.kanade.presentation.track.anime.AnimeTrackServiceSearch
 import eu.kanade.presentation.util.Screen
 import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.track.AnimeTrackService
 import eu.kanade.tachiyomi.data.track.EnhancedAnimeTrackService
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.data.track.TrackService
@@ -249,7 +250,9 @@ data class AnimeTrackInfoDialogHomeScreen(
 
         private fun List<AnimeTrack>.mapToTrackItem(): List<AnimeTrackItem> {
             val dbTracks = map { it.toDbTrack() }
-            val loggedServices = Injekt.get<TrackManager>().services.filter { it.isLogged }
+            val loggedServices = Injekt.get<TrackManager>().services.filter {
+                it.isLogged && it is AnimeTrackService
+            }
             val source = Injekt.get<AnimeSourceManager>().getOrStub(sourceId)
             return loggedServices
                 // Map to TrackItem
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/entries/manga/track/MangaTrackInfoDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/entries/manga/track/MangaTrackInfoDialog.kt
index a88a27467..a4e4ed4f2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/entries/manga/track/MangaTrackInfoDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/entries/manga/track/MangaTrackInfoDialog.kt
@@ -48,6 +48,7 @@ import eu.kanade.presentation.track.manga.MangaTrackServiceSearch
 import eu.kanade.presentation.util.Screen
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.track.EnhancedMangaTrackService
+import eu.kanade.tachiyomi.data.track.MangaTrackService
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.data.track.TrackService
 import eu.kanade.tachiyomi.data.track.model.MangaTrackSearch
@@ -248,7 +249,9 @@ data class MangaTrackInfoDialogHomeScreen(
         }
 
         private fun List<MangaTrack>.mapToTrackItem(): List<MangaTrackItem> {
-            val loggedServices = Injekt.get<TrackManager>().services.filter { it.isLogged }
+            val loggedServices = Injekt.get<TrackManager>().services.filter {
+                it.isLogged && it is MangaTrackService
+            }
             val source = Injekt.get<MangaSourceManager>().getOrStub(sourceId)
             return loggedServices
                 // Map to TrackItem