Release v0.14.6

(cherry picked from commit 26d422b0ae)

.github/ISSUE_TEMPLATE.md

@@ -3,7 +3,7 @@
 I acknowledge that:
 
 - I have updated:
-  - To the latest version of the app (stable is v0.14.5)
+  - To the latest version of the app (stable is v0.14.6)
   - All extensions
 - I have tried the troubleshooting guide: https://tachiyomi.org/help/guides/troubleshooting-problems/
 - If this is an issue with an extension, that I should be opening an issue in https://github.com/tachiyomiorg/tachiyomi-extensions

.github/ISSUE_TEMPLATE/report_issue.yml

@@ -53,7 +53,7 @@ body:
       label: Tachiyomi version
       description: You can find your Tachiyomi version in **More → About**.
       placeholder: |
-        Example: "0.14.5"
+        Example: "0.14.6"
     validations:
       required: true
 
@@ -98,7 +98,7 @@ body:
           required: true
         - label: I have tried the [troubleshooting guide](https://tachiyomi.org/help/guides/troubleshooting/).
           required: true
-        - label: I have updated the app to version **[0.14.5](https://github.com/tachiyomiorg/tachiyomi/releases/latest)**.
+        - label: I have updated the app to version **[0.14.6](https://github.com/tachiyomiorg/tachiyomi/releases/latest)**.
           required: true
         - label: I have updated all installed extensions.
           required: true

.github/ISSUE_TEMPLATE/request_feature.yml

@@ -33,7 +33,7 @@ body:
           required: true
         - label: If this is an issue with an extension, I should be opening an issue in the [extensions repository](https://github.com/tachiyomiorg/tachiyomi-extensions/issues/new/choose).
           required: true
-        - label: I have updated the app to version **[0.14.5](https://github.com/tachiyomiorg/tachiyomi/releases/latest)**.
+        - label: I have updated the app to version **[0.14.6](https://github.com/tachiyomiorg/tachiyomi/releases/latest)**.
           required: true
         - label: I will fill out all of the requested information in this form.
           required: true

app/build.gradle.kts

@@ -22,8 +22,8 @@ android {
 
     defaultConfig {
         applicationId = "eu.kanade.tachiyomi"
-        versionCode = 98
+        versionCode = 101
-        versionName = "0.14.5"
+        versionName = "0.14.6"
 
         buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
         buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"")

app/src/main/java/eu/kanade/domain/library/service/LibraryPreferences.kt

@@ -22,7 +22,7 @@ class LibraryPreferences(
 
     fun landscapeColumns() = preferenceStore.getInt("pref_library_columns_landscape_key", 0)
 
-    fun libraryUpdateInterval() = preferenceStore.getInt("pref_library_update_interval_key", 24)
+    fun libraryUpdateInterval() = preferenceStore.getInt("pref_library_update_interval_key", 0)
     fun libraryUpdateLastTimestamp() = preferenceStore.getLong("library_update_last_timestamp", 0L)
 
     fun libraryUpdateDeviceRestriction() = preferenceStore.getStringSet("library_update_restriction", setOf(DEVICE_ONLY_ON_WIFI))

app/src/main/java/eu/kanade/domain/track/service/DelayedTrackingUpdateJob.kt

@@ -31,30 +31,33 @@ class DelayedTrackingUpdateJob(context: Context, workerParams: WorkerParameters)
         val trackManager = Injekt.get<TrackManager>()
         val delayedTrackingStore = Injekt.get<DelayedTrackingStore>()
 
-        withIOContext {
+        val results = withIOContext {
-            val tracks = delayedTrackingStore.getItems().mapNotNull {
+            delayedTrackingStore.getItems()
-                val track = getTracks.awaitOne(it.trackId)
+                .mapNotNull {
-                if (track == null) {
+                    val track = getTracks.awaitOne(it.trackId)
-                    delayedTrackingStore.remove(it.trackId)
+                    if (track == null) {
-                }
+                        delayedTrackingStore.remove(it.trackId)
-                track
+                    }
-            }
+                    track?.copy(lastChapterRead = it.lastChapterRead.toDouble())
-
+                }
-            tracks.forEach { track ->
+                .mapNotNull { track ->
-                try {
+                    try {
-                    val service = trackManager.getService(track.syncId)
+                        val service = trackManager.getService(track.syncId)
-                    if (service != null && service.isLogged) {
+                        if (service != null && service.isLogged) {
-                        service.update(track.toDbTrack(), true)
+                            logcat(LogPriority.DEBUG) { "Updating delayed track item: ${track.id}, last chapter read: ${track.lastChapterRead}" }
-                        insertTrack.await(track)
+                            service.update(track.toDbTrack(), true)
+                            insertTrack.await(track)
+                        }
+                        delayedTrackingStore.remove(track.id)
+                        null
+                    } catch (e: Exception) {
+                        logcat(LogPriority.ERROR, e)
+                        false
                     }
-                    delayedTrackingStore.remove(track.id)
-                } catch (e: Exception) {
-                    logcat(LogPriority.ERROR, e)
                 }
-            }
         }
 
-        return Result.success()
+        return if (results.isNotEmpty()) Result.failure() else Result.success()
     }
 
     companion object {

app/src/main/java/eu/kanade/presentation/components/DeleteLibraryMangaDialog.kt

@@ -64,9 +64,11 @@ fun DeleteLibraryMangaDialog(
                 list.forEach { state ->
                     val onCheck = {
                         val index = list.indexOf(state)
-                        val mutableList = list.toMutableList()
+                        if (index != -1) {
-                        mutableList[index] = state.next() as CheckboxState.State<Int>
+                            val mutableList = list.toMutableList()
-                        list = mutableList.toList()
+                            mutableList[index] = state.next() as CheckboxState.State<Int>
+                            list = mutableList.toList()
+                        }
                     }
 
                     Row(

app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt

@@ -339,7 +339,6 @@ class Downloader(
                     ?.filter { it.name!!.endsWith(".tmp") }
                     ?.forEach { it.delete() }
 
-                download.downloadedImages = 0
                 download.status = Download.State.DOWNLOADING
             }
             // Get all the URLs to the source images, fetch pages if necessary
@@ -403,7 +402,6 @@ class Downloader(
                 }
                 page.uri = file.uri
                 page.progress = 100
-                download.downloadedImages++
                 page.status = Page.State.READY
             }
             .map { page }

app/src/main/java/eu/kanade/tachiyomi/data/download/model/Download.kt

@@ -21,9 +21,8 @@ data class Download(
     val totalProgress: Int
         get() = pages?.sumOf(Page::progress) ?: 0
 
-    @Volatile
+    val downloadedImages: Int
-    @Transient
+        get() = pages?.count { it.status == Page.State.READY } ?: 0
-    var downloadedImages: Int = 0
 
     @Volatile
     @Transient

app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/ShikimoriApi.kt

@@ -158,7 +158,7 @@ class ShikimoriApi(private val client: OkHttpClient, interceptor: ShikimoriInter
         private const val clientId = "1aaf4cf232372708e98b5abc813d795b539c5a916dbbfe9ac61bf02a360832cc"
         private const val clientSecret = "229942c742dd4cde803125d17d64501d91c0b12e14cb1e5120184d77d67024c0"
 
-        private const val baseUrl = "https://shikimori.one"
+        private const val baseUrl = "https://shikimori.me"
         private const val apiUrl = "$baseUrl/api"
         private const val oauthUrl = "$baseUrl/oauth/token"
         private const val loginUrl = "$baseUrl/oauth/authorize"

app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt

@@ -126,8 +126,8 @@ internal object ExtensionLoader {
         }
 
         // Validate lib version
-        val libVersion = versionName.substringBeforeLast('.').toDouble()
+        val libVersion = versionName.substringBeforeLast('.').toDoubleOrNull()
-        if (libVersion < LIB_VERSION_MIN || libVersion > LIB_VERSION_MAX) {
+        if (libVersion == null || libVersion < LIB_VERSION_MIN || libVersion > LIB_VERSION_MAX) {
             logcat(LogPriority.WARN) {
                 "Lib version is $libVersion, while only versions " +
                     "$LIB_VERSION_MIN to $LIB_VERSION_MAX are allowed"
@@ -136,7 +136,6 @@ internal object ExtensionLoader {
         }
 
         val signatureHash = getSignatureHash(pkgInfo)
-
         if (signatureHash == null) {
             logcat(LogPriority.WARN) { "Package $pkgName isn't signed" }
             return LoadResult.Error

app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesScreen.kt

@@ -61,7 +61,7 @@ class SourcePreferencesScreen(val sourceId: Long) : Screen {
         Scaffold(
             topBar = {
                 TopAppBar(
-                    title = { Text(text = Injekt.get<SourceManager>().get(sourceId)!!.toString()) },
+                    title = { Text(text = Injekt.get<SourceManager>().getOrStub(sourceId).toString()) },
                     navigationIcon = {
                         IconButton(onClick = navigator::pop) {
                             Icon(

app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt

@@ -2,7 +2,9 @@ package eu.kanade.tachiyomi.ui.browse.migration.search
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -23,6 +25,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
 import androidx.compose.ui.util.fastForEachIndexed
 import cafe.adriel.voyager.core.model.StateScreenModel
 import eu.kanade.domain.category.interactor.SetMangaCategories
@@ -111,7 +114,9 @@ internal fun MigrateDialog(
                 }
             },
             confirmButton = {
-                Row {
+                FlowRow(
+                    horizontalArrangement = Arrangement.spacedBy(4.dp),
+                ) {
                     TextButton(
                         onClick = {
                             onClickTitle()

app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt

@@ -977,6 +977,14 @@ class MangaInfoScreenModel(
             }
         }
     }
+
+    private val Throwable.snackbarMessage: String
+        get() = when (val className = this::class.simpleName) {
+            null -> message ?: ""
+            "SourceNotInstalledException" -> context.getString(R.string.loader_not_implemented_error)
+            "Exception", "HttpException", "IOException" -> message ?: className
+            else -> "$className: $message"
+        }
 }
 
 sealed class MangaScreenState {
@@ -1055,10 +1063,3 @@ val chapterDecimalFormat = DecimalFormat(
     DecimalFormatSymbols()
         .apply { decimalSeparator = '.' },
 )
-
-private val Throwable.snackbarMessage: String
-    get() = when (val className = this::class.simpleName) {
-        null -> message ?: ""
-        "Exception", "HttpException", "IOException", "SourceNotInstalledException" -> message ?: className
-        else -> "$className: $message"
-    }

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt

@@ -99,10 +99,6 @@ import uy.kohesive.injekt.injectLazy
 import kotlin.math.abs
 import kotlin.math.max
 
-/**
- * Activity containing the reader of Tachiyomi. This activity is mostly a container of the
- * viewers, to which calls from the presenter or UI events are delegated.
- */
 class ReaderActivity : BaseActivity() {
 
     companion object {
@@ -661,7 +657,7 @@ class ReaderActivity : BaseActivity() {
      * Called from the presenter when a manga is ready. Used to instantiate the appropriate viewer
      * and the toolbar title.
      */
-    fun setManga(manga: Manga) {
+    private fun setManga(manga: Manga) {
         val prevViewer = viewer
 
         val viewerMode = ReadingModeType.fromPreference(viewModel.getMangaReadingMode(resolveDefault = false))
@@ -776,7 +772,7 @@ class ReaderActivity : BaseActivity() {
      * Called from the presenter if the initial load couldn't load the pages of the chapter. In
      * this case the activity is closed and a toast is shown to the user.
      */
-    fun setInitialChapterError(error: Throwable) {
+    private fun setInitialChapterError(error: Throwable) {
         logcat(LogPriority.ERROR, error)
         finish()
         toast(error.message)

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt

@@ -201,17 +201,6 @@ class ReaderViewModel(
 
     private val incognitoMode = preferences.incognitoMode().get()
 
-    override fun onCleared() {
-        val currentChapters = state.value.viewerChapters
-        if (currentChapters != null) {
-            currentChapters.unref()
-            saveReadingProgress(currentChapters.currChapter)
-            chapterToDownload?.let {
-                downloadManager.addDownloadsToStartOfQueue(listOf(it))
-            }
-        }
-    }
-
     init {
         // To save state
         state.map { it.viewerChapters?.currChapter }
@@ -226,6 +215,17 @@ class ReaderViewModel(
             .launchIn(viewModelScope)
     }
 
+    override fun onCleared() {
+        val currentChapters = state.value.viewerChapters
+        if (currentChapters != null) {
+            currentChapters.unref()
+            saveReadingProgress(currentChapters.currChapter)
+            chapterToDownload?.let {
+                downloadManager.addDownloadsToStartOfQueue(listOf(it))
+            }
+        }
+    }
+
     /**
      * Called when the user pressed the back button and is going to leave the reader. Used to
      * trigger deletion of the downloaded chapters.
@@ -338,10 +338,11 @@ class ReaderViewModel(
     }
 
     /**
-     * Called when the user is going to load the prev/next chapter through the menu button.
+     * Called when the user is going to load the prev/next chapter through the toolbar buttons.
      */
     private suspend fun loadAdjacent(chapter: ReaderChapter) {
         val loader = loader ?: return
+        saveCurrentChapterReadingProgress()
 
         logcat { "Loading adjacent ${chapter.chapter.url}" }
 

buildSrc/src/main/kotlin/LocalesConfigPlugin.kt

@@ -3,25 +3,22 @@ import org.gradle.api.Task
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.kotlin.dsl.TaskContainerScope
 
+private val emptyResourcesElement = "<resources>\\s*</resources>|<resources/>".toRegex()
+private val valuesPrefix = "values(-(b\\+)?)?".toRegex()
+
 fun TaskContainerScope.registerLocalesConfigTask(project: Project): TaskProvider<Task> {
     return with(project) {
         register("generateLocalesConfig") {
-            val emptyResourcesElement = "<resources>\\s*</resources>|<resources/>".toRegex()
-            val valuesPrefix = "values-?".toRegex()
-
             val languages = fileTree("$projectDir/src/main/res/")
-                .matching {
+                .matching { include("**/strings.xml") }
-                    include("**/strings.xml")
+                .filterNot { it.readText().contains(emptyResourcesElement) }
-                }
-                .filterNot {
-                    it.readText().contains(emptyResourcesElement)
-                }
                 .map { it.parentFile.name }
                 .sorted()
                 .joinToString(separator = "\n") {
                     val language = it
                         .replace(valuesPrefix, "")
                         .replace("-r", "-")
+                        .replace("+", "-")
                         .takeIf(String::isNotBlank) ?: "en"
                     "   <locale android:name=\"$language\"/>"
                 }

core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt

@@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.network
 
 import android.content.Context
 import eu.kanade.tachiyomi.network.interceptor.CloudflareInterceptor
+import eu.kanade.tachiyomi.network.interceptor.UncaughtExceptionInterceptor
 import eu.kanade.tachiyomi.network.interceptor.UserAgentInterceptor
 import okhttp3.Cache
 import okhttp3.OkHttpClient
@@ -29,6 +30,7 @@ class NetworkHelper(context: Context) {
                 .connectTimeout(30, TimeUnit.SECONDS)
                 .readTimeout(30, TimeUnit.SECONDS)
                 .callTimeout(2, TimeUnit.MINUTES)
+                .addInterceptor(UncaughtExceptionInterceptor())
                 .addInterceptor(userAgentInterceptor)
 
             if (preferences.verboseLogging().get()) {

core/src/main/java/eu/kanade/tachiyomi/network/NetworkPreferences.kt

@@ -17,6 +17,6 @@ class NetworkPreferences(
     }
 
     fun defaultUserAgent(): Preference<String> {
-        return preferenceStore.getString("default_user_agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:108.0) Gecko/20100101 Firefox/108.0")
+        return preferenceStore.getString("default_user_agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:110.0) Gecko/20100101 Firefox/110.0")
     }
 }

core/src/main/java/eu/kanade/tachiyomi/network/interceptor/UncaughtExceptionInterceptor.kt

@@ -0,0 +1,24 @@
+package eu.kanade.tachiyomi.network.interceptor
+
+import okhttp3.Interceptor
+import okhttp3.Response
+import java.io.IOException
+
+/**
+ * Catches any uncaught exceptions from later in the chain and rethrows as a non-fatal
+ * IOException to avoid catastrophic failure.
+ *
+ * This should be the first interceptor in the client.
+ *
+ * See https://square.github.io/okhttp/4.x/okhttp/okhttp3/-interceptor/
+ */
+class UncaughtExceptionInterceptor : Interceptor {
+
+    override fun intercept(chain: Interceptor.Chain): Response {
+        return try {
+            chain.proceed(chain.request())
+        } catch (e: Exception) {
+            throw IOException(e)
+        }
+    }
+}

core/src/main/java/eu/kanade/tachiyomi/util/system/WebViewUtil.kt

@@ -12,7 +12,7 @@ import tachiyomi.core.util.system.logcat
 object WebViewUtil {
     const val SPOOF_PACKAGE_NAME = "org.chromium.chrome"
 
-    const val MINIMUM_WEBVIEW_VERSION = 105
+    const val MINIMUM_WEBVIEW_VERSION = 108
 
     fun supportsWebView(context: Context): Boolean {
         try {

domain/src/main/java/tachiyomi/domain/library/model/LibraryDisplayMode.kt

@@ -24,7 +24,7 @@ sealed class LibraryDisplayMode(
     }
 
     companion object {
-        val values = setOf(CompactGrid, ComfortableGrid, List, CoverOnlyGrid)
+        val values by lazy { setOf(CompactGrid, ComfortableGrid, List, CoverOnlyGrid) }
         val default = CompactGrid
 
         fun valueOf(flag: Long?): LibraryDisplayMode {

domain/src/main/java/tachiyomi/domain/library/model/LibrarySortMode.kt

@@ -65,8 +65,8 @@ data class LibrarySort(
     }
 
     companion object {
-        val types = setOf(Type.Alphabetical, Type.LastRead, Type.LastUpdate, Type.UnreadCount, Type.TotalChapters, Type.LatestChapter, Type.ChapterFetchDate, Type.DateAdded)
+        val types by lazy { setOf(Type.Alphabetical, Type.LastRead, Type.LastUpdate, Type.UnreadCount, Type.TotalChapters, Type.LatestChapter, Type.ChapterFetchDate, Type.DateAdded) }
-        val directions = setOf(Direction.Ascending, Direction.Descending)
+        val directions by lazy { setOf(Direction.Ascending, Direction.Descending) }
         val default = LibrarySort(Type.Alphabetical, Direction.Ascending)
 
         fun valueOf(flag: Long): LibrarySort {

gradle/libs.versions.toml

@@ -46,7 +46,7 @@ coil-core = { module = "io.coil-kt:coil", version.ref = "coil_version" }
 coil-gif = { module = "io.coil-kt:coil-gif", version.ref = "coil_version" }
 coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil_version" }
 
-subsamplingscaleimageview = "com.github.tachiyomiorg:subsampling-scale-image-view:846abe0"
+subsamplingscaleimageview = "com.github.tachiyomiorg:subsampling-scale-image-view:c8e2650"
 image-decoder = "com.github.tachiyomiorg:image-decoder:7879b45"
 
 natural-comparator = "com.github.gpanther:java-nat-sort:natural-comparator-1.1"