fix: Some issues with intro skip length

Author: jmir1

app/src/main/java/eu/kanade/domain/entries/anime/interactor/SetAnimeViewerFlags.kt

@@ -18,7 +18,7 @@ class SetAnimeViewerFlags(
                 viewerFlags = anime.viewerFlags
                     .setFlag(flag, Anime.ANIME_INTRO_MASK)
                     // Disable skip intro button if length is set to 0
-                    .setFlag((flag == 0L).toLong(), Anime.ANIME_INTRO_DISABLE_MASK),
+                    .setFlag((flag == 0L).toLong().addHexZeros(14), Anime.ANIME_INTRO_DISABLE_MASK),
             ),
         )
     }

app/src/main/java/eu/kanade/tachiyomi/ui/entries/anime/AnimeScreen.kt

@@ -312,7 +312,13 @@ class AnimeScreen(
                     }
                 }
                 SkipIntroLengthDialog(
-                    initialSkipIntroLength = successState.anime.skipIntroLength,
+                    initialSkipIntroLength = if (!successState.anime.skipIntroDisable &&
+                        successState.anime.skipIntroLength == 0
+                    ) {
+                        screenModel.gesturePreferences.defaultIntroLength().get()
+                    } else {
+                        successState.anime.skipIntroLength
+                    },
                     onDismissRequest = onDismissRequest,
                     onValueChanged = {
                         updateSkipIntroLength(it.toLong())

app/src/main/java/eu/kanade/tachiyomi/ui/entries/anime/AnimeScreenModel.kt

@@ -98,7 +98,7 @@ class AnimeScreenModel(
     private val libraryPreferences: LibraryPreferences = Injekt.get(),
     private val trackPreferences: TrackPreferences = Injekt.get(),
     internal val playerPreferences: PlayerPreferences = Injekt.get(),
-    private val gesturePreferences: GesturePreferences = Injekt.get(),
+    internal val gesturePreferences: GesturePreferences = Injekt.get(),
     private val trackerManager: TrackerManager = Injekt.get(),
     private val trackEpisode: TrackEpisode = Injekt.get(),
     private val downloadManager: AnimeDownloadManager = Injekt.get(),

app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerViewModel.kt

@@ -99,6 +99,7 @@ import logcat.LogPriority
 import tachiyomi.core.common.i18n.stringResource
 import tachiyomi.core.common.util.lang.launchIO
 import tachiyomi.core.common.util.lang.launchNonCancellable
+import tachiyomi.core.common.util.lang.toLong
 import tachiyomi.core.common.util.lang.withIOContext
 import tachiyomi.core.common.util.lang.withUIContext
 import tachiyomi.core.common.util.system.logcat
@@ -1801,11 +1802,12 @@ class PlayerViewModel @JvmOverloads constructor(
      * Updates the skipIntroLength for the open anime.
      */
     fun setAnimeSkipIntroLength(skipIntroLength: Long) {
+        // Skip unnecessary database operation
+        if (skipIntroLength == getAnimeSkipIntroLength().toLong()) return
         val anime = currentAnime.value ?: return
         if (!anime.favorite) return
         viewModelScope.launchIO {
             setAnimeViewerFlags.awaitSetSkipIntroLength(anime.id, skipIntroLength)
-            logcat(LogPriority.INFO) { "New Skip Intro Length is ${anime.skipIntroLength}" }
             _currentAnime.update { _ -> getAnime.await(anime.id) }
         }
     }

domain/src/main/java/tachiyomi/domain/entries/anime/model/Anime.kt

@@ -121,9 +121,9 @@ data class Anime(
         const val EPISODE_DISPLAY_MASK = 0x00100000L
 
         const val ANIME_INTRO_MASK = 0x0000000000000FFL
-        const val ANIME_INTRO_DISABLE_MASK = 0x100000000000000L
         const val ANIME_AIRING_EPISODE_MASK = 0x000000000FFFF00L
         const val ANIME_AIRING_TIME_MASK = 0x0FFFFFFFF000000L
+        const val ANIME_INTRO_DISABLE_MASK = 0x100000000000000L
 
         fun create() = Anime(
             id = -1L,