Release v0.13.3

Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: DarKCroX <darkcrox.2020@outlook.com>
Co-authored-by: Eduard Ereza Martínez <eduard@ereza.cat>
Co-authored-by: Eric <alchemillatruth@purelymail.com>
Co-authored-by: GTX155 <kirchoabv@mail.bg>
Co-authored-by: Giorgio Sanna <sannagiorgio1997@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Huang Zhiyi <hzy980512@126.com>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Jetspectre <jetspectre1@gmail.com>
Co-authored-by: Jozef Hollý <j2.00ghz@gmail.com>
Co-authored-by: Lauri <lauri.kangasaho@hotmail.com>
Co-authored-by: Lyfja <yassinelaoud@gmail.com>
Co-authored-by: Lzmxya <lzmxya@gmail.com>
Co-authored-by: Marco Santos <enum.scima@gmail.com>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Nicol Bolas <creepyweirdo1031@gmail.com>
Co-authored-by: Oğuz Ersen <oguz@ersen.moe>
Co-authored-by: Pierre Kim <admin@manateeshome.com>
Co-authored-by: Pilfer <pescao@gmail.com>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Rikishaaa <jebote90@gmail.com>
Co-authored-by: Santiago José Gutiérrez Llanod <gutierrezapata17@gmail.com>
Co-authored-by: Sebastian Mihai Crap <sebastiancrap@gmail.com>
Co-authored-by: Shjosan <shjosan@kakmix.co>
Co-authored-by: Subham Jena <subhamjena8465@gmail.com>
Co-authored-by: Swyter <swyterzone@gmail.com>
Co-authored-by: Vetle Ledaal <vetle.ledaal@gmail.com>
Co-authored-by: Zero O <godarms2010@live.com>
Co-authored-by: altinat <poiiiii4yy@gmail.com>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
Co-authored-by: אילון קטן <eilonkatan@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/bg/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ca/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cs/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/de/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/el/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es_419/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fil/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/he/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/it/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ja/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ko/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ms/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/nb_NO/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/or/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt_BR/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ro/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ru/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sc/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/th/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/tr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/vi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hant/
Translation: Tachiyomi/Tachiyomi 0.x

Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: DarKCroX <darkcrox.2020@outlook.com>
Co-authored-by: Eduard Ereza Martínez <eduard@ereza.cat>
Co-authored-by: Eric <alchemillatruth@purelymail.com>
Co-authored-by: GTX155 <kirchoabv@mail.bg>
Co-authored-by: Giorgio Sanna <sannagiorgio1997@gmail.com>
Co-authored-by: Huang Zhiyi <hzy980512@126.com>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Jetspectre <jetspectre1@gmail.com>
Co-authored-by: Lauri <lauri.kangasaho@hotmail.com>
Co-authored-by: Lyfja <yassinelaoud@gmail.com>
Co-authored-by: Lzmxya <lzmxya@gmail.com>
Co-authored-by: Marco Santos <enum.scima@gmail.com>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Nicol Bolas <creepyweirdo1031@gmail.com>
Co-authored-by: Oğuz Ersen <oguz@ersen.moe>
Co-authored-by: Pierre Kim <admin@manateeshome.com>
Co-authored-by: Pilfer <pescao@gmail.com>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Rikishaaa <jebote90@gmail.com>
Co-authored-by: Santiago José Gutiérrez Llanod <gutierrezapata17@gmail.com>
Co-authored-by: Sebastian Mihai Crap <sebastiancrap@gmail.com>
Co-authored-by: Shjosan <shjosan@kakmix.co>
Co-authored-by: Subham Jena <subhamjena8465@gmail.com>
Co-authored-by: Swyter <swyterzone@gmail.com>
Co-authored-by: Vetle Ledaal <vetle.ledaal@gmail.com>
Co-authored-by: Zero O <godarms2010@live.com>
Co-authored-by: altinat <poiiiii4yy@gmail.com>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
Co-authored-by: אילון קטן <eilonkatan@gmail.com>

.editorconfig

@@ -0,0 +1,5 @@
+[*.{kt,kts}]
+indent_size=4
+insert_final_newline=true
+ij_kotlin_allow_trailing_comma=true
+ij_kotlin_allow_trailing_comma_on_call_site=true

.github/ISSUE_TEMPLATE.md

@@ -3,7 +3,7 @@
 I acknowledge that:
 
 - I have updated:
-  - To the latest version of the app (stable is v0.12.2)
+  - To the latest version of the app (stable is v0.13.3)
   - 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.12.2"
+        Example: "0.13.3"
     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.12.2](https://github.com/tachiyomiorg/tachiyomi/releases/latest)**.
+        - label: I have updated the app to version **[0.13.3](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.12.2](https://github.com/tachiyomiorg/tachiyomi/releases/latest)**.
+        - label: I have updated the app to version **[0.13.3](https://github.com/tachiyomiorg/tachiyomi/releases/latest)**.
           required: true
         - label: I will fill out all of the requested information in this form.
           required: true

.github/runner-files/ci-gradle.properties

@@ -2,5 +2,4 @@ org.gradle.daemon=false
 org.gradle.jvmargs=-Xmx5120m
 org.gradle.workers.max=2
 
-kotlin.incremental=false
+kotlin.incremental=false
-kotlin.compiler.execution.strategy=in-process

.github/workflows/build_pull_request.yml

@@ -1,6 +1,12 @@
 name: PR build check
 on:
   pull_request:
+    paths-ignore:
+      - '**.md'
+      - 'app/src/main/res/**/strings.xml'
+
+permissions:
+  contents: read
 
 jobs:
   build:
@@ -9,11 +15,14 @@ jobs:
 
     steps:
       - name: Clone repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
 
+      - name: Dependency Review
+        uses: actions/dependency-review-action@v1
+
       - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
@@ -25,9 +34,6 @@ jobs:
           cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: Build app
-        uses: gradle/gradle-command-action@v1
+        uses: gradle/gradle-command-action@v2
         with:
           arguments: assembleStandardRelease
-          distributions-cache-enabled: true
-          dependencies-cache-enabled: true
-          configuration-cache-enabled: true

.github/workflows/build_push.yml

@@ -13,12 +13,13 @@ jobs:
 
     steps:
       - name: Cancel previous runs
-        uses: styfle/cancel-workflow-action@0.5.0
+        uses: styfle/cancel-workflow-action@0.9.1
         with:
           access_token: ${{ github.token }}
+          all_but_latest: true
 
       - name: Clone repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
@@ -34,12 +35,9 @@ jobs:
           cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: Build app
-        uses: gradle/gradle-command-action@v1
+        uses: gradle/gradle-command-action@v2
         with:
           arguments: assembleStandardRelease
-          distributions-cache-enabled: true
-          dependencies-cache-enabled: true
-          configuration-cache-enabled: true
 
       # Sign APK and create release for tags
 

.github/workflows/cancel_pull_request.yml

@@ -10,6 +10,7 @@ jobs:
   cancel:
     runs-on: ubuntu-latest
     steps:
-    - uses: styfle/cancel-workflow-action@0.8.0
+    - uses: styfle/cancel-workflow-action@0.9.1
       with:
+        all_but_latest: true
         workflow_id: ${{ github.event.workflow.id }}

.github/workflows/issue_closer.yml

@@ -1,32 +0,0 @@
-name: Issue closer
-on:
-  issues:
-    types: [opened, edited, reopened]
-
-jobs:
-  autoclose:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Autoclose issues
-        uses: arkon/issue-closer-action@v3.4
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          rules: |
-            [
-              {
-                "type": "body",
-                "regex": ".*DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT.*",
-                "message": "The acknowledgment section was not removed."
-              },
-              {
-                "type": "body",
-                "regex": ".*\\* (Tachiyomi version|Android version|Device): \\?.*",
-                "message": "Requested information in the template was not filled out."
-              },
-              {
-                "type": "both",
-                "regex": ".*(aniyomi|anime).*",
-                "ignoreCase": true,
-                "message": "Tachiyomi does not support anime, and has no plans to support anime. In addition Tachiyomi is not affiliated with Aniyomi https://github.com/jmir1/aniyomi"
-              }
-            ]

.github/workflows/issue_moderator.yml

@@ -1,6 +1,8 @@
 name: Issue moderator
 
 on:
+  issues:
+    types: [opened, edited, reopened]
   issue_comment:
     types: [created]
 
@@ -9,6 +11,25 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Moderate issues
-        uses: tachiyomiorg/issue-moderator-action@v1.1
+        uses: tachiyomiorg/issue-moderator-action@v1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+          auto-close-rules: |
+            [
+              {
+                "type": "body",
+                "regex": ".*DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT.*",
+                "message": "The acknowledgment section was not removed."
+              },
+              {
+                "type": "body",
+                "regex": ".*\\* (Tachiyomi version|Android version|Device): \\?.*",
+                "message": "Requested information in the template was not filled out."
+              },
+              {
+                "type": "both",
+                "regex": "^(?!.*myanimelist.*).*(aniyomi|anime).*$",
+                "ignoreCase": true,
+                "message": "Tachiyomi does not support anime, and has no plans to support anime. In addition Tachiyomi is not affiliated with Aniyomi https://github.com/jmir1/aniyomi"
+              }
+            ]

.github/workflows/lock.yml

@@ -3,7 +3,7 @@ name: Lock threads
 on:
   # Daily
   schedule:
-    - cron: '0 * * * *'
+    - cron: '0 0 * * *'
   # Manual trigger
   workflow_dispatch:
     inputs:
@@ -12,8 +12,8 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v2
+      - uses: dessant/lock-threads@v3
         with:
           github-token: ${{ github.token }}
-          issue-lock-inactive-days: '2'
+          issue-inactive-days: '2'
-          pr-lock-inactive-days: '2'
+          pr-inactive-days: '2'

CONTRIBUTING.md

@@ -10,7 +10,23 @@ Thanks for your interest in contributing to Tachiyomi!
 Pull requests are welcome!
 
 If you're interested in taking on [an open issue](https://github.com/tachiyomiorg/tachiyomi/issues), please comment on it so others are aware.
+You do not need to ask for permission nor an assignment.
 
+## Prerequisites
+
+Before you start, please note that the ability to use following technologies is **required** and that existing contributors will not actively teach them to you.
+
+- Basic [Android development](https://developer.android.com/)
+- [Kotlin](https://kotlinlang.org/)
+
+### Tools
+
+- [Android Studio](https://developer.android.com/studio)
+- Emulator or phone with developer options enabled to test changes.
+
+## Getting help
+
+- Join [the Discord server](https://discord.gg/tachiyomi) for online help and to ask questions while developing.
 
 # Translations
 
@@ -26,7 +42,7 @@ When creating a fork, remember to:
 - To avoid confusion with the main app:
     - Change the app name
     - Change the app icon
-    - Change or disable the [app update checker](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/src/main/java/eu/kanade/tachiyomi/data/updater/GithubUpdateChecker.kt)
+    - Change or disable the [app update checker](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt)
 - To avoid installation conflicts:
     - Change the `applicationId` in [`build.gradle.kts`](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/build.gradle.kts)
 - To avoid having your data polluting the main app's analytics and crash report services:

app/build.gradle.kts

@@ -1,8 +1,4 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import java.io.ByteArrayOutputStream
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.TimeZone
 
 plugins {
     id("com.android.application")
@@ -13,7 +9,7 @@ plugins {
 }
 
 if (gradle.startParameter.taskRequests.toString().contains("Standard")) {
-    apply(plugin = "com.google.gms.google-services")
+    apply<com.google.gms.googleservices.GoogleServicesPlugin>()
 }
 
 shortcutHelper.setFilePath("./shortcuts.xml")
@@ -28,14 +24,14 @@ android {
         applicationId = "eu.kanade.tachiyomi"
         minSdk = AndroidConfig.minSdk
         targetSdk = AndroidConfig.targetSdk
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        versionCode = 79
-        versionCode = 68
+        versionName = "0.13.3"
-        versionName = "0.12.2"
 
         buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
         buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"")
         buildConfigField("String", "BUILD_TIME", "\"${getBuildTime()}\"")
         buildConfigField("boolean", "INCLUDE_UPDATER", "false")
+        buildConfigField("boolean", "PREVIEW", "false")
 
         // Please disable ACRA or use your own instance in forked versions of the project
         buildConfigField("String", "ACRA_URI", "\"https://tachiyomi.kanade.eu/crash_report\"")
@@ -43,6 +39,8 @@ android {
         ndk {
             abiFilters += SUPPORTED_ABIS
         }
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     splits {
@@ -58,25 +56,25 @@ android {
         named("debug") {
             versionNameSuffix = "-${getCommitCount()}"
             applicationIdSuffix = ".debug"
-
-            isShrinkResources = true
-            isMinifyEnabled = true
-            proguardFiles("proguard-android-optimize.txt", "proguard-rules.pro")
-        }
-        create("debugFull") { // Debug without R8
-            initWith(getByName("debug"))
-            isShrinkResources = false
-            isMinifyEnabled = false
         }
         named("release") {
             isShrinkResources = true
             isMinifyEnabled = true
             proguardFiles("proguard-android-optimize.txt", "proguard-rules.pro")
         }
+        create("preview") {
+            initWith(getByName("release"))
+            buildConfigField("boolean", "PREVIEW", "true")
+
+            val debugType = getByName("debug")
+            signingConfig = debugType.signingConfig
+            versionNameSuffix = debugType.versionNameSuffix
+            applicationIdSuffix = debugType.applicationIdSuffix
+        }
     }
 
     sourceSets {
-        getByName("debugFull").res.srcDirs("src/debug/res")
+        getByName("preview").res.srcDirs("src/debug/res")
     }
 
     flavorDimensions.add("default")
@@ -98,8 +96,10 @@ android {
             "LICENSE.txt",
             "META-INF/LICENSE",
             "META-INF/LICENSE.txt",
+            "META-INF/README.md",
             "META-INF/NOTICE",
             "META-INF/*.kotlin_module",
+            "META-INF/*.version",
         ))
     }
 
@@ -109,12 +109,17 @@ android {
 
     buildFeatures {
         viewBinding = true
+
+        // Disable some unused things
+        aidl = false
+        renderScript = false
+        shaders = false
     }
 
     lint {
-        disable("MissingTranslation", "ExtraTranslation")
+        disable.addAll(listOf("MissingTranslation", "ExtraTranslation"))
-        isAbortOnError = false
+        abortOnError = false
-        isCheckReleaseBuilds = false
+        checkReleaseBuilds = false
     }
 
     compileOptions {
@@ -128,147 +133,121 @@ android {
 }
 
 dependencies {
-    implementation(kotlin("reflect", version = BuildPluginsVersion.KOTLIN))
+    implementation(kotlinx.reflect)
 
-    val coroutinesVersion = "1.5.2"
+    implementation(kotlinx.bundles.coroutines)
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion")
 
     // Source models and interfaces from Tachiyomi 1.x
-    implementation("org.tachiyomi:source-api:1.1")
+    implementation(libs.tachiyomi.api)
 
     // AndroidX libraries
-    implementation("androidx.annotation:annotation:1.3.0-alpha01")
+    implementation(androidx.annotation)
-    implementation("androidx.appcompat:appcompat:1.4.0-alpha03")
+    implementation(androidx.appcompat)
-    implementation("androidx.biometric:biometric-ktx:1.2.0-alpha03")
+    implementation(androidx.biometricktx)
-    implementation("androidx.browser:browser:1.3.0")
+    implementation(androidx.constraintlayout)
-    implementation("androidx.constraintlayout:constraintlayout:2.1.0")
+    implementation(androidx.coordinatorlayout)
-    implementation("androidx.coordinatorlayout:coordinatorlayout:1.1.0")
+    implementation(androidx.corektx)
-    implementation("androidx.core:core-ktx:1.7.0-alpha02")
+    implementation(androidx.splashscreen)
-    implementation("androidx.core:core-splashscreen:1.0.0-alpha01")
+    implementation(androidx.recyclerview)
-    implementation("androidx.recyclerview:recyclerview:1.2.1")
+    implementation(androidx.swiperefreshlayout)
-    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01")
+    implementation(androidx.viewpager)
 
-    val lifecycleVersion = "2.4.0-alpha01"
+    implementation(androidx.bundles.lifecycle)
-    implementation("androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion")
-    implementation("androidx.lifecycle:lifecycle-process:$lifecycleVersion")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
 
     // Job scheduling
-    implementation("androidx.work:work-runtime-ktx:2.6.0")
+    implementation(androidx.bundles.workmanager)
 
     // RX
-    implementation("io.reactivex:rxandroid:1.2.1")
+    implementation(libs.bundles.reactivex)
-    implementation("io.reactivex:rxjava:1.3.8")
+    implementation(libs.flowreactivenetwork)
-    implementation("com.jakewharton.rxrelay:rxrelay:1.2.0")
-    implementation("ru.beryukhov:flowreactivenetwork:1.0.4")
 
     // Network client
-    val okhttpVersion = "4.9.1"
+    implementation(libs.bundles.okhttp)
-    implementation("com.squareup.okhttp3:okhttp:$okhttpVersion")
+    implementation(libs.okio)
-    implementation("com.squareup.okhttp3:logging-interceptor:$okhttpVersion")
-    implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:$okhttpVersion")
-    implementation("com.squareup.okio:okio:2.10.0")
 
     // TLS 1.3 support for Android < 10
-    implementation("org.conscrypt:conscrypt-android:2.5.2")
+    implementation(libs.conscrypt.android)
 
     // Data serialization (JSON, protobuf)
-    val kotlinSerializationVersion = "1.3.0-RC"
+    implementation(kotlinx.bundles.serialization)
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinSerializationVersion")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$kotlinSerializationVersion")
-
-    // TODO: remove these once they're no longer used in any extensions
-    implementation("com.google.code.gson:gson:2.8.7")
-    implementation("com.github.salomonbrys.kotson:kotson:2.5.0")
 
     // JavaScript engine
-    implementation("com.squareup.duktape:duktape-android:1.4.0")
+    implementation(libs.bundles.js.engine)
 
     // HTML parser
-    implementation("org.jsoup:jsoup:1.14.2")
+    implementation(libs.jsoup)
 
     // Disk
-    implementation("com.jakewharton:disklrucache:2.0.2")
+    implementation(libs.disklrucache)
-    implementation("com.github.tachiyomiorg:unifile:17bec43")
+    implementation(libs.unifile)
-    implementation("com.github.junrar:junrar:7.4.0")
+    implementation(libs.junrar)
 
     // Database
-    implementation("androidx.sqlite:sqlite-ktx:2.1.0")
+    implementation(libs.bundles.sqlite)
     implementation("com.github.inorichi.storio:storio-common:8be19de@aar")
     implementation("com.github.inorichi.storio:storio-sqlite:8be19de@aar")
-    implementation("com.github.requery:sqlite-android:3.36.0")
 
     // Preferences
-    implementation("androidx.preference:preference-ktx:1.1.1")
+    implementation(libs.preferencektx)
-    implementation("com.github.tfcporciuncula.flow-preferences:flow-preferences:1.4.0")
+    implementation(libs.flowpreferences)
 
     // Model View Presenter
-    val nucleusVersion = "3.0.0"
+    implementation(libs.bundles.nucleus)
-    implementation("info.android15.nucleus:nucleus:$nucleusVersion")
-    implementation("info.android15.nucleus:nucleus-support-v7:$nucleusVersion")
 
     // Dependency injection
-    implementation("com.github.inorichi.injekt:injekt-core:65b0440")
+    implementation(libs.injekt.core)
 
     // Image loading
-    val coilVersion = "1.3.2"
+    implementation(libs.bundles.coil)
-    implementation("io.coil-kt:coil:$coilVersion")
-    implementation("io.coil-kt:coil-gif:$coilVersion")
 
-    implementation("com.github.tachiyomiorg:subsampling-scale-image-view:846abe0") {
+    implementation(libs.subsamplingscaleimageview) {
         exclude(module = "image-decoder")
     }
-    implementation("com.github.tachiyomiorg:image-decoder:7481a4a")
+    implementation(libs.image.decoder)
 
     // Sort
-    implementation("com.github.gpanther:java-nat-sort:natural-comparator-1.1")
+    implementation(libs.natural.comparator)
 
     // UI libraries
-    implementation("com.google.android.material:material:1.5.0-alpha03")
+    implementation(libs.material)
-    implementation("com.github.dmytrodanylyk.android-process-button:library:1.0.4")
+    implementation(libs.androidprocessbutton)
-    implementation("eu.davidea:flexible-adapter:5.1.0")
+    implementation(libs.flexible.adapter.core)
-    implementation("eu.davidea:flexible-adapter-ui:1.0.0")
+    implementation(libs.flexible.adapter.ui)
-    implementation("com.nightlynexus.viewstatepageradapter:viewstatepageradapter:1.1.0")
+    implementation(libs.viewstatepageradapter)
-    implementation("com.github.chrisbanes:PhotoView:2.3.0")
+    implementation(libs.photoview)
-    implementation("com.github.tachiyomiorg:DirectionalViewPager:1.0.0")
+    implementation(libs.directionalviewpager) {
-    implementation("dev.chrisbanes.insetter:insetter:0.6.0")
+        exclude(group = "androidx.viewpager", module = "viewpager")
+    }
+    implementation(libs.insetter)
 
     // Conductor
-    val conductorVersion = "3.0.0"
+    implementation(libs.bundles.conductor)
-    implementation("com.bluelinelabs:conductor:$conductorVersion")
-    implementation("com.bluelinelabs:conductor-viewpager:$conductorVersion")
-    implementation("com.github.tachiyomiorg:conductor-support-preference:$conductorVersion")
 
     // FlowBinding
-    val flowbindingVersion = "1.2.0"
+    implementation(libs.bundles.flowbinding)
-    implementation("io.github.reactivecircus.flowbinding:flowbinding-android:$flowbindingVersion")
-    implementation("io.github.reactivecircus.flowbinding:flowbinding-appcompat:$flowbindingVersion")
-    implementation("io.github.reactivecircus.flowbinding:flowbinding-recyclerview:$flowbindingVersion")
-    implementation("io.github.reactivecircus.flowbinding:flowbinding-swiperefreshlayout:$flowbindingVersion")
-    implementation("io.github.reactivecircus.flowbinding:flowbinding-viewpager:$flowbindingVersion")
 
     // Logging
-    implementation("com.jakewharton.timber:timber:5.0.1")
+    implementation(libs.logcat)
 
     // Crash reports/analytics
-    implementation("ch.acra:acra-http:5.8.1")
+    implementation(libs.acra.http)
-    "standardImplementation"("com.google.firebase:firebase-analytics:19.0.1")
+    "standardImplementation"(libs.firebase.analytics)
 
     // Licenses
-    implementation("com.mikepenz:aboutlibraries-core:${BuildPluginsVersion.ABOUTLIB_PLUGIN}")
+    implementation(libs.aboutlibraries.core)
+
+    // Shizuku
+    implementation(libs.bundles.shizuku)
 
     // Tests
-    testImplementation("junit:junit:4.13.2")
+    testImplementation(libs.junit)
-    testImplementation("org.assertj:assertj-core:3.16.1")
+    testImplementation(libs.assertj.core)
-    testImplementation("org.mockito:mockito-core:1.10.19")
+    testImplementation(libs.mockito.core)
 
-    val robolectricVersion = "3.1.4"
+    testImplementation(libs.bundles.robolectric)
-    testImplementation("org.robolectric:robolectric:$robolectricVersion")
-    testImplementation("org.robolectric:shadows-play-services:$robolectricVersion")
 
     // For detecting memory leaks; see https://square.github.io/leakcanary/
-    // debugImplementation("com.squareup.leakcanary:leakcanary-android:2.7")
+    // debugImplementation(libs.leakcanary.android)
 }
 
 tasks {
@@ -277,12 +256,12 @@ tasks {
         kotlinOptions.freeCompilerArgs += listOf(
             "-Xopt-in=kotlin.Experimental",
             "-Xopt-in=kotlin.RequiresOptIn",
-            "-Xuse-experimental=kotlin.ExperimentalStdlibApi",
+            "-Xopt-in=kotlin.ExperimentalStdlibApi",
-            "-Xuse-experimental=kotlinx.coroutines.FlowPreview",
+            "-Xopt-in=kotlinx.coroutines.FlowPreview",
-            "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
+            "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-            "-Xuse-experimental=kotlinx.coroutines.InternalCoroutinesApi",
+            "-Xopt-in=kotlinx.coroutines.InternalCoroutinesApi",
-            "-Xuse-experimental=kotlinx.serialization.ExperimentalSerializationApi",
+            "-Xopt-in=kotlinx.serialization.ExperimentalSerializationApi",
-            "-Xuse-experimental=coil.annotation.ExperimentalCoilApi",
+            "-Xopt-in=coil.annotation.ExperimentalCoilApi",
         )
     }
 
@@ -298,40 +277,8 @@ tasks {
     }
 }
 
-
 buildscript {
-    repositories {
-        mavenCentral()
-    }
     dependencies {
-        classpath(kotlin("gradle-plugin", version = BuildPluginsVersion.KOTLIN))
+        classpath(kotlinx.gradle)
     }
 }
-
-
-// Git is needed in your system PATH for these commands to work.
-// If it's not installed, you can return a random value as a workaround
-fun getCommitCount(): String {
-    return runCommand("git rev-list --count HEAD")
-    // return "1"
-}
-
-fun getGitSha(): String {
-    return runCommand("git rev-parse --short HEAD")
-    // return "1"
-}
-
-fun getBuildTime(): String {
-    val df = SimpleDateFormat("yyyy-MM-dd'T'HH:mm'Z'")
-    df.timeZone = TimeZone.getTimeZone("UTC")
-    return df.format(Date())
-}
-
-fun runCommand(command: String): String {
-    val byteOut = ByteArrayOutputStream()
-    project.exec {
-        commandLine = command.split(" ")
-        standardOutput = byteOut
-    }
-    return String(byteOut.toByteArray()).trim()
-}

app/proguard-rules.pro

@@ -12,6 +12,7 @@
 -keep,allowoptimization class com.google.gson.** { public protected *; }
 -keep,allowoptimization class com.github.salomonbrys.kotson.** { public protected *; }
 -keep,allowoptimization class com.squareup.duktape.** { public protected *; }
+-keep,allowoptimization class app.cash.quickjs.** { public protected *; }
 -keep,allowoptimization class uy.kohesive.injekt.** { public protected *; }
 
 ##---------------Begin: proguard configuration for RxJava 1.x  ----------

app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@android:color/transparent"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_tachi_monochrome_launcher" />
 </adaptive-icon>

app/src/main/AndroidManifest.xml

@@ -18,6 +18,7 @@
     <!-- For managing extensions -->
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
+    <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" />
     <!-- To view extension packages in API 30+ -->
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
 
@@ -25,7 +26,6 @@
         android:name=".App"
         android:allowBackup="false"
         android:hardwareAccelerated="true"
-        android:hasFragileUserData="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="true"
@@ -177,17 +177,16 @@
             android:exported="false" />
 
         <service
-            android:name=".data.updater.UpdaterService"
+            android:name=".data.updater.AppUpdateService"
-            android:exported="false" />
-
-        <service
-            android:name=".data.backup.BackupCreateService"
             android:exported="false" />
 
         <service
             android:name=".data.backup.BackupRestoreService"
             android:exported="false" />
 
+        <service android:name=".extension.util.ExtensionInstallService"
+            android:exported="false" />
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
@@ -198,6 +197,14 @@
                 android:resource="@xml/provider_paths" />
         </provider>
 
+        <provider
+            android:name="rikka.shizuku.ShizukuProvider"
+            android:authorities="${applicationId}.shizuku"
+            android:multiprocess="false"
+            android:enabled="true"
+            android:exported="true"
+            android:permission="android.permission.INTERACT_ACROSS_USERS_FULL" />
+
         <meta-data android:name="android.webkit.WebView.EnableSafeBrowsing"
             android:value="false" />
         <meta-data android:name="android.webkit.WebView.MetricsOptOut"

app/src/main/java/eu/kanade/tachiyomi/App.kt

@@ -1,5 +1,6 @@
 package eu.kanade.tachiyomi
 
+import android.annotation.SuppressLint
 import android.app.ActivityManager
 import android.app.Application
 import android.app.PendingIntent
@@ -8,52 +9,58 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.os.Build
+import android.os.Looper
 import android.webkit.WebView
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.getSystemService
-import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.OnLifecycleEvent
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import coil.ImageLoader
 import coil.ImageLoaderFactory
 import coil.decode.GifDecoder
 import coil.decode.ImageDecoderDecoder
-import eu.kanade.tachiyomi.data.coil.ByteBufferFetcher
+import coil.disk.DiskCache
+import coil.util.DebugLogger
 import eu.kanade.tachiyomi.data.coil.MangaCoverFetcher
+import eu.kanade.tachiyomi.data.coil.MangaCoverKeyer
 import eu.kanade.tachiyomi.data.coil.TachiyomiImageDecoder
 import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.data.preference.PreferenceValues
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.data.preference.asImmediateFlow
 import eu.kanade.tachiyomi.network.NetworkHelper
-import eu.kanade.tachiyomi.ui.security.SecureActivityDelegate
+import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegate
+import eu.kanade.tachiyomi.util.preference.asImmediateFlow
 import eu.kanade.tachiyomi.util.system.AuthenticatorUtil
+import eu.kanade.tachiyomi.util.system.WebViewUtil
 import eu.kanade.tachiyomi.util.system.animatorDurationScale
+import eu.kanade.tachiyomi.util.system.logcat
 import eu.kanade.tachiyomi.util.system.notification
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import logcat.AndroidLogcatLogger
+import logcat.LogPriority
+import logcat.LogcatLogger
 import org.acra.config.httpSender
 import org.acra.ktx.initAcra
 import org.acra.sender.HttpSender
 import org.conscrypt.Conscrypt
-import timber.log.Timber
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.security.Security
 
-open class App : Application(), LifecycleObserver, ImageLoaderFactory {
+open class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory {
 
     private val preferences: PreferencesHelper by injectLazy()
 
     private val disableIncognitoReceiver = DisableIncognitoReceiver()
 
+    @SuppressLint("LaunchActivityFromNotification")
     override fun onCreate() {
-        super.onCreate()
+        super<Application>.onCreate()
-        if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree())
 
         // TLS 1.3 support for Android < 10
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
@@ -89,7 +96,7 @@ open class App : Application(), LifecycleObserver, ImageLoaderFactory {
                             this@App,
                             0,
                             Intent(ACTION_DISABLE_INCOGNITO_MODE),
-                            PendingIntent.FLAG_ONE_SHOT
+                            PendingIntent.FLAG_ONE_SHOT,
                         )
                         setContentIntent(pendingIntent)
                     }
@@ -108,42 +115,69 @@ open class App : Application(), LifecycleObserver, ImageLoaderFactory {
                         PreferenceValues.ThemeMode.light -> AppCompatDelegate.MODE_NIGHT_NO
                         PreferenceValues.ThemeMode.dark -> AppCompatDelegate.MODE_NIGHT_YES
                         PreferenceValues.ThemeMode.system -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
-                    }
+                    },
                 )
             }.launchIn(ProcessLifecycleOwner.get().lifecycleScope)
+
+        if (!LogcatLogger.isInstalled && preferences.verboseLogging()) {
+            LogcatLogger.install(AndroidLogcatLogger(LogPriority.VERBOSE))
+        }
     }
 
     override fun newImageLoader(): ImageLoader {
         return ImageLoader.Builder(this).apply {
-            componentRegistry {
+            val callFactoryInit = { Injekt.get<NetworkHelper>().client }
+            val diskCacheInit = { CoilDiskCache.get(this@App) }
+            components {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-                    add(ImageDecoderDecoder(this@App))
+                    add(ImageDecoderDecoder.Factory())
                 } else {
-                    add(GifDecoder())
+                    add(GifDecoder.Factory())
                 }
-                add(TachiyomiImageDecoder(this@App.resources))
+                add(TachiyomiImageDecoder.Factory())
-                add(ByteBufferFetcher())
+                add(MangaCoverFetcher.Factory(lazy(callFactoryInit), lazy(diskCacheInit)))
-                add(MangaCoverFetcher())
+                add(MangaCoverKeyer())
             }
-            okHttpClient(Injekt.get<NetworkHelper>().coilClient)
+            callFactory(callFactoryInit)
+            diskCache(diskCacheInit)
             crossfade((300 * this@App.animatorDurationScale).toInt())
             allowRgb565(getSystemService<ActivityManager>()!!.isLowRamDevice)
+            if (preferences.verboseLogging()) logger(DebugLogger())
         }.build()
     }
 
-    @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
+    override fun onStop(owner: LifecycleOwner) {
-    @Suppress("unused")
-    fun onAppBackgrounded() {
         if (!AuthenticatorUtil.isAuthenticating && preferences.lockAppAfter().get() >= 0) {
             SecureActivityDelegate.locked = true
         }
     }
 
+    override fun getPackageName(): String {
+        // This causes freezes in Android 6/7 for some reason
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            try {
+                // Override the value passed as X-Requested-With in WebView requests
+                val stackTrace = Looper.getMainLooper().thread.stackTrace
+                val chromiumElement = stackTrace.find {
+                    it.className.equals(
+                        "org.chromium.base.BuildInfo",
+                        ignoreCase = true,
+                    )
+                }
+                if (chromiumElement?.methodName.equals("getAll", ignoreCase = true)) {
+                    return WebViewUtil.SPOOF_PACKAGE_NAME
+                }
+            } catch (e: Exception) {
+            }
+        }
+        return super.getPackageName()
+    }
+
     protected open fun setupAcra() {
         if (BuildConfig.FLAVOR != "dev") {
             initAcra {
                 buildConfigClass = BuildConfig::class.java
-                excludeMatchingSharedPreferencesKeys = arrayOf(".*username.*", ".*password.*", ".*token.*")
+                excludeMatchingSharedPreferencesKeys = listOf(".*username.*", ".*password.*", ".*token.*")
 
                 httpSender {
                     uri = BuildConfig.ACRA_URI
@@ -154,7 +188,11 @@ open class App : Application(), LifecycleObserver, ImageLoaderFactory {
     }
 
     protected open fun setupNotificationChannels() {
-        Notifications.createChannels(this)
+        try {
+            Notifications.createChannels(this)
+        } catch (e: Exception) {
+            logcat(LogPriority.ERROR, e) { "Failed to modify notification channels" }
+        }
     }
 
     private inner class DisableIncognitoReceiver : BroadcastReceiver() {
@@ -181,3 +219,24 @@ open class App : Application(), LifecycleObserver, ImageLoaderFactory {
 }
 
 private const val ACTION_DISABLE_INCOGNITO_MODE = "tachi.action.DISABLE_INCOGNITO_MODE"
+
+/**
+ * Direct copy of Coil's internal SingletonDiskCache so that [MangaCoverFetcher] can access it.
+ */
+internal object CoilDiskCache {
+
+    private const val FOLDER_NAME = "image_cache"
+    private var instance: DiskCache? = null
+
+    @Synchronized
+    fun get(context: Context): DiskCache {
+        return instance ?: run {
+            val safeCacheDir = context.cacheDir.apply { mkdirs() }
+            // Create the singleton disk cache instance.
+            DiskCache.Builder()
+                .directory(safeCacheDir.resolve(FOLDER_NAME))
+                .build()
+                .also { instance = it }
+        }
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/AppInfo.kt

@@ -0,0 +1,11 @@
+package eu.kanade.tachiyomi
+
+/**
+ * Used by extensions.
+ *
+ * @since extension-lib 1.3
+ */
+object AppInfo {
+    fun getVersionCode() = BuildConfig.VERSION_CODE
+    fun getVersionName() = BuildConfig.VERSION_NAME
+}

app/src/main/java/eu/kanade/tachiyomi/AppModule.kt

@@ -7,6 +7,7 @@ import eu.kanade.tachiyomi.data.cache.CoverCache
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.download.DownloadManager
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.data.saver.ImageSaver
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.data.track.job.DelayedTrackingStore
 import eu.kanade.tachiyomi.extension.ExtensionManager
@@ -46,6 +47,8 @@ class AppModule(val app: Application) : InjektModule {
 
         addSingletonFactory { DelayedTrackingStore(app) }
 
+        addSingletonFactory { ImageSaver(app) }
+
         // Asynchronously init expensive components for a faster cold start
         ContextCompat.getMainExecutor(app).execute {
             get<PreferencesHelper>()

app/src/main/java/eu/kanade/tachiyomi/Migrations.kt

@@ -5,16 +5,21 @@ import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import eu.kanade.tachiyomi.data.backup.BackupCreatorJob
 import eu.kanade.tachiyomi.data.library.LibraryUpdateJob
+import eu.kanade.tachiyomi.data.preference.MANGA_NON_COMPLETED
 import eu.kanade.tachiyomi.data.preference.PreferenceKeys
+import eu.kanade.tachiyomi.data.preference.PreferenceValues
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.track.TrackManager
-import eu.kanade.tachiyomi.data.updater.UpdaterJob
+import eu.kanade.tachiyomi.data.updater.AppUpdateJob
 import eu.kanade.tachiyomi.extension.ExtensionUpdateJob
 import eu.kanade.tachiyomi.network.PREF_DOH_CLOUDFLARE
 import eu.kanade.tachiyomi.ui.library.LibrarySort
 import eu.kanade.tachiyomi.ui.library.setting.SortDirectionSetting
 import eu.kanade.tachiyomi.ui.library.setting.SortModeSetting
 import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
+import eu.kanade.tachiyomi.util.preference.minusAssign
+import eu.kanade.tachiyomi.util.preference.plusAssign
+import eu.kanade.tachiyomi.util.system.DeviceUtil
 import eu.kanade.tachiyomi.util.system.toast
 import eu.kanade.tachiyomi.widget.ExtendedNavigationView
 import uy.kohesive.injekt.Injekt
@@ -38,7 +43,7 @@ object Migrations {
 
             // Always set up background tasks to ensure they're running
             if (BuildConfig.INCLUDE_UPDATER) {
-                UpdaterJob.setupTask(context)
+                AppUpdateJob.setupTask(context)
             }
             ExtensionUpdateJob.setupTask(context)
             LibraryUpdateJob.setupTask(context)
@@ -49,10 +54,12 @@ object Migrations {
                 return false
             }
 
+            val prefs = PreferenceManager.getDefaultSharedPreferences(context)
+
             if (oldVersion < 14) {
                 // Restore jobs after upgrading to Evernote's job scheduler.
                 if (BuildConfig.INCLUDE_UPDATER) {
-                    UpdaterJob.setupTask(context)
+                    AppUpdateJob.setupTask(context)
                 }
                 LibraryUpdateJob.setupTask(context)
             }
@@ -85,7 +92,7 @@ object Migrations {
             if (oldVersion < 43) {
                 // Restore jobs after migrating from Evernote's job scheduler to WorkManager.
                 if (BuildConfig.INCLUDE_UPDATER) {
-                    UpdaterJob.setupTask(context)
+                    AppUpdateJob.setupTask(context)
                 }
                 LibraryUpdateJob.setupTask(context)
                 BackupCreatorJob.setupTask(context)
@@ -95,8 +102,6 @@ object Migrations {
             }
             if (oldVersion < 44) {
                 // Reset sorting preference if using removed sort by source
-                val prefs = PreferenceManager.getDefaultSharedPreferences(context)
-
                 val oldSortingMode = prefs.getInt(PreferenceKeys.librarySortingMode, 0)
 
                 @Suppress("DEPRECATION")
@@ -108,7 +113,6 @@ object Migrations {
             }
             if (oldVersion < 52) {
                 // Migrate library filters to tri-state versions
-                val prefs = PreferenceManager.getDefaultSharedPreferences(context)
                 fun convertBooleanPrefToTriState(key: String): Int {
                     val oldPrefValue = prefs.getBoolean(key, false)
                     return if (oldPrefValue) ExtendedNavigationView.Item.TriStateGroup.State.INCLUDE.value
@@ -137,7 +141,6 @@ object Migrations {
             }
             if (oldVersion < 57) {
                 // Migrate DNS over HTTPS setting
-                val prefs = PreferenceManager.getDefaultSharedPreferences(context)
                 val wasDohEnabled = prefs.getBoolean("enable_doh", false)
                 if (wasDohEnabled) {
                     prefs.edit {
@@ -148,7 +151,6 @@ object Migrations {
             }
             if (oldVersion < 59) {
                 // Reset rotation to Free after replacing Lock
-                val prefs = PreferenceManager.getDefaultSharedPreferences(context)
                 if (prefs.contains("pref_rotation_type_key")) {
                     prefs.edit {
                         putInt("pref_rotation_type_key", 1)
@@ -157,17 +159,16 @@ object Migrations {
 
                 // Disable update check for Android 5.x users
                 if (BuildConfig.INCLUDE_UPDATER && Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
-                    UpdaterJob.cancelTask(context)
+                    AppUpdateJob.cancelTask(context)
                 }
             }
             if (oldVersion < 60) {
                 // Re-enable update check that was prevously accidentally disabled for M
                 if (BuildConfig.INCLUDE_UPDATER && Build.VERSION.SDK_INT == Build.VERSION_CODES.M) {
-                    UpdaterJob.setupTask(context)
+                    AppUpdateJob.setupTask(context)
                 }
 
                 // Migrate Rotation and Viewer values to default values for viewer_flags
-                val prefs = PreferenceManager.getDefaultSharedPreferences(context)
                 val newOrientation = when (prefs.getInt("pref_rotation_type_key", 1)) {
                     1 -> OrientationType.FREE.flagValue
                     2 -> OrientationType.PORTRAIT.flagValue
@@ -196,8 +197,6 @@ object Migrations {
                 }
             }
             if (oldVersion < 64) {
-                val prefs = PreferenceManager.getDefaultSharedPreferences(context)
-
                 val oldSortingMode = prefs.getInt(PreferenceKeys.librarySortingMode, 0)
                 val oldSortingDirection = prefs.getBoolean(PreferenceKeys.librarySortingDirection, true)
 
@@ -229,6 +228,44 @@ object Migrations {
                     putString(PreferenceKeys.librarySortingDirection, newSortingDirection.name)
                 }
             }
+            if (oldVersion < 70) {
+                if (preferences.enabledLanguages().isSet()) {
+                    preferences.enabledLanguages() += "all"
+                }
+            }
+            if (oldVersion < 71) {
+                // Handle removed every 3, 4, 6, and 8 hour library updates
+                val updateInterval = preferences.libraryUpdateInterval().get()
+                if (updateInterval in listOf(3, 4, 6, 8)) {
+                    preferences.libraryUpdateInterval().set(12)
+                    LibraryUpdateJob.setupTask(context, 12)
+                }
+            }
+            if (oldVersion < 72) {
+                val oldUpdateOngoingOnly = prefs.getBoolean("pref_update_only_non_completed_key", true)
+                if (!oldUpdateOngoingOnly) {
+                    preferences.libraryUpdateMangaRestriction() -= MANGA_NON_COMPLETED
+                }
+            }
+            if (oldVersion < 75) {
+                val oldSecureScreen = prefs.getBoolean("secure_screen", false)
+                if (oldSecureScreen) {
+                    preferences.secureScreen().set(PreferenceValues.SecureScreenMode.ALWAYS)
+                }
+                if (DeviceUtil.isMiui && preferences.extensionInstaller().get() == PreferenceValues.ExtensionInstaller.PACKAGEINSTALLER) {
+                    preferences.extensionInstaller().set(PreferenceValues.ExtensionInstaller.LEGACY)
+                }
+            }
+            if (oldVersion < 76) {
+                BackupCreatorJob.setupTask(context)
+            }
+            if (oldVersion < 77) {
+                val oldReaderTap = prefs.getBoolean("reader_tap", false)
+                if (!oldReaderTap) {
+                    preferences.navigationModePager().set(5)
+                    preferences.navigationModeWebtoon().set(5)
+                }
+            }
 
             return true
         }

app/src/main/java/eu/kanade/tachiyomi/annotations/Nsfw.kt

@@ -1,5 +0,0 @@
-package eu.kanade.tachiyomi.annotations
-
-@Retention(AnnotationRetention.RUNTIME)
-@Target(AnnotationTarget.CLASS)
-annotation class Nsfw

app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupManager.kt

@@ -21,7 +21,7 @@ abstract class AbstractBackupManager(protected val context: Context) {
     internal val trackManager: TrackManager by injectLazy()
     protected val preferences: PreferencesHelper by injectLazy()
 
-    abstract fun createBackup(uri: Uri, flags: Int, isJob: Boolean): String?
+    abstract fun createBackup(uri: Uri, flags: Int, isAutoBackup: Boolean): String
 
     /**
      * Returns manga

app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt

@@ -112,7 +112,7 @@ abstract class AbstractBackupRestore<T : AbstractBackupManager>(protected val co
     internal fun showRestoreProgress(
         progress: Int,
         amount: Int,
-        title: String
+        title: String,
     ) {
         notifier.showRestoreProgress(title, progress, amount)
     }

app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestoreValidator.kt

@@ -14,3 +14,5 @@ abstract class AbstractBackupRestoreValidator {
 
     data class Results(val missingSources: List<String>, val missingTrackers: List<String>)
 }
+
+class ValidatorParseException(e: Exception) : RuntimeException(e)

app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupConst.kt

@@ -11,4 +11,15 @@ object BackupConst {
 
     const val BACKUP_TYPE_LEGACY = 0
     const val BACKUP_TYPE_FULL = 1
+
+    // Filter options
+    internal const val BACKUP_CATEGORY = 0x1
+    internal const val BACKUP_CATEGORY_MASK = 0x1
+    internal const val BACKUP_CHAPTER = 0x2
+    internal const val BACKUP_CHAPTER_MASK = 0x2
+    internal const val BACKUP_HISTORY = 0x4
+    internal const val BACKUP_HISTORY_MASK = 0x4
+    internal const val BACKUP_TRACK = 0x8
+    internal const val BACKUP_TRACK_MASK = 0x8
+    internal const val BACKUP_ALL = 0xF
 }

app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreateService.kt

@@ -1,114 +0,0 @@
-package eu.kanade.tachiyomi.data.backup
-
-import android.app.Service
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.os.IBinder
-import android.os.PowerManager
-import androidx.core.content.ContextCompat
-import androidx.core.net.toUri
-import com.hippo.unifile.UniFile
-import eu.kanade.tachiyomi.data.backup.full.FullBackupManager
-import eu.kanade.tachiyomi.data.notification.Notifications
-import eu.kanade.tachiyomi.util.system.acquireWakeLock
-import eu.kanade.tachiyomi.util.system.isServiceRunning
-
-/**
- * Service for backing up library information to a JSON file.
- */
-class BackupCreateService : Service() {
-
-    companion object {
-        // Filter options
-        internal const val BACKUP_CATEGORY = 0x1
-        internal const val BACKUP_CATEGORY_MASK = 0x1
-        internal const val BACKUP_CHAPTER = 0x2
-        internal const val BACKUP_CHAPTER_MASK = 0x2
-        internal const val BACKUP_HISTORY = 0x4
-        internal const val BACKUP_HISTORY_MASK = 0x4
-        internal const val BACKUP_TRACK = 0x8
-        internal const val BACKUP_TRACK_MASK = 0x8
-        internal const val BACKUP_ALL = 0xF
-
-        /**
-         * Returns the status of the service.
-         *
-         * @param context the application context.
-         * @return true if the service is running, false otherwise.
-         */
-        fun isRunning(context: Context): Boolean =
-            context.isServiceRunning(BackupCreateService::class.java)
-
-        /**
-         * Make a backup from library
-         *
-         * @param context context of application
-         * @param uri path of Uri
-         * @param flags determines what to backup
-         */
-        fun start(context: Context, uri: Uri, flags: Int) {
-            if (!isRunning(context)) {
-                val intent = Intent(context, BackupCreateService::class.java).apply {
-                    putExtra(BackupConst.EXTRA_URI, uri)
-                    putExtra(BackupConst.EXTRA_FLAGS, flags)
-                }
-                ContextCompat.startForegroundService(context, intent)
-            }
-        }
-    }
-
-    /**
-     * Wake lock that will be held until the service is destroyed.
-     */
-    private lateinit var wakeLock: PowerManager.WakeLock
-
-    private lateinit var notifier: BackupNotifier
-
-    override fun onCreate() {
-        super.onCreate()
-
-        notifier = BackupNotifier(this)
-        wakeLock = acquireWakeLock(javaClass.name)
-
-        startForeground(Notifications.ID_BACKUP_PROGRESS, notifier.showBackupProgress().build())
-    }
-
-    override fun stopService(name: Intent?): Boolean {
-        destroyJob()
-        return super.stopService(name)
-    }
-
-    override fun onDestroy() {
-        destroyJob()
-        super.onDestroy()
-    }
-
-    private fun destroyJob() {
-        if (wakeLock.isHeld) {
-            wakeLock.release()
-        }
-    }
-
-    /**
-     * This method needs to be implemented, but it's not used/needed.
-     */
-    override fun onBind(intent: Intent): IBinder? = null
-
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        if (intent == null) return START_NOT_STICKY
-
-        try {
-            val uri = intent.getParcelableExtra<Uri>(BackupConst.EXTRA_URI)!!
-            val backupFlags = intent.getIntExtra(BackupConst.EXTRA_FLAGS, 0)
-            val backupFileUri = FullBackupManager(this).createBackup(uri, backupFlags, false)?.toUri()
-            val unifile = UniFile.fromUri(this, backupFileUri)
-            notifier.showBackupComplete(unifile)
-        } catch (e: Exception) {
-            notifier.showBackupError(e.message)
-        }
-
-        stopSelf(startId)
-        return START_NOT_STICKY
-    }
-}

app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreatorJob.kt

@@ -1,14 +1,24 @@
 package eu.kanade.tachiyomi.data.backup
 
 import android.content.Context
+import android.net.Uri
 import androidx.core.net.toUri
 import androidx.work.ExistingPeriodicWorkPolicy
+import androidx.work.ExistingWorkPolicy
+import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.PeriodicWorkRequestBuilder
+import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import androidx.work.Worker
 import androidx.work.WorkerParameters
+import androidx.work.workDataOf
+import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.data.backup.full.FullBackupManager
+import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.util.system.logcat
+import eu.kanade.tachiyomi.util.system.notificationManager
+import logcat.LogPriority
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.util.concurrent.TimeUnit
@@ -18,36 +28,71 @@ class BackupCreatorJob(private val context: Context, workerParams: WorkerParamet
 
     override fun doWork(): Result {
         val preferences = Injekt.get<PreferencesHelper>()
-        val uri = preferences.backupsDirectory().get().toUri()
+        val notifier = BackupNotifier(context)
-        val flags = BackupCreateService.BACKUP_ALL
+        val uri = inputData.getString(LOCATION_URI_KEY)?.let { Uri.parse(it) }
+            ?: preferences.backupsDirectory().get().toUri()
+        val flags = inputData.getInt(BACKUP_FLAGS_KEY, BackupConst.BACKUP_ALL)
+        val isAutoBackup = inputData.getBoolean(IS_AUTO_BACKUP_KEY, true)
+
+        context.notificationManager.notify(Notifications.ID_BACKUP_PROGRESS, notifier.showBackupProgress().build())
         return try {
-            FullBackupManager(context).createBackup(uri, flags, true)
+            val location = FullBackupManager(context).createBackup(uri, flags, isAutoBackup)
+            if (!isAutoBackup) notifier.showBackupComplete(UniFile.fromUri(context, location.toUri()))
             Result.success()
         } catch (e: Exception) {
+            logcat(LogPriority.ERROR, e)
+            if (!isAutoBackup) notifier.showBackupError(e.message)
             Result.failure()
+        } finally {
+            context.notificationManager.cancel(Notifications.ID_BACKUP_PROGRESS)
         }
     }
 
     companion object {
-        private const val TAG = "BackupCreator"
+        fun isManualJobRunning(context: Context): Boolean {
+            val list = WorkManager.getInstance(context).getWorkInfosByTag(TAG_MANUAL).get()
+            return list.find { it.state == WorkInfo.State.RUNNING } != null
+        }
 
         fun setupTask(context: Context, prefInterval: Int? = null) {
             val preferences = Injekt.get<PreferencesHelper>()
             val interval = prefInterval ?: preferences.backupInterval().get()
+            val workManager = WorkManager.getInstance(context)
             if (interval > 0) {
                 val request = PeriodicWorkRequestBuilder<BackupCreatorJob>(
                     interval.toLong(),
                     TimeUnit.HOURS,
                     10,
-                    TimeUnit.MINUTES
+                    TimeUnit.MINUTES,
                 )
-                    .addTag(TAG)
+                    .addTag(TAG_AUTO)
+                    .setInputData(workDataOf(IS_AUTO_BACKUP_KEY to true))
                     .build()
 
-                WorkManager.getInstance(context).enqueueUniquePeriodicWork(TAG, ExistingPeriodicWorkPolicy.REPLACE, request)
+                workManager.enqueueUniquePeriodicWork(TAG_AUTO, ExistingPeriodicWorkPolicy.REPLACE, request)
             } else {
-                WorkManager.getInstance(context).cancelAllWorkByTag(TAG)
+                workManager.cancelUniqueWork(TAG_AUTO)
             }
         }
+
+        fun startNow(context: Context, uri: Uri, flags: Int) {
+            val inputData = workDataOf(
+                IS_AUTO_BACKUP_KEY to false,
+                LOCATION_URI_KEY to uri.toString(),
+                BACKUP_FLAGS_KEY to flags,
+            )
+            val request = OneTimeWorkRequestBuilder<BackupCreatorJob>()
+                .addTag(TAG_MANUAL)
+                .setInputData(inputData)
+                .build()
+            WorkManager.getInstance(context).enqueueUniqueWork(TAG_MANUAL, ExistingWorkPolicy.KEEP, request)
+        }
     }
 }
+
+private const val TAG_AUTO = "BackupCreator"
+private const val TAG_MANUAL = "$TAG_AUTO:manual"
+
+private const val IS_AUTO_BACKUP_KEY = "is_auto_backup" // Boolean
+private const val LOCATION_URI_KEY = "location_uri" // String
+private const val BACKUP_FLAGS_KEY = "backup_flags" // Int

app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt

@@ -73,7 +73,7 @@ class BackupNotifier(private val context: Context) {
             addAction(
                 R.drawable.ic_share_24dp,
                 context.getString(R.string.action_share),
-                NotificationReceiver.shareBackupPendingBroadcast(context, unifile.uri, Notifications.ID_BACKUP_COMPLETE)
+                NotificationReceiver.shareBackupPendingBroadcast(context, unifile.uri, Notifications.ID_BACKUP_COMPLETE),
             )
 
             show(Notifications.ID_BACKUP_COMPLETE)
@@ -97,7 +97,7 @@ class BackupNotifier(private val context: Context) {
             addAction(
                 R.drawable.ic_close_24dp,
                 context.getString(R.string.action_stop),
-                NotificationReceiver.cancelRestorePendingBroadcast(context, Notifications.ID_RESTORE_PROGRESS)
+                NotificationReceiver.cancelRestorePendingBroadcast(context, Notifications.ID_RESTORE_PROGRESS),
             )
         }
 
@@ -124,8 +124,8 @@ class BackupNotifier(private val context: Context) {
             R.string.restore_duration,
             TimeUnit.MILLISECONDS.toMinutes(time),
             TimeUnit.MILLISECONDS.toSeconds(time) - TimeUnit.MINUTES.toSeconds(
-                TimeUnit.MILLISECONDS.toMinutes(time)
+                TimeUnit.MILLISECONDS.toMinutes(time),
-            )
+            ),
         )
 
         with(completeNotificationBuilder) {
@@ -139,10 +139,12 @@ class BackupNotifier(private val context: Context) {
                 val destFile = File(path, file)
                 val uri = destFile.getUriCompat(context)
 
+                val errorLogIntent = NotificationReceiver.openErrorLogPendingActivity(context, uri)
+                setContentIntent(errorLogIntent)
                 addAction(
                     R.drawable.ic_folder_24dp,
                     context.getString(R.string.action_show_errors),
-                    NotificationReceiver.openErrorLogPendingActivity(context, uri)
+                    errorLogIntent,
                 )
             }
 

app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt

@@ -13,13 +13,14 @@ import eu.kanade.tachiyomi.data.backup.legacy.LegacyBackupRestore
 import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.util.system.acquireWakeLock
 import eu.kanade.tachiyomi.util.system.isServiceRunning
+import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
-import timber.log.Timber
+import logcat.LogPriority
 
 /**
  * Restores backup.
@@ -128,7 +129,7 @@ class BackupRestoreService : Service() {
         }
 
         val handler = CoroutineExceptionHandler { _, exception ->
-            Timber.e(exception)
+            logcat(LogPriority.ERROR, exception)
             backupRestore?.writeErrorLog()
 
             notifier.showRestoreError(exception.message)

app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt

@@ -4,14 +4,14 @@ import android.content.Context
 import android.net.Uri
 import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.data.backup.AbstractBackupManager
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CATEGORY
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_CATEGORY
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CATEGORY_MASK
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_CATEGORY_MASK
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CHAPTER
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_CHAPTER
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CHAPTER_MASK
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_CHAPTER_MASK
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_HISTORY
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_HISTORY
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_HISTORY_MASK
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_HISTORY_MASK
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_TRACK
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_TRACK
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_TRACK_MASK
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_TRACK_MASK
 import eu.kanade.tachiyomi.data.backup.full.models.Backup
 import eu.kanade.tachiyomi.data.backup.full.models.BackupCategory
 import eu.kanade.tachiyomi.data.backup.full.models.BackupChapter
@@ -26,11 +26,13 @@ import eu.kanade.tachiyomi.data.database.models.History
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.database.models.MangaCategory
 import eu.kanade.tachiyomi.data.database.models.Track
+import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.serialization.protobuf.ProtoBuf
+import logcat.LogPriority
 import okio.buffer
 import okio.gzip
 import okio.sink
-import timber.log.Timber
+import java.io.FileOutputStream
 import kotlin.math.max
 
 class FullBackupManager(context: Context) : AbstractBackupManager(context) {
@@ -41,9 +43,9 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
      * Create backup Json file from database
      *
      * @param uri path of Uri
-     * @param isJob backup called from job
+     * @param isAutoBackup backup called from scheduled backup job
      */
-    override fun createBackup(uri: Uri, flags: Int, isJob: Boolean): String? {
+    override fun createBackup(uri: Uri, flags: Int, isAutoBackup: Boolean): String {
         // Create root object
         var backup: Backup? = null
 
@@ -54,13 +56,14 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
                 backupManga(databaseManga, flags),
                 backupCategories(),
                 emptyList(),
-                backupExtensionInfo(databaseManga)
+                backupExtensionInfo(databaseManga),
             )
         }
 
+        var file: UniFile? = null
         try {
-            val file: UniFile = (
+            file = (
-                if (isJob) {
+                if (isAutoBackup) {
                     // Get dir of file and create
                     var dir = UniFile.fromUri(context, uri)
                     dir = dir.createDirectory("automatic")
@@ -82,11 +85,24 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
                 )
                 ?: throw Exception("Couldn't create backup file")
 
+            if (!file.isFile) {
+                throw IllegalStateException("Failed to get handle on file")
+            }
+
             val byteArray = parser.encodeToByteArray(BackupSerializer, backup!!)
-            file.openOutputStream().sink().gzip().buffer().use { it.write(byteArray) }
+            file.openOutputStream().also {
-            return file.uri.toString()
+                // Force overwrite old file
+                (it as? FileOutputStream)?.channel?.truncate(0)
+            }.sink().gzip().buffer().use { it.write(byteArray) }
+            val fileUri = file.uri
+
+            // Make sure it's a valid backup file
+            FullBackupRestoreValidator().validate(context, fileUri)
+
+            return fileUri.toString()
         } catch (e: Exception) {
-            Timber.e(e)
+            logcat(LogPriority.ERROR, e)
+            file?.delete()
             throw e
         }
     }

app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt

@@ -93,7 +93,7 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBa
         categories: List<Int>,
         history: List<BackupHistory>,
         tracks: List<Track>,
-        backupCategories: List<BackupCategory>
+        backupCategories: List<BackupCategory>,
     ) {
         db.inTransaction {
             val dbManga = backupManager.getMangaFromDatabase(manga)
@@ -123,7 +123,7 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBa
         categories: List<Int>,
         history: List<BackupHistory>,
         tracks: List<Track>,
-        backupCategories: List<BackupCategory>
+        backupCategories: List<BackupCategory>,
     ) {
         try {
             val fetchedManga = backupManager.restoreManga(manga)
@@ -143,7 +143,7 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBa
         categories: List<Int>,
         history: List<BackupHistory>,
         tracks: List<Track>,
-        backupCategories: List<BackupCategory>
+        backupCategories: List<BackupCategory>,
     ) {
         backupManager.restoreChaptersForManga(backupManga, chapters)
 

app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestoreValidator.kt

@@ -4,12 +4,14 @@ import android.content.Context
 import android.net.Uri
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.backup.AbstractBackupRestoreValidator
+import eu.kanade.tachiyomi.data.backup.ValidatorParseException
 import eu.kanade.tachiyomi.data.backup.full.models.BackupSerializer
 import okio.buffer
 import okio.gzip
 import okio.source
 
 class FullBackupRestoreValidator : AbstractBackupRestoreValidator() {
+
     /**
      * Checks for critical backup file data.
      *
@@ -19,14 +21,20 @@ class FullBackupRestoreValidator : AbstractBackupRestoreValidator() {
     override fun validate(context: Context, uri: Uri): Results {
         val backupManager = FullBackupManager(context)
 
-        val backupString = context.contentResolver.openInputStream(uri)!!.source().gzip().buffer().use { it.readByteArray() }
+        val backup = try {
-        val backup = backupManager.parser.decodeFromByteArray(BackupSerializer, backupString)
+            val backupString =
+                context.contentResolver.openInputStream(uri)!!.source().gzip().buffer()
+                    .use { it.readByteArray() }
+            backupManager.parser.decodeFromByteArray(BackupSerializer, backupString)
+        } catch (e: Exception) {
+            throw ValidatorParseException(e)
+        }
 
         if (backup.backupManga.isEmpty()) {
             throw Exception(context.getString(R.string.invalid_backup_file_missing_manga))
         }
 
-        val sources = backup.backupSources.map { it.sourceId to it.name }.toMap()
+        val sources = backup.backupSources.associate { it.sourceId to it.name }
         val missingSources = sources
             .filter { sourceManager.get(it.key) == null }
             .values

app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/Backup.kt

@@ -9,5 +9,5 @@ data class Backup(
     @ProtoNumber(2) var backupCategories: List<BackupCategory> = emptyList(),
     // Bump by 100 to specify this is a 0.x value
     @ProtoNumber(100) var backupBrokenSources: List<BrokenBackupSource> = emptyList(),
-    @ProtoNumber(101) var backupSources: List<BackupSource> = emptyList()
+    @ProtoNumber(101) var backupSources: List<BackupSource> = emptyList(),
 )

app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupCategory.kt

@@ -26,7 +26,7 @@ class BackupCategory(
             return BackupCategory(
                 name = category.name,
                 order = category.order,
-                flags = category.flags
+                flags = category.flags,
             )
         }
     }

app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupChapter.kt

@@ -49,7 +49,7 @@ data class BackupChapter(
                 lastPageRead = chapter.last_page_read,
                 dateFetch = chapter.date_fetch,
                 dateUpload = chapter.date_upload,
-                sourceOrder = chapter.source_order
+                sourceOrder = chapter.source_order,
             )
         }
     }

app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupHistory.kt

@@ -6,11 +6,11 @@ import kotlinx.serialization.protobuf.ProtoNumber
 @Serializable
 data class BrokenBackupHistory(
     @ProtoNumber(0) var url: String,
-    @ProtoNumber(1) var lastRead: Long
+    @ProtoNumber(1) var lastRead: Long,
 )
 
 @Serializable
 data class BackupHistory(
     @ProtoNumber(1) var url: String,
-    @ProtoNumber(2) var lastRead: Long
+    @ProtoNumber(2) var lastRead: Long,
 )

app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupManga.kt

@@ -35,7 +35,7 @@ data class BackupManga(
     @ProtoNumber(101) var chapterFlags: Int = 0,
     @ProtoNumber(102) var brokenHistory: List<BrokenBackupHistory> = emptyList(),
     @ProtoNumber(103) var viewer_flags: Int? = null,
-    @ProtoNumber(104) var history: List<BackupHistory> = emptyList()
+    @ProtoNumber(104) var history: List<BackupHistory> = emptyList(),
 ) {
     fun getMangaImpl(): MangaImpl {
         return MangaImpl().apply {
@@ -83,7 +83,7 @@ data class BackupManga(
                 dateAdded = manga.date_added,
                 viewer = manga.readingModeType,
                 viewer_flags = manga.viewer_flags,
-                chapterFlags = manga.chapter_flags
+                chapterFlags = manga.chapter_flags,
             )
         }
     }

app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupSource.kt

@@ -7,19 +7,19 @@ import kotlinx.serialization.protobuf.ProtoNumber
 @Serializable
 data class BrokenBackupSource(
     @ProtoNumber(0) var name: String = "",
-    @ProtoNumber(1) var sourceId: Long
+    @ProtoNumber(1) var sourceId: Long,
 )
 
 @Serializable
 data class BackupSource(
     @ProtoNumber(1) var name: String = "",
-    @ProtoNumber(2) var sourceId: Long
+    @ProtoNumber(2) var sourceId: Long,
 ) {
     companion object {
         fun copyFrom(source: Source): BackupSource {
             return BackupSource(
                 name = source.name,
-                sourceId = source.id
+                sourceId = source.id,
             )
         }
     }

app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupTracking.kt

@@ -56,7 +56,7 @@ data class BackupTracking(
                 status = track.status,
                 startedReadingDate = track.started_reading_date,
                 finishedReadingDate = track.finished_reading_date,
-                trackingUrl = track.tracking_url
+                trackingUrl = track.tracking_url,
             )
         }
     }

app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupManager.kt

@@ -55,9 +55,9 @@ class LegacyBackupManager(context: Context, version: Int = CURRENT_VERSION) : Ab
      * Create backup Json file from database
      *
      * @param uri path of Uri
-     * @param isJob backup called from job
+     * @param isAutoBackup backup called from scheduled backup job
      */
-    override fun createBackup(uri: Uri, flags: Int, isJob: Boolean) =
+    override fun createBackup(uri: Uri, flags: Int, isAutoBackup: Boolean) =
         throw IllegalStateException("Legacy backup creation is not supported")
 
     fun restoreMangaNoFetch(manga: Manga, dbManga: Manga) {

app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt

@@ -28,7 +28,7 @@ class LegacyBackupRestore(context: Context, notifier: BackupNotifier) : Abstract
         // Read the json and create a Json Object,
         // cannot use the backupManager json deserializer one because its not initialized yet
         val backupObject = Json.decodeFromStream<JsonObject>(
-            context.contentResolver.openInputStream(uri)!!
+            context.contentResolver.openInputStream(uri)!!,
         )
 
         // Get parser version
@@ -109,7 +109,7 @@ class LegacyBackupRestore(context: Context, notifier: BackupNotifier) : Abstract
         chapters: List<Chapter>,
         categories: List<String>,
         history: List<DHistory>,
-        tracks: List<Track>
+        tracks: List<Track>,
     ) {
         val dbManga = backupManager.getMangaFromDatabase(manga)
 
@@ -139,7 +139,7 @@ class LegacyBackupRestore(context: Context, notifier: BackupNotifier) : Abstract
         chapters: List<Chapter>,
         categories: List<String>,
         history: List<DHistory>,
-        tracks: List<Track>
+        tracks: List<Track>,
     ) {
         try {
             val fetchedManga = backupManager.fetchManga(source, manga)
@@ -161,7 +161,7 @@ class LegacyBackupRestore(context: Context, notifier: BackupNotifier) : Abstract
         chapters: List<Chapter>,
         categories: List<String>,
         history: List<DHistory>,
-        tracks: List<Track>
+        tracks: List<Track>,
     ) {
         if (!backupManager.restoreChaptersForManga(backupManga, chapters)) {
             updateChapters(source, backupManga, chapters)

app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestoreValidator.kt

@@ -4,10 +4,12 @@ import android.content.Context
 import android.net.Uri
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.backup.AbstractBackupRestoreValidator
+import eu.kanade.tachiyomi.data.backup.ValidatorParseException
 import eu.kanade.tachiyomi.data.backup.legacy.models.Backup
 import kotlinx.serialization.json.decodeFromStream
 
 class LegacyBackupRestoreValidator : AbstractBackupRestoreValidator() {
+
     /**
      * Checks for critical backup file data.
      *
@@ -17,9 +19,13 @@ class LegacyBackupRestoreValidator : AbstractBackupRestoreValidator() {
     override fun validate(context: Context, uri: Uri): Results {
         val backupManager = LegacyBackupManager(context)
 
-        val backup = backupManager.parser.decodeFromStream<Backup>(
+        val backup = try {
-            context.contentResolver.openInputStream(uri)!!
+            backupManager.parser.decodeFromStream<Backup>(
-        )
+                context.contentResolver.openInputStream(uri)!!,
+            )
+        } catch (e: Exception) {
+            throw ValidatorParseException(e)
+        }
 
         if (backup.version == null) {
             throw Exception(context.getString(R.string.invalid_backup_file_missing_data))
@@ -51,12 +57,10 @@ class LegacyBackupRestoreValidator : AbstractBackupRestoreValidator() {
 
     companion object {
         fun getSourceMapping(extensionsMapping: List<String>): Map<Long, String> {
-            return extensionsMapping
+            return extensionsMapping.associate {
-                .map {
+                val items = it.split(":")
-                    val items = it.split(":")
+                items[0].toLong() to items[1]
-                    items[0].toLong() to items[1]
+            }
-                }
-                .toMap()
         }
     }
 }

app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/models/Backup.kt

@@ -15,7 +15,7 @@ data class Backup(
     val version: Int? = null,
     var mangas: MutableList<MangaObject> = mutableListOf(),
     var categories: List<@Contextual Category>? = null,
-    var extensions: List<String>? = null
+    var extensions: List<String>? = null,
 ) {
     companion object {
         const val CURRENT_VERSION = 2
@@ -33,5 +33,5 @@ data class MangaObject(
     var chapters: List<@Contextual Chapter>? = null,
     var categories: List<String>? = null,
     var track: List<@Contextual Track>? = null,
-    var history: List<@Contextual DHistory>? = null
+    var history: List<@Contextual DHistory>? = null,
 )

app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/CategoryTypeSerializer.kt

@@ -27,7 +27,7 @@ open class CategoryBaseSerializer<T : Category> : KSerializer<T> {
             buildJsonArray {
                 add(value.name)
                 add(value.order)
-            }
+            },
         )
     }
 

app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/ChapterTypeSerializer.kt

@@ -35,7 +35,7 @@ open class ChapterBaseSerializer<T : Chapter> : KSerializer<T> {
                 if (value.last_page_read != 0) {
                     put(LAST_READ, value.last_page_read)
                 }
-            }
+            },
         )
     }
 

app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/HistoryTypeSerializer.kt

@@ -26,7 +26,7 @@ object HistoryTypeSerializer : KSerializer<DHistory> {
             buildJsonArray {
                 add(value.url)
                 add(value.lastRead)
-            }
+            },
         )
     }
 
@@ -35,7 +35,7 @@ object HistoryTypeSerializer : KSerializer<DHistory> {
         val array = decoder.decodeJsonElement().jsonArray
         return DHistory(
             url = array[0].jsonPrimitive.content,
-            lastRead = array[1].jsonPrimitive.long
+            lastRead = array[1].jsonPrimitive.long,
         )
     }
 }

app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/MangaTypeSerializer.kt

@@ -31,7 +31,7 @@ open class MangaBaseSerializer<T : Manga> : KSerializer<T> {
                 add(value.source)
                 add(value.viewer_flags)
                 add(value.chapter_flags)
-            }
+            },
         )
     }
 

app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/TrackTypeSerializer.kt

@@ -33,7 +33,7 @@ open class TrackBaseSerializer<T : Track> : KSerializer<T> {
                 put(LIBRARY, value.library_id)
                 put(LAST_READ, value.last_chapter_read)
                 put(TRACKING_URL, value.tracking_url)
-            }
+            },
         )
     }
 

app/src/main/java/eu/kanade/tachiyomi/data/cache/ChapterCache.kt

@@ -49,7 +49,7 @@ class ChapterCache(private val context: Context) {
         File(context.cacheDir, PARAMETER_CACHE_DIRECTORY),
         PARAMETER_APP_VERSION,
         PARAMETER_VALUE_COUNT,
-        PARAMETER_CACHE_SIZE
+        PARAMETER_CACHE_SIZE,
     )
 
     /**

app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverCache.kt

@@ -104,7 +104,7 @@ class CoverCache(private val context: Context) {
      * Clear coil's memory cache.
      */
     fun clearMemoryCache() {
-        context.imageLoader.memoryCache.clear()
+        context.imageLoader.memoryCache?.clear()
     }
 
     private fun getCacheDir(dir: String): File {

app/src/main/java/eu/kanade/tachiyomi/data/coil/ByteBufferFetcher.kt

@@ -1,25 +0,0 @@
-package eu.kanade.tachiyomi.data.coil
-
-import coil.bitmap.BitmapPool
-import coil.decode.DataSource
-import coil.decode.Options
-import coil.fetch.FetchResult
-import coil.fetch.Fetcher
-import coil.fetch.SourceResult
-import coil.size.Size
-import okio.buffer
-import okio.source
-import java.io.ByteArrayInputStream
-import java.nio.ByteBuffer
-
-class ByteBufferFetcher : Fetcher<ByteBuffer> {
-    override suspend fun fetch(pool: BitmapPool, data: ByteBuffer, size: Size, options: Options): FetchResult {
-        return SourceResult(
-            source = ByteArrayInputStream(data.array()).source().buffer(),
-            mimeType = null,
-            dataSource = DataSource.MEMORY
-        )
-    }
-
-    override fun key(data: ByteBuffer): String? = null
-}

app/src/main/java/eu/kanade/tachiyomi/data/coil/MangaCoverFetcher.kt

@@ -1,149 +1,261 @@
 package eu.kanade.tachiyomi.data.coil
 
-import coil.bitmap.BitmapPool
+import coil.ImageLoader
 import coil.decode.DataSource
-import coil.decode.Options
+import coil.decode.ImageSource
+import coil.disk.DiskCache
 import coil.fetch.FetchResult
 import coil.fetch.Fetcher
 import coil.fetch.SourceResult
 import coil.network.HttpException
-import coil.request.get
+import coil.request.Options
-import coil.size.Size
+import coil.request.Parameters
 import eu.kanade.tachiyomi.data.cache.CoverCache
 import eu.kanade.tachiyomi.data.coil.MangaCoverFetcher.Companion.USE_CUSTOM_COVER
 import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.network.await
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.online.HttpSource
+import eu.kanade.tachiyomi.util.system.logcat
+import logcat.LogPriority
 import okhttp3.CacheControl
 import okhttp3.Call
 import okhttp3.Request
 import okhttp3.Response
-import okhttp3.ResponseBody
+import okhttp3.internal.closeQuietly
+import okio.Path.Companion.toOkioPath
+import okio.Source
 import okio.buffer
 import okio.sink
-import okio.source
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.io.File
+import java.net.HttpURLConnection
 
 /**
- * Coil component that fetches [Manga] cover while using the cached file in disk when available.
+ * A [Fetcher] that fetches cover image for [Manga] object.
+ *
+ * It uses [Manga.thumbnail_url] if custom cover is not set by the user.
+ * Disk caching for library items is handled by [CoverCache], otherwise
+ * handled by Coil's [DiskCache].
  *
  * Available request parameter:
  * - [USE_CUSTOM_COVER]: Use custom cover if set by user, default is true
  */
-class MangaCoverFetcher : Fetcher<Manga> {
+class MangaCoverFetcher(
-    private val coverCache: CoverCache by injectLazy()
+    private val manga: Manga,
-    private val sourceManager: SourceManager by injectLazy()
+    private val sourceLazy: Lazy<HttpSource?>,
-    private val defaultClient = Injekt.get<NetworkHelper>().coilClient
+    private val options: Options,
+    private val coverCache: CoverCache,
+    private val callFactoryLazy: Lazy<Call.Factory>,
+    private val diskCacheLazy: Lazy<DiskCache>,
+) : Fetcher {
 
-    override fun key(data: Manga): String? {
+    // For non-custom cover
-        if (data.thumbnail_url.isNullOrBlank()) return null
+    private val diskCacheKey: String? by lazy { MangaCoverKeyer().key(manga, options) }
-        return data.thumbnail_url!!
+    private lateinit var url: String
-    }
 
-    override suspend fun fetch(pool: BitmapPool, data: Manga, size: Size, options: Options): FetchResult {
+    override suspend fun fetch(): FetchResult {
         // Use custom cover if exists
-        val useCustomCover = options.parameters[USE_CUSTOM_COVER] as? Boolean ?: true
+        val useCustomCover = options.parameters.value(USE_CUSTOM_COVER) ?: true
-        val customCoverFile = coverCache.getCustomCoverFile(data)
+        val customCoverFile = coverCache.getCustomCoverFile(manga)
         if (useCustomCover && customCoverFile.exists()) {
             return fileLoader(customCoverFile)
         }
 
-        val cover = data.thumbnail_url
+        // diskCacheKey is thumbnail_url
-        return when (getResourceType(cover)) {
+        url = diskCacheKey ?: error("No cover specified")
-            Type.URL -> httpLoader(data, options)
+        return when (getResourceType(url)) {
-            Type.File -> fileLoader(data)
+            Type.URL -> httpLoader()
+            Type.File -> fileLoader(File(url.substringAfter("file://")))
             null -> error("Invalid image")
         }
     }
 
-    private suspend fun httpLoader(manga: Manga, options: Options): FetchResult {
+    private fun fileLoader(file: File): FetchResult {
+        return SourceResult(
+            source = ImageSource(file = file.toOkioPath(), diskCacheKey = diskCacheKey),
+            mimeType = "image/*",
+            dataSource = DataSource.DISK,
+        )
+    }
+
+    private suspend fun httpLoader(): FetchResult {
         // Only cache separately if it's a library item
-        val coverCacheFile = if (manga.favorite) {
+        val libraryCoverCacheFile = if (manga.favorite) {
             coverCache.getCoverFile(manga) ?: error("No cover specified")
         } else {
             null
         }
-
+        if (libraryCoverCacheFile?.exists() == true && options.diskCachePolicy.readEnabled) {
-        if (coverCacheFile?.exists() == true && options.diskCachePolicy.readEnabled) {
+            return fileLoader(libraryCoverCacheFile)
-            return fileLoader(coverCacheFile)
         }
 
-        val (response, body) = awaitGetCall(manga, options)
+        var snapshot = readFromDiskCache()
-        if (!response.isSuccessful) {
+        try {
-            body.close()
+            // Fetch from disk cache
+            if (snapshot != null) {
+                val snapshotCoverCache = moveSnapshotToCoverCache(snapshot, libraryCoverCacheFile)
+                if (snapshotCoverCache != null) {
+                    // Read from cover cache after added to library
+                    return fileLoader(snapshotCoverCache)
+                }
+
+                // Read from snapshot
+                return SourceResult(
+                    source = snapshot.toImageSource(),
+                    mimeType = "image/*",
+                    dataSource = DataSource.DISK,
+                )
+            }
+
+            // Fetch from network
+            val response = executeNetworkRequest()
+            val responseBody = checkNotNull(response.body) { "Null response source" }
+            try {
+                // Read from cover cache after library manga cover updated
+                val responseCoverCache = writeResponseToCoverCache(response, libraryCoverCacheFile)
+                if (responseCoverCache != null) {
+                    return fileLoader(responseCoverCache)
+                }
+
+                // Read from disk cache
+                snapshot = writeToDiskCache(snapshot, response)
+                if (snapshot != null) {
+                    return SourceResult(
+                        source = snapshot.toImageSource(),
+                        mimeType = "image/*",
+                        dataSource = DataSource.NETWORK,
+                    )
+                }
+
+                // Read from response if cache is unused or unusable
+                return SourceResult(
+                    source = ImageSource(source = responseBody.source(), context = options.context),
+                    mimeType = "image/*",
+                    dataSource = if (response.cacheResponse != null) DataSource.DISK else DataSource.NETWORK,
+                )
+            } catch (e: Exception) {
+                responseBody.closeQuietly()
+                throw e
+            }
+        } catch (e: Exception) {
+            snapshot?.closeQuietly()
+            throw e
+        }
+    }
+
+    private suspend fun executeNetworkRequest(): Response {
+        val client = sourceLazy.value?.client ?: callFactoryLazy.value
+        val response = client.newCall(newRequest()).await()
+        if (!response.isSuccessful && response.code != HttpURLConnection.HTTP_NOT_MODIFIED) {
+            response.body?.closeQuietly()
             throw HttpException(response)
         }
+        return response
+    }
 
-        if (coverCacheFile != null && options.diskCachePolicy.writeEnabled) {
+    private fun newRequest(): Request {
-            @Suppress("BlockingMethodInNonBlockingContext")
+        val request = Request.Builder()
-            response.peekBody(Long.MAX_VALUE).source().use { input ->
+            .url(url)
-                coverCacheFile.parentFile?.mkdirs()
+            .headers(sourceLazy.value?.headers ?: options.headers)
-                if (coverCacheFile.exists()) {
+            // Support attaching custom data to the network request.
-                    coverCacheFile.delete()
+            .tag(Parameters::class.java, options.parameters)
-                }
+
-                coverCacheFile.sink().buffer().use { output ->
+        val diskRead = options.diskCachePolicy.readEnabled
-                    output.writeAll(input)
+        val networkRead = options.networkCachePolicy.readEnabled
-                }
+        when {
+            !networkRead && diskRead -> {
+                request.cacheControl(CacheControl.FORCE_CACHE)
+            }
+            networkRead && !diskRead -> if (options.diskCachePolicy.writeEnabled) {
+                request.cacheControl(CacheControl.FORCE_NETWORK)
+            } else {
+                request.cacheControl(CACHE_CONTROL_FORCE_NETWORK_NO_CACHE)
+            }
+            !networkRead && !diskRead -> {
+                // This causes the request to fail with a 504 Unsatisfiable Request.
+                request.cacheControl(CACHE_CONTROL_NO_NETWORK_NO_CACHE)
             }
         }
 
-        return SourceResult(
+        return request.build()
-            source = body.source(),
-            mimeType = "image/*",
-            dataSource = if (response.cacheResponse != null) DataSource.DISK else DataSource.NETWORK
-        )
     }
 
-    private suspend fun awaitGetCall(manga: Manga, options: Options): Pair<Response, ResponseBody> {
+    private fun moveSnapshotToCoverCache(snapshot: DiskCache.Snapshot, cacheFile: File?): File? {
-        val call = getCall(manga, options)
+        if (cacheFile == null) return null
-        val response = call.await()
+        return try {
-        return response to checkNotNull(response.body) { "Null response source" }
+            diskCacheLazy.value.run {
-    }
+                fileSystem.source(snapshot.data).use { input ->
-
+                    writeSourceToCoverCache(input, cacheFile)
-    private fun getCall(manga: Manga, options: Options): Call {
+                }
-        val source = sourceManager.get(manga.source) as? HttpSource
+                remove(diskCacheKey!!)
-        val request = Request.Builder().url(manga.thumbnail_url!!).also {
-            if (source != null) {
-                it.headers(source.headers)
             }
+            cacheFile.takeIf { it.exists() }
+        } catch (e: Exception) {
+            logcat(LogPriority.ERROR, e) { "Failed to write snapshot data to cover cache ${cacheFile.name}" }
+            null
+        }
+    }
 
-            val networkRead = options.networkCachePolicy.readEnabled
+    private fun writeResponseToCoverCache(response: Response, cacheFile: File?): File? {
-            val diskRead = options.diskCachePolicy.readEnabled
+        if (cacheFile == null || !options.diskCachePolicy.writeEnabled) return null
-            when {
+        return try {
-                !networkRead && diskRead -> {
+            response.peekBody(Long.MAX_VALUE).source().use { input ->
-                    it.cacheControl(CacheControl.FORCE_CACHE)
+                writeSourceToCoverCache(input, cacheFile)
-                }
-                networkRead && !diskRead -> if (options.diskCachePolicy.writeEnabled) {
-                    it.cacheControl(CacheControl.FORCE_NETWORK)
-                } else {
-                    it.cacheControl(CACHE_CONTROL_FORCE_NETWORK_NO_CACHE)
-                }
-                !networkRead && !diskRead -> {
-                    // This causes the request to fail with a 504 Unsatisfiable Request.
-                    it.cacheControl(CACHE_CONTROL_NO_NETWORK_NO_CACHE)
-                }
             }
-        }.build()
+            cacheFile.takeIf { it.exists() }
-
+        } catch (e: Exception) {
-        val client = source?.client?.newBuilder()?.cache(defaultClient.cache)?.build() ?: defaultClient
+            logcat(LogPriority.ERROR, e) { "Failed to write response data to cover cache ${cacheFile.name}" }
-        return client.newCall(request)
+            null
+        }
     }
 
-    private fun fileLoader(manga: Manga): FetchResult {
+    private fun writeSourceToCoverCache(input: Source, cacheFile: File) {
-        return fileLoader(File(manga.thumbnail_url!!.substringAfter("file://")))
+        cacheFile.parentFile?.mkdirs()
+        cacheFile.delete()
+        try {
+            cacheFile.sink().buffer().use { output ->
+                output.writeAll(input)
+            }
+        } catch (e: Exception) {
+            cacheFile.delete()
+            throw e
+        }
     }
 
-    private fun fileLoader(file: File): FetchResult {
+    private fun readFromDiskCache(): DiskCache.Snapshot? {
-        return SourceResult(
+        return if (options.diskCachePolicy.readEnabled) diskCacheLazy.value[diskCacheKey!!] else null
-            source = file.source().buffer(),
+    }
-            mimeType = "image/*",
+
-            dataSource = DataSource.DISK
+    private fun writeToDiskCache(
-        )
+        snapshot: DiskCache.Snapshot?,
+        response: Response,
+    ): DiskCache.Snapshot? {
+        if (!options.diskCachePolicy.writeEnabled) {
+            snapshot?.closeQuietly()
+            return null
+        }
+        val editor = if (snapshot != null) {
+            snapshot.closeAndEdit()
+        } else {
+            diskCacheLazy.value.edit(diskCacheKey!!)
+        } ?: return null
+        try {
+            diskCacheLazy.value.fileSystem.write(editor.data) {
+                response.body!!.source().readAll(this)
+            }
+            return editor.commitAndGet()
+        } catch (e: Exception) {
+            try {
+                editor.abort()
+            } catch (ignored: Exception) {
+            }
+            throw e
+        }
+    }
+
+    private fun DiskCache.Snapshot.toImageSource(): ImageSource {
+        return ImageSource(file = data, diskCacheKey = diskCacheKey, closeable = this)
     }
 
     private fun getResourceType(cover: String?): Type? {
@@ -159,6 +271,20 @@ class MangaCoverFetcher : Fetcher<Manga> {
         File, URL
     }
 
+    class Factory(
+        private val callFactoryLazy: Lazy<Call.Factory>,
+        private val diskCacheLazy: Lazy<DiskCache>,
+    ) : Fetcher.Factory<Manga> {
+
+        private val coverCache: CoverCache by injectLazy()
+        private val sourceManager: SourceManager by injectLazy()
+
+        override fun create(data: Manga, options: Options, imageLoader: ImageLoader): Fetcher {
+            val source = lazy { sourceManager.get(data.source) as? HttpSource }
+            return MangaCoverFetcher(data, source, options, coverCache, callFactoryLazy, diskCacheLazy)
+        }
+    }
+
     companion object {
         const val USE_CUSTOM_COVER = "use_custom_cover"
 

app/src/main/java/eu/kanade/tachiyomi/data/coil/MangaCoverKeyer.kt

@@ -0,0 +1,11 @@
+package eu.kanade.tachiyomi.data.coil
+
+import coil.key.Keyer
+import coil.request.Options
+import eu.kanade.tachiyomi.data.database.models.Manga
+
+class MangaCoverKeyer : Keyer<Manga> {
+    override fun key(data: Manga, options: Options): String? {
+        return data.thumbnail_url?.takeIf { it.isNotBlank() }
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/data/coil/TachiyomiImageDecoder.kt

@@ -1,13 +1,14 @@
 package eu.kanade.tachiyomi.data.coil
 
-import android.content.res.Resources
 import android.os.Build
 import androidx.core.graphics.drawable.toDrawable
-import coil.bitmap.BitmapPool
+import coil.ImageLoader
 import coil.decode.DecodeResult
 import coil.decode.Decoder
-import coil.decode.Options
+import coil.decode.ImageDecoderDecoder
-import coil.size.Size
+import coil.decode.ImageSource
+import coil.fetch.SourceResult
+import coil.request.Options
 import eu.kanade.tachiyomi.util.system.ImageUtil
 import okio.BufferedSource
 import tachiyomi.decoder.ImageDecoder
@@ -15,26 +16,10 @@ import tachiyomi.decoder.ImageDecoder
 /**
  * A [Decoder] that uses built-in [ImageDecoder] to decode images that is not supported by the system.
  */
-class TachiyomiImageDecoder(private val resources: Resources) : Decoder {
+class TachiyomiImageDecoder(private val resources: ImageSource, private val options: Options) : Decoder {
 
-    override fun handles(source: BufferedSource, mimeType: String?): Boolean {
+    override suspend fun decode(): DecodeResult {
-        val type = source.peek().inputStream().use {
+        val decoder = resources.sourceOrNull()?.use {
-            ImageUtil.findImageType(it)
-        }
-        return when (type) {
-            ImageUtil.ImageType.AVIF, ImageUtil.ImageType.JXL -> true
-            ImageUtil.ImageType.HEIF -> Build.VERSION.SDK_INT < Build.VERSION_CODES.O
-            else -> false
-        }
-    }
-
-    override suspend fun decode(
-        pool: BitmapPool,
-        source: BufferedSource,
-        size: Size,
-        options: Options
-    ): DecodeResult {
-        val decoder = source.use {
             ImageDecoder.newInstance(it.inputStream())
         }
 
@@ -46,8 +31,31 @@ class TachiyomiImageDecoder(private val resources: Resources) : Decoder {
         check(bitmap != null) { "Failed to decode image." }
 
         return DecodeResult(
-            drawable = bitmap.toDrawable(resources),
+            drawable = bitmap.toDrawable(options.context.resources),
-            isSampled = false
+            isSampled = false,
         )
     }
+
+    class Factory : Decoder.Factory {
+
+        override fun create(result: SourceResult, options: Options, imageLoader: ImageLoader): Decoder? {
+            if (!isApplicable(result.source.source())) return null
+            return TachiyomiImageDecoder(result.source, options)
+        }
+
+        private fun isApplicable(source: BufferedSource): Boolean {
+            val type = source.peek().inputStream().use {
+                ImageUtil.findImageType(it)
+            }
+            return when (type) {
+                ImageUtil.ImageType.AVIF, ImageUtil.ImageType.JXL -> true
+                ImageUtil.ImageType.HEIF -> Build.VERSION.SDK_INT < Build.VERSION_CODES.O
+                else -> false
+            }
+        }
+
+        override fun equals(other: Any?) = other is ImageDecoderDecoder.Factory
+
+        override fun hashCode() = javaClass.hashCode()
+    }
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt

@@ -20,7 +20,7 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
         /**
          * Version of the database.
          */
-        const val DATABASE_VERSION = 13
+        const val DATABASE_VERSION = 14
     }
 
     override fun onCreate(db: SupportSQLiteDatabase) = with(db) {
@@ -46,7 +46,7 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
             // Fix kissmanga covers after supporting cloudflare
             db.execSQL(
                 """UPDATE mangas SET thumbnail_url =
-                    REPLACE(thumbnail_url, '93.174.95.110', 'kissmanga.com') WHERE source = 4"""
+                    REPLACE(thumbnail_url, '93.174.95.110', 'kissmanga.com') WHERE source = 4""",
             )
         }
         if (oldVersion < 3) {
@@ -91,6 +91,9 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
             db.execSQL(TrackTable.insertFromTempTable)
             db.execSQL(TrackTable.dropTempTable)
         }
+        if (oldVersion < 14) {
+            db.execSQL(ChapterTable.fixDateUploadIfNeeded)
+        }
     }
 
     override fun onConfigure(db: SupportSQLiteDatabase) {

app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/CategoryTypeMapping.kt

@@ -20,7 +20,7 @@ import eu.kanade.tachiyomi.data.database.tables.CategoryTable.TABLE
 class CategoryTypeMapping : SQLiteTypeMapping<Category>(
     CategoryPutResolver(),
     CategoryGetResolver(),
-    CategoryDeleteResolver()
+    CategoryDeleteResolver(),
 )
 
 class CategoryPutResolver : DefaultPutResolver<Category>() {
@@ -40,17 +40,17 @@ class CategoryPutResolver : DefaultPutResolver<Category>() {
             COL_ID to obj.id,
             COL_NAME to obj.name,
             COL_ORDER to obj.order,
-            COL_FLAGS to obj.flags
+            COL_FLAGS to obj.flags,
         )
 }
 
 class CategoryGetResolver : DefaultGetResolver<Category>() {
 
     override fun mapFromCursor(cursor: Cursor): Category = CategoryImpl().apply {
-        id = cursor.getInt(cursor.getColumnIndex(COL_ID))
+        id = cursor.getInt(cursor.getColumnIndexOrThrow(COL_ID))
-        name = cursor.getString(cursor.getColumnIndex(COL_NAME))
+        name = cursor.getString(cursor.getColumnIndexOrThrow(COL_NAME))
-        order = cursor.getInt(cursor.getColumnIndex(COL_ORDER))
+        order = cursor.getInt(cursor.getColumnIndexOrThrow(COL_ORDER))
-        flags = cursor.getInt(cursor.getColumnIndex(COL_FLAGS))
+        flags = cursor.getInt(cursor.getColumnIndexOrThrow(COL_FLAGS))
     }
 }
 

app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/ChapterTypeMapping.kt

@@ -28,7 +28,7 @@ import eu.kanade.tachiyomi.data.database.tables.ChapterTable.TABLE
 class ChapterTypeMapping : SQLiteTypeMapping<Chapter>(
     ChapterPutResolver(),
     ChapterGetResolver(),
-    ChapterDeleteResolver()
+    ChapterDeleteResolver(),
 )
 
 class ChapterPutResolver : DefaultPutResolver<Chapter>() {
@@ -56,25 +56,25 @@ class ChapterPutResolver : DefaultPutResolver<Chapter>() {
             COL_DATE_UPLOAD to obj.date_upload,
             COL_LAST_PAGE_READ to obj.last_page_read,
             COL_CHAPTER_NUMBER to obj.chapter_number,
-            COL_SOURCE_ORDER to obj.source_order
+            COL_SOURCE_ORDER to obj.source_order,
         )
 }
 
 class ChapterGetResolver : DefaultGetResolver<Chapter>() {
 
     override fun mapFromCursor(cursor: Cursor): Chapter = ChapterImpl().apply {
-        id = cursor.getLong(cursor.getColumnIndex(COL_ID))
+        id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_ID))
-        manga_id = cursor.getLong(cursor.getColumnIndex(COL_MANGA_ID))
+        manga_id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_MANGA_ID))
-        url = cursor.getString(cursor.getColumnIndex(COL_URL))
+        url = cursor.getString(cursor.getColumnIndexOrThrow(COL_URL))
-        name = cursor.getString(cursor.getColumnIndex(COL_NAME))
+        name = cursor.getString(cursor.getColumnIndexOrThrow(COL_NAME))
-        scanlator = cursor.getString(cursor.getColumnIndex(COL_SCANLATOR))
+        scanlator = cursor.getString(cursor.getColumnIndexOrThrow(COL_SCANLATOR))
-        read = cursor.getInt(cursor.getColumnIndex(COL_READ)) == 1
+        read = cursor.getInt(cursor.getColumnIndexOrThrow(COL_READ)) == 1
-        bookmark = cursor.getInt(cursor.getColumnIndex(COL_BOOKMARK)) == 1
+        bookmark = cursor.getInt(cursor.getColumnIndexOrThrow(COL_BOOKMARK)) == 1
-        date_fetch = cursor.getLong(cursor.getColumnIndex(COL_DATE_FETCH))
+        date_fetch = cursor.getLong(cursor.getColumnIndexOrThrow(COL_DATE_FETCH))
-        date_upload = cursor.getLong(cursor.getColumnIndex(COL_DATE_UPLOAD))
+        date_upload = cursor.getLong(cursor.getColumnIndexOrThrow(COL_DATE_UPLOAD))
-        last_page_read = cursor.getInt(cursor.getColumnIndex(COL_LAST_PAGE_READ))
+        last_page_read = cursor.getInt(cursor.getColumnIndexOrThrow(COL_LAST_PAGE_READ))
-        chapter_number = cursor.getFloat(cursor.getColumnIndex(COL_CHAPTER_NUMBER))
+        chapter_number = cursor.getFloat(cursor.getColumnIndexOrThrow(COL_CHAPTER_NUMBER))
-        source_order = cursor.getInt(cursor.getColumnIndex(COL_SOURCE_ORDER))
+        source_order = cursor.getInt(cursor.getColumnIndexOrThrow(COL_SOURCE_ORDER))
     }
 }
 

app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/HistoryTypeMapping.kt

@@ -20,7 +20,7 @@ import eu.kanade.tachiyomi.data.database.tables.HistoryTable.TABLE
 class HistoryTypeMapping : SQLiteTypeMapping<History>(
     HistoryPutResolver(),
     HistoryGetResolver(),
-    HistoryDeleteResolver()
+    HistoryDeleteResolver(),
 )
 
 open class HistoryPutResolver : DefaultPutResolver<History>() {
@@ -40,17 +40,17 @@ open class HistoryPutResolver : DefaultPutResolver<History>() {
             COL_ID to obj.id,
             COL_CHAPTER_ID to obj.chapter_id,
             COL_LAST_READ to obj.last_read,
-            COL_TIME_READ to obj.time_read
+            COL_TIME_READ to obj.time_read,
         )
 }
 
 class HistoryGetResolver : DefaultGetResolver<History>() {
 
     override fun mapFromCursor(cursor: Cursor): History = HistoryImpl().apply {
-        id = cursor.getLong(cursor.getColumnIndex(COL_ID))
+        id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_ID))
-        chapter_id = cursor.getLong(cursor.getColumnIndex(COL_CHAPTER_ID))
+        chapter_id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_CHAPTER_ID))
-        last_read = cursor.getLong(cursor.getColumnIndex(COL_LAST_READ))
+        last_read = cursor.getLong(cursor.getColumnIndexOrThrow(COL_LAST_READ))
-        time_read = cursor.getLong(cursor.getColumnIndex(COL_TIME_READ))
+        time_read = cursor.getLong(cursor.getColumnIndexOrThrow(COL_TIME_READ))
     }
 }
 

app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaCategoryTypeMapping.kt

@@ -18,7 +18,7 @@ import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable.TABLE
 class MangaCategoryTypeMapping : SQLiteTypeMapping<MangaCategory>(
     MangaCategoryPutResolver(),
     MangaCategoryGetResolver(),
-    MangaCategoryDeleteResolver()
+    MangaCategoryDeleteResolver(),
 )
 
 class MangaCategoryPutResolver : DefaultPutResolver<MangaCategory>() {
@@ -37,16 +37,16 @@ class MangaCategoryPutResolver : DefaultPutResolver<MangaCategory>() {
         contentValuesOf(
             COL_ID to obj.id,
             COL_MANGA_ID to obj.manga_id,
-            COL_CATEGORY_ID to obj.category_id
+            COL_CATEGORY_ID to obj.category_id,
         )
 }
 
 class MangaCategoryGetResolver : DefaultGetResolver<MangaCategory>() {
 
     override fun mapFromCursor(cursor: Cursor): MangaCategory = MangaCategory().apply {
-        id = cursor.getLong(cursor.getColumnIndex(COL_ID))
+        id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_ID))
-        manga_id = cursor.getLong(cursor.getColumnIndex(COL_MANGA_ID))
+        manga_id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_MANGA_ID))
-        category_id = cursor.getInt(cursor.getColumnIndex(COL_CATEGORY_ID))
+        category_id = cursor.getInt(cursor.getColumnIndexOrThrow(COL_CATEGORY_ID))
     }
 }
 

app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaTypeMapping.kt

@@ -22,7 +22,6 @@ import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_GENRE
 import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_ID
 import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_INITIALIZED
 import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_LAST_UPDATE
-import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_NEXT_UPDATE
 import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_SOURCE
 import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_STATUS
 import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_THUMBNAIL_URL
@@ -34,7 +33,7 @@ import eu.kanade.tachiyomi.data.database.tables.MangaTable.TABLE
 class MangaTypeMapping : SQLiteTypeMapping<Manga>(
     MangaPutResolver(),
     MangaGetResolver(),
-    MangaDeleteResolver()
+    MangaDeleteResolver(),
 )
 
 class MangaPutResolver : DefaultPutResolver<Manga>() {
@@ -63,35 +62,33 @@ class MangaPutResolver : DefaultPutResolver<Manga>() {
             COL_THUMBNAIL_URL to obj.thumbnail_url,
             COL_FAVORITE to obj.favorite,
             COL_LAST_UPDATE to obj.last_update,
-            COL_NEXT_UPDATE to obj.next_update,
             COL_INITIALIZED to obj.initialized,
             COL_VIEWER to obj.viewer_flags,
             COL_CHAPTER_FLAGS to obj.chapter_flags,
             COL_COVER_LAST_MODIFIED to obj.cover_last_modified,
-            COL_DATE_ADDED to obj.date_added
+            COL_DATE_ADDED to obj.date_added,
         )
 }
 
 interface BaseMangaGetResolver {
     fun mapBaseFromCursor(manga: Manga, cursor: Cursor) = manga.apply {
-        id = cursor.getLong(cursor.getColumnIndex(COL_ID))
+        id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_ID))
-        source = cursor.getLong(cursor.getColumnIndex(COL_SOURCE))
+        source = cursor.getLong(cursor.getColumnIndexOrThrow(COL_SOURCE))
-        url = cursor.getString(cursor.getColumnIndex(COL_URL))
+        url = cursor.getString(cursor.getColumnIndexOrThrow(COL_URL))
-        artist = cursor.getString(cursor.getColumnIndex(COL_ARTIST))
+        artist = cursor.getString(cursor.getColumnIndexOrThrow(COL_ARTIST))
-        author = cursor.getString(cursor.getColumnIndex(COL_AUTHOR))
+        author = cursor.getString(cursor.getColumnIndexOrThrow(COL_AUTHOR))
-        description = cursor.getString(cursor.getColumnIndex(COL_DESCRIPTION))
+        description = cursor.getString(cursor.getColumnIndexOrThrow(COL_DESCRIPTION))
-        genre = cursor.getString(cursor.getColumnIndex(COL_GENRE))
+        genre = cursor.getString(cursor.getColumnIndexOrThrow(COL_GENRE))
-        title = cursor.getString(cursor.getColumnIndex(COL_TITLE))
+        title = cursor.getString(cursor.getColumnIndexOrThrow(COL_TITLE))
-        status = cursor.getInt(cursor.getColumnIndex(COL_STATUS))
+        status = cursor.getInt(cursor.getColumnIndexOrThrow(COL_STATUS))
-        thumbnail_url = cursor.getString(cursor.getColumnIndex(COL_THUMBNAIL_URL))
+        thumbnail_url = cursor.getString(cursor.getColumnIndexOrThrow(COL_THUMBNAIL_URL))
-        favorite = cursor.getInt(cursor.getColumnIndex(COL_FAVORITE)) == 1
+        favorite = cursor.getInt(cursor.getColumnIndexOrThrow(COL_FAVORITE)) == 1
-        last_update = cursor.getLong(cursor.getColumnIndex(COL_LAST_UPDATE))
+        last_update = cursor.getLong(cursor.getColumnIndexOrThrow(COL_LAST_UPDATE))
-        next_update = cursor.getLong(cursor.getColumnIndex(COL_NEXT_UPDATE))
+        initialized = cursor.getInt(cursor.getColumnIndexOrThrow(COL_INITIALIZED)) == 1
-        initialized = cursor.getInt(cursor.getColumnIndex(COL_INITIALIZED)) == 1
+        viewer_flags = cursor.getInt(cursor.getColumnIndexOrThrow(COL_VIEWER))
-        viewer_flags = cursor.getInt(cursor.getColumnIndex(COL_VIEWER))
+        chapter_flags = cursor.getInt(cursor.getColumnIndexOrThrow(COL_CHAPTER_FLAGS))
-        chapter_flags = cursor.getInt(cursor.getColumnIndex(COL_CHAPTER_FLAGS))
+        cover_last_modified = cursor.getLong(cursor.getColumnIndexOrThrow(COL_COVER_LAST_MODIFIED))
-        cover_last_modified = cursor.getLong(cursor.getColumnIndex(COL_COVER_LAST_MODIFIED))
+        date_added = cursor.getLong(cursor.getColumnIndexOrThrow(COL_DATE_ADDED))
-        date_added = cursor.getLong(cursor.getColumnIndex(COL_DATE_ADDED))
     }
 }
 

app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/TrackTypeMapping.kt

@@ -29,7 +29,7 @@ import eu.kanade.tachiyomi.data.database.tables.TrackTable.TABLE
 class TrackTypeMapping : SQLiteTypeMapping<Track>(
     TrackPutResolver(),
     TrackGetResolver(),
-    TrackDeleteResolver()
+    TrackDeleteResolver(),
 )
 
 class TrackPutResolver : DefaultPutResolver<Track>() {
@@ -58,26 +58,26 @@ class TrackPutResolver : DefaultPutResolver<Track>() {
             COL_TRACKING_URL to obj.tracking_url,
             COL_SCORE to obj.score,
             COL_START_DATE to obj.started_reading_date,
-            COL_FINISH_DATE to obj.finished_reading_date
+            COL_FINISH_DATE to obj.finished_reading_date,
         )
 }
 
 class TrackGetResolver : DefaultGetResolver<Track>() {
 
     override fun mapFromCursor(cursor: Cursor): Track = TrackImpl().apply {
-        id = cursor.getLong(cursor.getColumnIndex(COL_ID))
+        id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_ID))
-        manga_id = cursor.getLong(cursor.getColumnIndex(COL_MANGA_ID))
+        manga_id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_MANGA_ID))
-        sync_id = cursor.getInt(cursor.getColumnIndex(COL_SYNC_ID))
+        sync_id = cursor.getInt(cursor.getColumnIndexOrThrow(COL_SYNC_ID))
-        media_id = cursor.getInt(cursor.getColumnIndex(COL_MEDIA_ID))
+        media_id = cursor.getInt(cursor.getColumnIndexOrThrow(COL_MEDIA_ID))
-        library_id = cursor.getLong(cursor.getColumnIndex(COL_LIBRARY_ID))
+        library_id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_LIBRARY_ID))
-        title = cursor.getString(cursor.getColumnIndex(COL_TITLE))
+        title = cursor.getString(cursor.getColumnIndexOrThrow(COL_TITLE))
-        last_chapter_read = cursor.getFloat(cursor.getColumnIndex(COL_LAST_CHAPTER_READ))
+        last_chapter_read = cursor.getFloat(cursor.getColumnIndexOrThrow(COL_LAST_CHAPTER_READ))
-        total_chapters = cursor.getInt(cursor.getColumnIndex(COL_TOTAL_CHAPTERS))
+        total_chapters = cursor.getInt(cursor.getColumnIndexOrThrow(COL_TOTAL_CHAPTERS))
-        status = cursor.getInt(cursor.getColumnIndex(COL_STATUS))
+        status = cursor.getInt(cursor.getColumnIndexOrThrow(COL_STATUS))
-        score = cursor.getFloat(cursor.getColumnIndex(COL_SCORE))
+        score = cursor.getFloat(cursor.getColumnIndexOrThrow(COL_SCORE))
-        tracking_url = cursor.getString(cursor.getColumnIndex(COL_TRACKING_URL))
+        tracking_url = cursor.getString(cursor.getColumnIndexOrThrow(COL_TRACKING_URL))
-        started_reading_date = cursor.getLong(cursor.getColumnIndex(COL_START_DATE))
+        started_reading_date = cursor.getLong(cursor.getColumnIndexOrThrow(COL_START_DATE))
-        finished_reading_date = cursor.getLong(cursor.getColumnIndex(COL_FINISH_DATE))
+        finished_reading_date = cursor.getLong(cursor.getColumnIndexOrThrow(COL_FINISH_DATE))
     }
 }
 

app/src/main/java/eu/kanade/tachiyomi/data/database/models/LibraryManga.kt

@@ -2,7 +2,14 @@ package eu.kanade.tachiyomi.data.database.models
 
 class LibraryManga : MangaImpl() {
 
-    var unread: Int = 0
+    var unreadCount: Int = 0
+    var readCount: Int = 0
+
+    val totalChapters
+        get() = readCount + unreadCount
+
+    val hasStarted
+        get() = readCount > 0
 
     var category: Int = 0
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt

@@ -16,9 +16,6 @@ interface Manga : SManga {
     // last time the chapter list changed in any way
     var last_update: Long
 
-    // predicted next update time based on latest (by date) 4 chapters' deltas
-    var next_update: Long
-
     var date_added: Long
 
     var viewer_flags: Int
@@ -36,7 +33,8 @@ interface Manga : SManga {
     }
 
     fun getGenres(): List<String>? {
-        return genre?.split(", ")?.map { it.trim() }
+        if (genre.isNullOrBlank()) return null
+        return genre?.split(", ")?.map { it.trim() }?.filterNot { it.isBlank() }?.distinct()
     }
 
     private fun setChapterFlags(flag: Int, mask: Int) {
@@ -127,6 +125,6 @@ fun Manga.toMangaInfo(): MangaInfo {
         genres = this.getGenres() ?: emptyList(),
         key = this.url,
         status = this.status,
-        title = this.title
+        title = this.title,
     )
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaImpl.kt

@@ -26,8 +26,6 @@ open class MangaImpl : Manga {
 
     override var last_update: Long = 0
 
-    override var next_update: Long = 0
-
     override var date_added: Long = 0
 
     override var initialized: Boolean = false

app/src/main/java/eu/kanade/tachiyomi/data/database/models/SourceIdMangaCount.kt

@@ -0,0 +1,3 @@
+package eu.kanade.tachiyomi.data.database.models
+
+data class SourceIdMangaCount(val source: Long, val count: Int)

app/src/main/java/eu/kanade/tachiyomi/data/database/queries/CategoryQueries.kt

@@ -15,7 +15,7 @@ interface CategoryQueries : DbProvider {
             Query.builder()
                 .table(CategoryTable.TABLE)
                 .orderBy(CategoryTable.COL_ORDER)
-                .build()
+                .build(),
         )
         .prepare()
 
@@ -25,7 +25,7 @@ interface CategoryQueries : DbProvider {
             RawQuery.builder()
                 .query(getCategoriesForMangaQuery())
                 .args(manga.id)
-                .build()
+                .build(),
         )
         .prepare()
 

app/src/main/java/eu/kanade/tachiyomi/data/database/queries/ChapterQueries.kt

@@ -23,7 +23,7 @@ interface ChapterQueries : DbProvider {
                 .table(ChapterTable.TABLE)
                 .where("${ChapterTable.COL_MANGA_ID} = ?")
                 .whereArgs(manga.id)
-                .build()
+                .build(),
         )
         .prepare()
 
@@ -34,7 +34,7 @@ interface ChapterQueries : DbProvider {
                 .query(getRecentsQuery())
                 .args(date.time)
                 .observesTables(ChapterTable.TABLE)
-                .build()
+                .build(),
         )
         .withGetResolver(MangaChapterGetResolver.INSTANCE)
         .prepare()
@@ -46,7 +46,7 @@ interface ChapterQueries : DbProvider {
                 .table(ChapterTable.TABLE)
                 .where("${ChapterTable.COL_ID} = ?")
                 .whereArgs(id)
-                .build()
+                .build(),
         )
         .prepare()
 
@@ -57,7 +57,7 @@ interface ChapterQueries : DbProvider {
                 .table(ChapterTable.TABLE)
                 .where("${ChapterTable.COL_URL} = ?")
                 .whereArgs(url)
-                .build()
+                .build(),
         )
         .prepare()
 
@@ -68,7 +68,7 @@ interface ChapterQueries : DbProvider {
                 .table(ChapterTable.TABLE)
                 .where("${ChapterTable.COL_URL} = ? AND ${ChapterTable.COL_MANGA_ID} = ?")
                 .whereArgs(url, mangaId)
-                .build()
+                .build(),
         )
         .prepare()
 

app/src/main/java/eu/kanade/tachiyomi/data/database/queries/HistoryQueries.kt

@@ -32,7 +32,7 @@ interface HistoryQueries : DbProvider {
                 .query(getRecentMangasQuery(search))
                 .args(date.time, limit, offset)
                 .observesTables(HistoryTable.TABLE)
-                .build()
+                .build(),
         )
         .withGetResolver(MangaChapterHistoryGetResolver.INSTANCE)
         .prepare()
@@ -44,7 +44,7 @@ interface HistoryQueries : DbProvider {
                 .query(getHistoryByMangaId())
                 .args(mangaId)
                 .observesTables(HistoryTable.TABLE)
-                .build()
+                .build(),
         )
         .prepare()
 
@@ -55,7 +55,7 @@ interface HistoryQueries : DbProvider {
                 .query(getHistoryByChapterUrl())
                 .args(chapterUrl)
                 .observesTables(HistoryTable.TABLE)
-                .build()
+                .build(),
         )
         .prepare()
 
@@ -83,7 +83,7 @@ interface HistoryQueries : DbProvider {
         .byQuery(
             DeleteQuery.builder()
                 .table(HistoryTable.TABLE)
-                .build()
+                .build(),
         )
         .prepare()
 
@@ -93,7 +93,7 @@ interface HistoryQueries : DbProvider {
                 .table(HistoryTable.TABLE)
                 .where("${HistoryTable.COL_LAST_READ} = ?")
                 .whereArgs(0)
-                .build()
+                .build(),
         )
         .prepare()
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaCategoryQueries.kt

@@ -20,7 +20,7 @@ interface MangaCategoryQueries : DbProvider {
                 .table(MangaCategoryTable.TABLE)
                 .where("${MangaCategoryTable.COL_MANGA_ID} IN (${Queries.placeholders(mangas.size)})")
                 .whereArgs(*mangas.map { it.id }.toTypedArray())
-                .build()
+                .build(),
         )
         .prepare()
 

app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt

@@ -1,5 +1,6 @@
 package eu.kanade.tachiyomi.data.database.queries
 
+import com.pushtorefresh.storio.Queries
 import com.pushtorefresh.storio.sqlite.operations.get.PreparedGetListOfObjects
 import com.pushtorefresh.storio.sqlite.queries.DeleteQuery
 import com.pushtorefresh.storio.sqlite.queries.Query
@@ -7,13 +8,14 @@ import com.pushtorefresh.storio.sqlite.queries.RawQuery
 import eu.kanade.tachiyomi.data.database.DbProvider
 import eu.kanade.tachiyomi.data.database.models.LibraryManga
 import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.models.SourceIdMangaCount
 import eu.kanade.tachiyomi.data.database.resolvers.LibraryMangaGetResolver
 import eu.kanade.tachiyomi.data.database.resolvers.MangaCoverLastModifiedPutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.MangaFavoritePutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.MangaFlagsPutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.MangaLastUpdatedPutResolver
-import eu.kanade.tachiyomi.data.database.resolvers.MangaNextUpdatedPutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.MangaTitlePutResolver
+import eu.kanade.tachiyomi.data.database.resolvers.SourceIdMangaCountGetResolver
 import eu.kanade.tachiyomi.data.database.tables.CategoryTable
 import eu.kanade.tachiyomi.data.database.tables.ChapterTable
 import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable
@@ -27,11 +29,26 @@ interface MangaQueries : DbProvider {
             RawQuery.builder()
                 .query(libraryQuery)
                 .observesTables(MangaTable.TABLE, ChapterTable.TABLE, MangaCategoryTable.TABLE, CategoryTable.TABLE)
-                .build()
+                .build(),
         )
         .withGetResolver(LibraryMangaGetResolver.INSTANCE)
         .prepare()
 
+    fun getDuplicateLibraryManga(manga: Manga) = db.get()
+        .`object`(Manga::class.java)
+        .withQuery(
+            Query.builder()
+                .table(MangaTable.TABLE)
+                .where("${MangaTable.COL_FAVORITE} = 1 AND LOWER(${MangaTable.COL_TITLE}) = ? AND ${MangaTable.COL_SOURCE} != ?")
+                .whereArgs(
+                    manga.title.lowercase(),
+                    manga.source,
+                )
+                .limit(1)
+                .build(),
+        )
+        .prepare()
+
     fun getFavoriteMangas(sortByTitle: Boolean = true): PreparedGetListOfObjects<Manga> {
         var queryBuilder = Query.builder()
             .table(MangaTable.TABLE)
@@ -55,7 +72,7 @@ interface MangaQueries : DbProvider {
                 .table(MangaTable.TABLE)
                 .where("${MangaTable.COL_URL} = ? AND ${MangaTable.COL_SOURCE} = ?")
                 .whereArgs(url, sourceId)
-                .build()
+                .build(),
         )
         .prepare()
 
@@ -66,10 +83,21 @@ interface MangaQueries : DbProvider {
                 .table(MangaTable.TABLE)
                 .where("${MangaTable.COL_ID} = ?")
                 .whereArgs(id)
-                .build()
+                .build(),
         )
         .prepare()
 
+    fun getSourceIdsWithNonLibraryManga() = db.get()
+        .listOfObjects(SourceIdMangaCount::class.java)
+        .withQuery(
+            RawQuery.builder()
+                .query(getSourceIdsWithNonLibraryMangaQuery())
+                .observesTables(MangaTable.TABLE)
+                .build(),
+        )
+        .withGetResolver(SourceIdMangaCountGetResolver.INSTANCE)
+        .prepare()
+
     fun insertManga(manga: Manga) = db.put().`object`(manga).prepare()
 
     fun insertMangas(mangas: List<Manga>) = db.put().objects(mangas).prepare()
@@ -94,11 +122,6 @@ interface MangaQueries : DbProvider {
         .withPutResolver(MangaFlagsPutResolver(MangaTable.COL_VIEWER, Manga::viewer_flags))
         .prepare()
 
-    fun updateNextUpdated(manga: Manga) = db.put()
-        .`object`(manga)
-        .withPutResolver(MangaNextUpdatedPutResolver())
-        .prepare()
-
     fun updateLastUpdated(manga: Manga) = db.put()
         .`object`(manga)
         .withPutResolver(MangaLastUpdatedPutResolver())
@@ -123,13 +146,13 @@ interface MangaQueries : DbProvider {
 
     fun deleteMangas(mangas: List<Manga>) = db.delete().objects(mangas).prepare()
 
-    fun deleteMangasNotInLibrary() = db.delete()
+    fun deleteMangasNotInLibraryBySourceIds(sourceIds: List<Long>) = db.delete()
         .byQuery(
             DeleteQuery.builder()
                 .table(MangaTable.TABLE)
-                .where("${MangaTable.COL_FAVORITE} = ?")
+                .where("${MangaTable.COL_FAVORITE} = ? AND ${MangaTable.COL_SOURCE} IN (${Queries.placeholders(sourceIds.size)})")
-                .whereArgs(0)
+                .whereArgs(0, *sourceIds.toTypedArray())
-                .build()
+                .build(),
         )
         .prepare()
 
@@ -137,7 +160,7 @@ interface MangaQueries : DbProvider {
         .byQuery(
             DeleteQuery.builder()
                 .table(MangaTable.TABLE)
-                .build()
+                .build(),
         )
         .prepare()
 
@@ -147,7 +170,7 @@ interface MangaQueries : DbProvider {
             RawQuery.builder()
                 .query(getLastReadMangaQuery())
                 .observesTables(MangaTable.TABLE)
-                .build()
+                .build(),
         )
         .prepare()
 
@@ -157,7 +180,7 @@ interface MangaQueries : DbProvider {
             RawQuery.builder()
                 .query(getTotalChapterMangaQuery())
                 .observesTables(MangaTable.TABLE)
-                .build()
+                .build(),
         )
         .prepare()
 
@@ -167,7 +190,7 @@ interface MangaQueries : DbProvider {
             RawQuery.builder()
                 .query(getLatestChapterMangaQuery())
                 .observesTables(MangaTable.TABLE)
-                .build()
+                .build(),
         )
         .prepare()
 
@@ -177,7 +200,7 @@ interface MangaQueries : DbProvider {
             RawQuery.builder()
                 .query(getChapterFetchDateMangaQuery())
                 .observesTables(MangaTable.TABLE)
-                .build()
+                .build(),
         )
         .prepare()
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/queries/RawQueries.kt

@@ -1,5 +1,6 @@
 package eu.kanade.tachiyomi.data.database.queries
 
+import eu.kanade.tachiyomi.data.database.resolvers.SourceIdMangaCountGetResolver
 import eu.kanade.tachiyomi.data.database.tables.CategoryTable as Category
 import eu.kanade.tachiyomi.data.database.tables.ChapterTable as Chapter
 import eu.kanade.tachiyomi.data.database.tables.HistoryTable as History
@@ -7,21 +8,28 @@ import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable as MangaCateg
 import eu.kanade.tachiyomi.data.database.tables.MangaTable as Manga
 
 /**
- * Query to get the manga from the library, with their categories and unread count.
+ * Query to get the manga from the library, with their categories, read and unread count.
  */
 val libraryQuery =
     """
     SELECT M.*, COALESCE(MC.${MangaCategory.COL_CATEGORY_ID}, 0) AS ${Manga.COL_CATEGORY}
     FROM (
-        SELECT ${Manga.TABLE}.*, COALESCE(C.unread, 0) AS ${Manga.COL_UNREAD}
+        SELECT ${Manga.TABLE}.*, COALESCE(C.unreadCount, 0) AS ${Manga.COMPUTED_COL_UNREAD_COUNT}, COALESCE(R.readCount, 0) AS ${Manga.COMPUTED_COL_READ_COUNT}
         FROM ${Manga.TABLE}
         LEFT JOIN (
-            SELECT ${Chapter.COL_MANGA_ID}, COUNT(*) AS unread
+            SELECT ${Chapter.COL_MANGA_ID}, COUNT(*) AS unreadCount
             FROM ${Chapter.TABLE}
             WHERE ${Chapter.COL_READ} = 0
             GROUP BY ${Chapter.COL_MANGA_ID}
         ) AS C
         ON ${Manga.COL_ID} = C.${Chapter.COL_MANGA_ID}
+        LEFT JOIN (
+            SELECT ${Chapter.COL_MANGA_ID}, COUNT(*) AS readCount
+            FROM ${Chapter.TABLE}
+            WHERE ${Chapter.COL_READ} = 1
+            GROUP BY ${Chapter.COL_MANGA_ID}
+        ) AS R
+        ON ${Manga.COL_ID} = R.${Chapter.COL_MANGA_ID}
         WHERE ${Manga.COL_FAVORITE} = 1
         GROUP BY ${Manga.COL_ID}
         ORDER BY ${Manga.COL_TITLE}
@@ -142,3 +150,14 @@ fun getCategoriesForMangaQuery() =
     ${MangaCategory.TABLE}.${MangaCategory.COL_CATEGORY_ID}
     WHERE ${MangaCategory.COL_MANGA_ID} = ?
 """
+
+/** Query to get the list of sources in the database that have
+ * non-library manga, and how many
+ */
+fun getSourceIdsWithNonLibraryMangaQuery() =
+    """
+    SELECT ${Manga.COL_SOURCE}, COUNT(*) as ${SourceIdMangaCountGetResolver.COL_COUNT}
+    FROM ${Manga.TABLE}
+    WHERE ${Manga.COL_FAVORITE} = 0
+    GROUP BY ${Manga.COL_SOURCE}
+    """

app/src/main/java/eu/kanade/tachiyomi/data/database/queries/TrackQueries.kt

@@ -15,7 +15,7 @@ interface TrackQueries : DbProvider {
         .withQuery(
             Query.builder()
                 .table(TrackTable.TABLE)
-                .build()
+                .build(),
         )
         .prepare()
 
@@ -26,7 +26,7 @@ interface TrackQueries : DbProvider {
                 .table(TrackTable.TABLE)
                 .where("${TrackTable.COL_MANGA_ID} = ?")
                 .whereArgs(manga.id)
-                .build()
+                .build(),
         )
         .prepare()
 
@@ -40,7 +40,7 @@ interface TrackQueries : DbProvider {
                 .table(TrackTable.TABLE)
                 .where("${TrackTable.COL_MANGA_ID} = ? AND ${TrackTable.COL_SYNC_ID} = ?")
                 .whereArgs(manga.id, sync.id)
-                .build()
+                .build(),
         )
         .prepare()
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterBackupPutResolver.kt

@@ -29,6 +29,6 @@ class ChapterBackupPutResolver : PutResolver<Chapter>() {
         contentValuesOf(
             ChapterTable.COL_READ to chapter.read,
             ChapterTable.COL_BOOKMARK to chapter.bookmark,
-            ChapterTable.COL_LAST_PAGE_READ to chapter.last_page_read
+            ChapterTable.COL_LAST_PAGE_READ to chapter.last_page_read,
         )
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterKnownBackupPutResolver.kt

@@ -29,6 +29,6 @@ class ChapterKnownBackupPutResolver : PutResolver<Chapter>() {
         contentValuesOf(
             ChapterTable.COL_READ to chapter.read,
             ChapterTable.COL_BOOKMARK to chapter.bookmark,
-            ChapterTable.COL_LAST_PAGE_READ to chapter.last_page_read
+            ChapterTable.COL_LAST_PAGE_READ to chapter.last_page_read,
         )
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterProgressPutResolver.kt

@@ -29,6 +29,6 @@ class ChapterProgressPutResolver : PutResolver<Chapter>() {
         contentValuesOf(
             ChapterTable.COL_READ to chapter.read,
             ChapterTable.COL_BOOKMARK to chapter.bookmark,
-            ChapterTable.COL_LAST_PAGE_READ to chapter.last_page_read
+            ChapterTable.COL_LAST_PAGE_READ to chapter.last_page_read,
         )
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterSourceOrderPutResolver.kt

@@ -27,6 +27,6 @@ class ChapterSourceOrderPutResolver : PutResolver<Chapter>() {
 
     fun mapToContentValues(chapter: Chapter) =
         contentValuesOf(
-            ChapterTable.COL_SOURCE_ORDER to chapter.source_order
+            ChapterTable.COL_SOURCE_ORDER to chapter.source_order,
         )
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/HistoryLastReadPutResolver.kt

@@ -24,7 +24,7 @@ class HistoryLastReadPutResolver : HistoryPutResolver() {
                 .table(updateQuery.table())
                 .where(updateQuery.where())
                 .whereArgs(updateQuery.whereArgs())
-                .build()
+                .build(),
         )
 
         cursor.use { putCursor ->
@@ -47,6 +47,6 @@ class HistoryLastReadPutResolver : HistoryPutResolver() {
 
     private fun mapToUpdateContentValues(history: History) =
         contentValuesOf(
-            HistoryTable.COL_LAST_READ to history.last_read
+            HistoryTable.COL_LAST_READ to history.last_read,
         )
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/LibraryMangaGetResolver.kt

@@ -16,8 +16,9 @@ class LibraryMangaGetResolver : DefaultGetResolver<LibraryManga>(), BaseMangaGet
         val manga = LibraryManga()
 
         mapBaseFromCursor(manga, cursor)
-        manga.unread = cursor.getInt(cursor.getColumnIndex(MangaTable.COL_UNREAD))
+        manga.unreadCount = cursor.getInt(cursor.getColumnIndexOrThrow(MangaTable.COMPUTED_COL_UNREAD_COUNT))
-        manga.category = cursor.getInt(cursor.getColumnIndex(MangaTable.COL_CATEGORY))
+        manga.category = cursor.getInt(cursor.getColumnIndexOrThrow(MangaTable.COL_CATEGORY))
+        manga.readCount = cursor.getInt(cursor.getColumnIndexOrThrow(MangaTable.COMPUTED_COL_READ_COUNT))
 
         return manga
     }

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaChapterGetResolver.kt

@@ -20,7 +20,7 @@ class MangaChapterGetResolver : DefaultGetResolver<MangaChapter>() {
         val manga = mangaGetResolver.mapFromCursor(cursor)
         val chapter = chapterGetResolver.mapFromCursor(cursor)
         manga.id = chapter.manga_id
-        manga.url = cursor.getString(cursor.getColumnIndex("mangaUrl"))
+        manga.url = cursor.getString(cursor.getColumnIndexOrThrow("mangaUrl"))
 
         return MangaChapter(manga, chapter)
     }

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaChapterHistoryGetResolver.kt

@@ -42,7 +42,7 @@ class MangaChapterHistoryGetResolver : DefaultGetResolver<MangaChapterHistory>()
 
         // Make certain column conflicts are dealt with
         manga.id = chapter.manga_id
-        manga.url = cursor.getString(cursor.getColumnIndex("mangaUrl"))
+        manga.url = cursor.getString(cursor.getColumnIndexOrThrow("mangaUrl"))
         chapter.id = history.chapter_id
 
         // Return result

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaCoverLastModifiedPutResolver.kt

@@ -27,6 +27,6 @@ class MangaCoverLastModifiedPutResolver : PutResolver<Manga>() {
 
     fun mapToContentValues(manga: Manga) =
         contentValuesOf(
-            MangaTable.COL_COVER_LAST_MODIFIED to manga.cover_last_modified
+            MangaTable.COL_COVER_LAST_MODIFIED to manga.cover_last_modified,
         )
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFavoritePutResolver.kt

@@ -27,6 +27,6 @@ class MangaFavoritePutResolver : PutResolver<Manga>() {
 
     fun mapToContentValues(manga: Manga) =
         contentValuesOf(
-            MangaTable.COL_FAVORITE to manga.favorite
+            MangaTable.COL_FAVORITE to manga.favorite,
         )
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFlagsPutResolver.kt

@@ -28,6 +28,6 @@ class MangaFlagsPutResolver(private val colName: String, private val fieldGetter
 
     fun mapToContentValues(manga: Manga) =
         contentValuesOf(
-            colName to fieldGetter.get(manga)
+            colName to fieldGetter.get(manga),
         )
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaLastUpdatedPutResolver.kt

@@ -27,6 +27,6 @@ class MangaLastUpdatedPutResolver : PutResolver<Manga>() {
 
     fun mapToContentValues(manga: Manga) =
         contentValuesOf(
-            MangaTable.COL_LAST_UPDATE to manga.last_update
+            MangaTable.COL_LAST_UPDATE to manga.last_update,
         )
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaNextUpdatedPutResolver.kt

@@ -1,31 +0,0 @@
-package eu.kanade.tachiyomi.data.database.resolvers
-
-import androidx.core.content.contentValuesOf
-import com.pushtorefresh.storio.sqlite.StorIOSQLite
-import com.pushtorefresh.storio.sqlite.operations.put.PutResolver
-import com.pushtorefresh.storio.sqlite.operations.put.PutResult
-import com.pushtorefresh.storio.sqlite.queries.UpdateQuery
-import eu.kanade.tachiyomi.data.database.inTransactionReturn
-import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.database.tables.MangaTable
-
-class MangaNextUpdatedPutResolver : PutResolver<Manga>() {
-
-    override fun performPut(db: StorIOSQLite, manga: Manga) = db.inTransactionReturn {
-        val updateQuery = mapToUpdateQuery(manga)
-        val contentValues = mapToContentValues(manga)
-
-        val numberOfRowsUpdated = db.lowLevel().update(updateQuery, contentValues)
-        PutResult.newUpdateResult(numberOfRowsUpdated, updateQuery.table())
-    }
-
-    fun mapToUpdateQuery(manga: Manga) = UpdateQuery.builder()
-        .table(MangaTable.TABLE)
-        .where("${MangaTable.COL_ID} = ?")
-        .whereArgs(manga.id)
-        .build()
-
-    fun mapToContentValues(manga: Manga) = contentValuesOf(
-        MangaTable.COL_NEXT_UPDATE to manga.next_update
-    )
-}

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaTitlePutResolver.kt

@@ -27,6 +27,6 @@ class MangaTitlePutResolver : PutResolver<Manga>() {
 
     fun mapToContentValues(manga: Manga) =
         contentValuesOf(
-            MangaTable.COL_TITLE to manga.title
+            MangaTable.COL_TITLE to manga.title,
         )
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/SourceIdMangaCountGetResolver.kt

@@ -0,0 +1,23 @@
+package eu.kanade.tachiyomi.data.database.resolvers
+
+import android.annotation.SuppressLint
+import android.database.Cursor
+import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
+import eu.kanade.tachiyomi.data.database.models.SourceIdMangaCount
+import eu.kanade.tachiyomi.data.database.tables.MangaTable
+
+class SourceIdMangaCountGetResolver : DefaultGetResolver<SourceIdMangaCount>() {
+
+    companion object {
+        val INSTANCE = SourceIdMangaCountGetResolver()
+        const val COL_COUNT = "manga_count"
+    }
+
+    @SuppressLint("Range")
+    override fun mapFromCursor(cursor: Cursor): SourceIdMangaCount {
+        val sourceID = cursor.getLong(cursor.getColumnIndexOrThrow(MangaTable.COL_SOURCE))
+        val count = cursor.getInt(cursor.getColumnIndexOrThrow(COL_COUNT))
+
+        return SourceIdMangaCount(sourceID, count)
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/data/database/tables/ChapterTable.kt

@@ -62,4 +62,7 @@ object ChapterTable {
 
     val addScanlator: String
         get() = "ALTER TABLE $TABLE ADD COLUMN $COL_SCANLATOR TEXT DEFAULT NULL"
+
+    val fixDateUploadIfNeeded: String
+        get() = "UPDATE $TABLE SET $COL_DATE_UPLOAD = $COL_DATE_FETCH WHERE $COL_DATE_UPLOAD = 0"
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/tables/MangaTable.kt

@@ -28,6 +28,7 @@ object MangaTable {
 
     const val COL_LAST_UPDATE = "last_update"
 
+    // Not actually used anymore
     const val COL_NEXT_UPDATE = "next_update"
 
     const val COL_DATE_ADDED = "date_added"
@@ -38,12 +39,15 @@ object MangaTable {
 
     const val COL_CHAPTER_FLAGS = "chapter_flags"
 
-    const val COL_UNREAD = "unread"
-
     const val COL_CATEGORY = "category"
 
     const val COL_COVER_LAST_MODIFIED = "cover_last_modified"
 
+    // Not an actual value but computed when created
+    const val COMPUTED_COL_UNREAD_COUNT = "unread_count"
+
+    const val COMPUTED_COL_READ_COUNT = "read_count"
+
     val createTableQuery: String
         get() =
             """CREATE TABLE $TABLE(

app/src/main/java/eu/kanade/tachiyomi/data/database/tables/TrackTable.kt

@@ -73,7 +73,7 @@ object TrackTable {
             |INSERT INTO $TABLE($COL_ID,$COL_MANGA_ID,$COL_SYNC_ID,$COL_MEDIA_ID,$COL_LIBRARY_ID,$COL_TITLE,$COL_LAST_CHAPTER_READ,$COL_TOTAL_CHAPTERS,$COL_STATUS,$COL_SCORE,$COL_TRACKING_URL,$COL_START_DATE,$COL_FINISH_DATE)
             |SELECT $COL_ID,$COL_MANGA_ID,$COL_SYNC_ID,$COL_MEDIA_ID,$COL_LIBRARY_ID,$COL_TITLE,$COL_LAST_CHAPTER_READ,$COL_TOTAL_CHAPTERS,$COL_STATUS,$COL_SCORE,$COL_TRACKING_URL,$COL_START_DATE,$COL_FINISH_DATE
             |FROM ${TABLE}_tmp
-        """.trimMargin()
+            """.trimMargin()
 
     val dropTempTable: String
         get() = "DROP TABLE ${TABLE}_tmp"

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

@@ -27,7 +27,7 @@ class DownloadCache(
     private val context: Context,
     private val provider: DownloadProvider,
     private val sourceManager: SourceManager,
-    private val preferences: PreferencesHelper = Injekt.get()
+    private val preferences: PreferencesHelper = Injekt.get(),
 ) {
 
     /**
@@ -143,7 +143,7 @@ class DownloadCache(
             mangaDirs.values.forEach { mangaDir ->
                 val chapterDirs = mangaDir.dir.listFiles()
                     .orEmpty()
-                    .mapNotNull { it.name }
+                    .mapNotNull { it.name?.replace(".cbz", "") }
                     .toHashSet()
 
                 mangaDir.files = chapterDirs
@@ -236,7 +236,7 @@ class DownloadCache(
      */
     private class RootDirectory(
         val dir: UniFile,
-        var files: Map<Long, SourceDirectory> = hashMapOf()
+        var files: Map<Long, SourceDirectory> = hashMapOf(),
     )
 
     /**
@@ -244,7 +244,7 @@ class DownloadCache(
      */
     private class SourceDirectory(
         val dir: UniFile,
-        var files: Map<String, MangaDirectory> = hashMapOf()
+        var files: Map<String, MangaDirectory> = hashMapOf(),
     )
 
     /**
@@ -252,7 +252,7 @@ class DownloadCache(
      */
     private class MangaDirectory(
         val dir: UniFile,
-        var files: Set<String> = hashSetOf()
+        var files: Set<String> = hashSetOf(),
     )
 
     /**

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

@@ -14,8 +14,9 @@ import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.util.lang.launchIO
+import eu.kanade.tachiyomi.util.system.logcat
+import logcat.LogPriority
 import rx.Observable
-import timber.log.Timber
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -29,7 +30,7 @@ import uy.kohesive.injekt.injectLazy
  */
 class DownloadManager(
     private val context: Context,
-    private val db: DatabaseHelper = Injekt.get()
+    private val db: DatabaseHelper = Injekt.get(),
 ) {
 
     private val sourceManager: SourceManager by injectLazy()
@@ -38,7 +39,7 @@ class DownloadManager(
     /**
      * Downloads provider, used to retrieve the folders where the chapters are or should be stored.
      */
-    private val provider = DownloadProvider(context)
+    val provider = DownloadProvider(context)
 
     /**
      * Cache of downloaded chapters.
@@ -326,19 +327,23 @@ class DownloadManager(
      */
     fun renameChapter(source: Source, manga: Manga, oldChapter: Chapter, newChapter: Chapter) {
         val oldNames = provider.getValidChapterDirNames(oldChapter)
-        val newName = provider.getChapterDirName(newChapter)
         val mangaDir = provider.getMangaDir(manga, source)
 
         // Assume there's only 1 version of the chapter name formats present
-        val oldFolder = oldNames.asSequence()
+        val oldDownload = oldNames.asSequence()
             .mapNotNull { mangaDir.findFile(it) }
-            .firstOrNull()
+            .firstOrNull() ?: return
 
-        if (oldFolder?.renameTo(newName) == true) {
+        var newName = provider.getChapterDirName(newChapter)
+        if (oldDownload.isFile && oldDownload.name?.endsWith(".cbz") == true) {
+            newName += ".cbz"
+        }
+
+        if (oldDownload.renameTo(newName)) {
             cache.removeChapter(oldChapter, manga)
             cache.addChapter(newName, mangaDir, manga)
         } else {
-            Timber.e("Could not rename downloaded chapter: %s.", oldNames.joinToString())
+            logcat(LogPriority.ERROR) { "Could not rename downloaded chapter: ${oldNames.joinToString()}." }
         }
     }
 

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

@@ -93,18 +93,19 @@ internal class DownloadNotifier(private val context: Context) {
                 addAction(
                     R.drawable.ic_pause_24dp,
                     context.getString(R.string.action_pause),
-                    NotificationReceiver.pauseDownloadsPendingBroadcast(context)
+                    NotificationReceiver.pauseDownloadsPendingBroadcast(context),
                 )
             }
 
             val downloadingProgressText = context.getString(
                 R.string.chapter_downloading_progress,
                 download.downloadedImages,
-                download.pages!!.size
+                download.pages!!.size,
             )
 
             if (preferences.hideNotificationContent()) {
                 setContentTitle(downloadingProgressText)
+                setContentText(null)
             } else {
                 val title = download.manga.title.chop(15)
                 val quotedTitle = Pattern.quote(title)
@@ -137,13 +138,13 @@ internal class DownloadNotifier(private val context: Context) {
             addAction(
                 R.drawable.ic_play_arrow_24dp,
                 context.getString(R.string.action_resume),
-                NotificationReceiver.resumeDownloadsPendingBroadcast(context)
+                NotificationReceiver.resumeDownloadsPendingBroadcast(context),
             )
             // Clear action
             addAction(
                 R.drawable.ic_close_24dp,
                 context.getString(R.string.action_cancel_all),
-                NotificationReceiver.clearDownloadsPendingBroadcast(context)
+                NotificationReceiver.clearDownloadsPendingBroadcast(context),
             )
 
             show(Notifications.ID_DOWNLOAD_CHAPTER_PROGRESS)
@@ -183,16 +184,19 @@ internal class DownloadNotifier(private val context: Context) {
      * Called when the downloader receives a warning.
      *
      * @param reason the text to show.
+     * @param timeout duration after which to automatically dismiss the notification.
+     * Only works on Android 8+.
      */
-    fun onWarning(reason: String) {
+    fun onWarning(reason: String, timeout: Long? = null) {
         with(errorNotificationBuilder) {
             setContentTitle(context.getString(R.string.download_notifier_downloader_title))
             setContentText(reason)
-            setSmallIcon(android.R.drawable.stat_sys_warning)
+            setSmallIcon(R.drawable.ic_warning_white_24dp)
             setAutoCancel(true)
             clearActions()
             setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context))
             setProgress(0, 0, false)
+            timeout?.let { setTimeoutAfter(it) }
 
             show(Notifications.ID_DOWNLOAD_CHAPTER_ERROR)
         }
@@ -208,15 +212,14 @@ internal class DownloadNotifier(private val context: Context) {
      * @param error string containing error information.
      * @param chapter string containing chapter title.
      */
-    fun onError(error: String? = null, chapter: String? = null) {
+    fun onError(error: String? = null, chapter: String? = null, mangaTitle: String? = null) {
         // Create notification
         with(errorNotificationBuilder) {
             setContentTitle(
-                chapter
+                mangaTitle?.plus(": $chapter") ?: context.getString(R.string.download_notifier_downloader_title),
-                    ?: context.getString(R.string.download_notifier_downloader_title)
             )
             setContentText(error ?: context.getString(R.string.download_notifier_unknown_error))
-            setSmallIcon(android.R.drawable.stat_sys_warning)
+            setSmallIcon(R.drawable.ic_warning_white_24dp)
             clearActions()
             setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context))
             setProgress(0, 0, false)

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

@@ -126,7 +126,7 @@ class DownloadPendingDeleter(context: Context) {
     @Serializable
     private data class Entry(
         val chapters: List<ChapterEntry>,
-        val manga: MangaEntry
+        val manga: MangaEntry,
     )
 
     /**
@@ -137,7 +137,7 @@ class DownloadPendingDeleter(context: Context) {
         val id: Long,
         val url: String,
         val name: String,
-        val scanlator: String? = null
+        val scanlator: String? = null,
     )
 
     /**
@@ -148,7 +148,7 @@ class DownloadPendingDeleter(context: Context) {
         val id: Long,
         val url: String,
         val title: String,
-        val source: Long
+        val source: Long,
     )
 
     /**

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

@@ -9,10 +9,11 @@ import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.util.storage.DiskUtil
+import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
-import timber.log.Timber
+import logcat.LogPriority
 import uy.kohesive.injekt.injectLazy
 
 /**
@@ -54,7 +55,7 @@ class DownloadProvider(private val context: Context) {
                 .createDirectory(getSourceDirName(source))
                 .createDirectory(getMangaDirName(manga))
         } catch (e: Throwable) {
-            Timber.e(e, "Invalid download directory")
+            logcat(LogPriority.ERROR, e) { "Invalid download directory" }
             throw Exception(context.getString(R.string.invalid_download_dir))
         }
     }
@@ -137,7 +138,7 @@ class DownloadProvider(private val context: Context) {
             when {
                 chapter.scanlator != null -> "${chapter.scanlator}_${chapter.name}"
                 else -> chapter.name
-            }
+            },
         )
     }
 
@@ -147,12 +148,16 @@ class DownloadProvider(private val context: Context) {
      * @param chapter the chapter to query.
      */
     fun getValidChapterDirNames(chapter: Chapter): List<String> {
+        val chapterName = getChapterDirName(chapter)
         return listOf(
-            getChapterDirName(chapter),
+            // Folder of images
+            chapterName,
+
+            // Archived chapters
+            "$chapterName.cbz",
 
-            // TODO: remove this
             // Legacy chapter directory name used in v0.9.2 and before
-            DiskUtil.buildValidFilename(chapter.name)
+            DiskUtil.buildValidFilename(chapter.name),
         )
     }
 }

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

@@ -15,11 +15,12 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.util.lang.plusAssign
 import eu.kanade.tachiyomi.util.lang.withUIContext
 import eu.kanade.tachiyomi.util.system.acquireWakeLock
+import eu.kanade.tachiyomi.util.system.isConnectedToWifi
 import eu.kanade.tachiyomi.util.system.isOnline
 import eu.kanade.tachiyomi.util.system.isServiceRunning
+import eu.kanade.tachiyomi.util.system.logcat
 import eu.kanade.tachiyomi.util.system.notification
 import eu.kanade.tachiyomi.util.system.toast
-import eu.kanade.tachiyomi.util.system.wifiManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -27,6 +28,7 @@ import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import logcat.LogPriority
 import ru.beryukhov.reactivenetwork.ReactiveNetwork
 import rx.subscriptions.CompositeSubscription
 import uy.kohesive.injekt.injectLazy
@@ -140,8 +142,9 @@ class DownloadService : Service() {
                     onNetworkStateChanged()
                 }
             }
-            .catch {
+            .catch { error ->
                 withUIContext {
+                    logcat(LogPriority.ERROR, error)
                     toast(R.string.download_queue_error)
                     stopSelf()
                 }
@@ -154,7 +157,7 @@ class DownloadService : Service() {
      */
     private fun onNetworkStateChanged() {
         if (isOnline()) {
-            if (preferences.downloadOnlyOverWifi() && !wifiManager.isWifiEnabled) {
+            if (preferences.downloadOnlyOverWifi() && !isConnectedToWifi()) {
                 stopDownloads(R.string.download_notifier_text_only_wifi)
             } else {
                 val started = downloadManager.startDownloads()
@@ -173,13 +176,17 @@ class DownloadService : Service() {
      * Listens to downloader status. Enables or disables the wake lock depending on the status.
      */
     private fun listenDownloaderState() {
-        subscriptions += downloadManager.runningRelay.subscribe { running ->
+        subscriptions += downloadManager.runningRelay
-            if (running) {
+            .doOnError {
-                wakeLock.acquireIfNeeded()
+                /* Swallow wakelock error */
-            } else {
+            }
-                wakeLock.releaseIfNeeded()
+            .subscribe { running ->
+                if (running) {
+                    wakeLock.acquireIfNeeded()
+                } else {
+                    wakeLock.releaseIfNeeded()
+                }
             }
-        }
     }
 
     /**

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

@@ -20,7 +20,7 @@ import uy.kohesive.injekt.injectLazy
  */
 class DownloadStore(
     context: Context,
-    private val sourceManager: SourceManager
+    private val sourceManager: SourceManager,
 ) {
 
     /**

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

@@ -11,7 +11,9 @@ import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.download.model.Download
 import eu.kanade.tachiyomi.data.download.model.DownloadQueue
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.source.SourceManager
+import eu.kanade.tachiyomi.source.UnmeteredSource
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.source.online.fetchAllImageUrlsFromPageList
@@ -19,18 +21,24 @@ import eu.kanade.tachiyomi.util.lang.RetryWithDelay
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.launchNow
 import eu.kanade.tachiyomi.util.lang.plusAssign
+import eu.kanade.tachiyomi.util.lang.withUIContext
 import eu.kanade.tachiyomi.util.storage.DiskUtil
 import eu.kanade.tachiyomi.util.storage.saveTo
 import eu.kanade.tachiyomi.util.system.ImageUtil
+import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.async
+import logcat.LogPriority
 import okhttp3.Response
 import rx.Observable
 import rx.android.schedulers.AndroidSchedulers
 import rx.schedulers.Schedulers
 import rx.subscriptions.CompositeSubscription
-import timber.log.Timber
 import uy.kohesive.injekt.injectLazy
+import java.io.BufferedOutputStream
 import java.io.File
+import java.util.zip.CRC32
+import java.util.zip.ZipEntry
+import java.util.zip.ZipOutputStream
 
 /**
  * This class is the one in charge of downloading chapters.
@@ -50,11 +58,13 @@ class Downloader(
     private val context: Context,
     private val provider: DownloadProvider,
     private val cache: DownloadCache,
-    private val sourceManager: SourceManager
+    private val sourceManager: SourceManager,
 ) {
 
     private val chapterCache: ChapterCache by injectLazy()
 
+    private val preferences: PreferencesHelper by injectLazy()
+
     /**
      * Store for persisting downloads across restarts.
      */
@@ -199,7 +209,7 @@ class Downloader(
                         downloadChapter(download).subscribeOn(Schedulers.io())
                     }
                 },
-                5
+                5,
             )
             .onBackpressureLatest()
             .observeOn(AndroidSchedulers.mainThread())
@@ -209,9 +219,9 @@ class Downloader(
                 },
                 { error ->
                     DownloadService.stop(context)
-                    Timber.e(error)
+                    logcat(LogPriority.ERROR, error)
                     notifier.onError(error.message)
-                }
+                },
             )
     }
 
@@ -262,7 +272,23 @@ class Downloader(
 
             // Start downloader if needed
             if (autoStart && wasEmpty) {
-                DownloadService.start(this@Downloader.context)
+                val queuedDownloads = queue.filter { it.source !is UnmeteredSource }.count()
+                val maxDownloadsFromSource = queue
+                    .groupBy { it.source }
+                    .filterKeys { it !is UnmeteredSource }
+                    .maxOf { it.value.size }
+                if (
+                    queuedDownloads > DOWNLOADS_QUEUED_WARNING_THRESHOLD ||
+                    maxDownloadsFromSource > CHAPTERS_PER_SOURCE_QUEUE_WARNING_THRESHOLD
+                ) {
+                    withUIContext {
+                        notifier.onWarning(
+                            context.getString(R.string.download_queue_size_warning),
+                            WARNING_NOTIF_TIMEOUT_MS,
+                        )
+                    }
+                }
+                DownloadService.start(context)
             }
         }
     }
@@ -278,7 +304,7 @@ class Downloader(
         val availSpace = DiskUtil.getAvailableStorageSpace(mangaDir)
         if (availSpace != -1L && availSpace < MIN_DISK_SPACE) {
             download.status = Download.State.ERROR
-            notifier.onError(context.getString(R.string.download_insufficient_space), download.chapter.name)
+            notifier.onError(context.getString(R.string.download_insufficient_space), download.chapter.name, download.manga.title)
             return@defer Observable.just(download)
         }
 
@@ -324,7 +350,7 @@ class Downloader(
             // If the page list threw, it will resume here
             .onErrorReturn { error ->
                 download.status = Download.State.ERROR
-                notifier.onError(error.message, download.chapter.name)
+                notifier.onError(error.message, download.chapter.name, download.manga.title)
                 download
             }
     }
@@ -457,7 +483,7 @@ class Downloader(
         download: Download,
         mangaDir: UniFile,
         tmpDir: UniFile,
-        dirname: String
+        dirname: String,
     ) {
         // Ensure that the chapter folder has all the images.
         val downloadedImages = tmpDir.listFiles().orEmpty().filterNot { it.name!!.endsWith(".tmp") }
@@ -470,13 +496,51 @@ class Downloader(
 
         // Only rename the directory if it's downloaded.
         if (download.status == Download.State.DOWNLOADED) {
-            tmpDir.renameTo(dirname)
+            if (preferences.saveChaptersAsCBZ().get()) {
+                archiveChapter(mangaDir, dirname, tmpDir)
+            } else {
+                tmpDir.renameTo(dirname)
+            }
             cache.addChapter(dirname, mangaDir, download.manga)
 
             DiskUtil.createNoMediaFile(tmpDir, context)
         }
     }
 
+    /**
+     * Archive the chapter pages as a CBZ.
+     */
+    private fun archiveChapter(
+        mangaDir: UniFile,
+        dirname: String,
+        tmpDir: UniFile,
+    ) {
+        val zip = mangaDir.createFile("$dirname.cbz.tmp")
+        ZipOutputStream(BufferedOutputStream(zip.openOutputStream())).use { zipOut ->
+            zipOut.setMethod(ZipEntry.STORED)
+
+            tmpDir.listFiles()?.forEach { img ->
+                img.openInputStream().use { input ->
+                    val data = input.readBytes()
+                    val size = img.length()
+                    val entry = ZipEntry(img.name).apply {
+                        val crc = CRC32().apply {
+                            update(data)
+                        }
+                        setCrc(crc.value)
+
+                        compressedSize = size
+                        setSize(size)
+                    }
+                    zipOut.putNextEntry(entry)
+                    zipOut.write(data)
+                }
+            }
+        }
+        zip.renameTo("$dirname.cbz")
+        tmpDir.delete()
+    }
+
     /**
      * Completes a download. This method is called in the main thread.
      */
@@ -500,8 +564,11 @@ class Downloader(
 
     companion object {
         const val TMP_DIR_SUFFIX = "_tmp"
-
+        const val WARNING_NOTIF_TIMEOUT_MS = 30_000L
-        // Arbitrary minimum required space to start a download: 50 MB
+        const val CHAPTERS_PER_SOURCE_QUEUE_WARNING_THRESHOLD = 15
-        const val MIN_DISK_SPACE = 50 * 1024 * 1024
+        private const val DOWNLOADS_QUEUED_WARNING_THRESHOLD = 30
     }
 }
+
+// Arbitrary minimum required space to start a download: 200 MB
+private const val MIN_DISK_SPACE = 200L * 1024 * 1024

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

@@ -11,7 +11,7 @@ import java.util.concurrent.CopyOnWriteArrayList
 
 class DownloadQueue(
     private val store: DownloadStore,
-    private val queue: MutableList<Download> = CopyOnWriteArrayList()
+    private val queue: MutableList<Download> = CopyOnWriteArrayList(),
 ) : List<Download> by queue {
 
     private val statusSubject = PublishSubject.create<Download>()

app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt

@@ -8,9 +8,10 @@ import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.Worker
 import androidx.work.WorkerParameters
-import eu.kanade.tachiyomi.data.preference.CHARGING
+import eu.kanade.tachiyomi.data.preference.DEVICE_CHARGING
+import eu.kanade.tachiyomi.data.preference.DEVICE_ONLY_ON_WIFI
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.data.preference.UNMETERED_NETWORK
+import eu.kanade.tachiyomi.util.system.isConnectedToWifi
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.util.concurrent.TimeUnit
@@ -19,6 +20,11 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet
     Worker(context, workerParams) {
 
     override fun doWork(): Result {
+        val preferences = Injekt.get<PreferencesHelper>()
+        if (requiresWifiConnection(preferences) && !context.isConnectedToWifi()) {
+            Result.failure()
+        }
+
         return if (LibraryUpdateService.start(context)) {
             Result.success()
         } else {
@@ -33,24 +39,17 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet
             val preferences = Injekt.get<PreferencesHelper>()
             val interval = prefInterval ?: preferences.libraryUpdateInterval().get()
             if (interval > 0) {
-                val restrictions = preferences.libraryUpdateRestriction().get()
+                val restrictions = preferences.libraryUpdateDeviceRestriction().get()
-                val acRestriction = CHARGING in restrictions
-                val wifiRestriction = if (UNMETERED_NETWORK in restrictions) {
-                    NetworkType.UNMETERED
-                } else {
-                    NetworkType.CONNECTED
-                }
-
                 val constraints = Constraints.Builder()
-                    .setRequiredNetworkType(wifiRestriction)
+                    .setRequiredNetworkType(NetworkType.CONNECTED)
-                    .setRequiresCharging(acRestriction)
+                    .setRequiresCharging(DEVICE_CHARGING in restrictions)
                     .build()
 
                 val request = PeriodicWorkRequestBuilder<LibraryUpdateJob>(
                     interval.toLong(),
                     TimeUnit.HOURS,
                     10,
-                    TimeUnit.MINUTES
+                    TimeUnit.MINUTES,
                 )
                     .addTag(TAG)
                     .setConstraints(constraints)
@@ -61,5 +60,10 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet
                 WorkManager.getInstance(context).cancelAllWorkByTag(TAG)
             }
         }
+
+        fun requiresWifiConnection(preferences: PreferencesHelper): Boolean {
+            val restrictions = preferences.libraryUpdateDeviceRestriction().get()
+            return DEVICE_ONLY_ON_WIFI in restrictions
+        }
     }
 }