Release v1.8.4

Cherry picking fixes
Fix trash group by tracking code
2022-07-13 12:02:59 -04:00 · 2022-07-13 11:48:48 -04:00 · 2022-07-13 11:48:26 -04:00 · 2022-07-13 11:41:01 -04:00 · 2022-07-13 11:40:52 -04:00 · 2022-07-13 11:40:44 -04:00
1160 changed files with 67749 additions and 47945 deletions
@@ -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
@@ -3,7 +3,7 @@
 I acknowledge that:

 - I have updated:
-  - To the latest version of the app (stable is v1.7.0)
+  - To the latest version of the app (stable is v1.8.4)
  - 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
@@ -1,44 +0,0 @@
---
-name: "🐞 Bug report"
-about: Report a bug
-title: "[Bug] <Write short description here>"
-labels: "bug"
---
-
-**PLEASE READ THIS**
-
-I acknowledge that:
-
- I have updated:
-  - To the latest version of the app (stable is v1.7.0)
-  - 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
- I have searched the existing issues and this is new ticket **NOT** a duplicate or related to another open issue
- I will fill out the title and the information in this template
-
-Note that the issue will be automatically closed if you do not fill out the title or requested information.
-
-**DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT**
-
---
-
-## Device information
-* Tachiyomi version: ?
-* Android version: ?
-* Device: ?
-
-## Steps to reproduce
-1. First step
-2. Second step
-
-### Expected behavior
-This should happen.
-
-### Actual behavior
-This happened instead.
-
-## Other details
-Additional details and attachments.
-
-If you're experiencing crashes, share the crash logs from More → Settings → Advanced → Dump crash logs.
@@ -1,8 +1,11 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Tachiyomi help website
+  - name: ⚠️ Extension/source issue
+    url: https://github.com/tachiyomiorg/tachiyomi-extensions/issues/new/choose
+    about: Issues and requests for extensions and sources should be opened in the tachiyomi-extensions repository instead
+  - name: 📦 Tachiyomi extensions
+    url: https://tachiyomi.org/extensions
+    about: List of all available extensions with download links
+  - name: 🖥️ Tachiyomi website
    url: https://tachiyomi.org/help/
-    about: Common questions are answered here.
-  - name: Tachiyomi extensions GitHub repository
-    url: https://github.com/tachiyomiorg/tachiyomi-extensions
-    about: Issues about an extension/source/catalogue should be opened here instead.
+    about: Guides, troubleshooting, and answers to common questions
@@ -1,29 +0,0 @@
---
-name: "🌟 Feature request"
-about: Suggest a feature to improve Tachiyomi
-title: "[Feature Request] <Write short description here>"
-labels: "feature"
---
-
-**PLEASE READ THIS**
-
-I acknowledge that:
-
- I have updated:
-  - To the latest version of the app (stable is v1.7.0)
-  - All extensions
- If this is an issue with an extension, that I should be opening an issue in https://github.com/tachiyomiorg/tachiyomi-extensions
- I have searched the existing issues and this is new ticket **NOT** a duplicate or related to another open issue
- I will fill out the title and the information in this template
-
-Note that the issue will be automatically closed if you do not fill out the title or requested information.
-
-**DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT**
-
---
-
-## Why/User Benefit/User Problem
-(explain why this feature should be added)
-
-## What/Requirements
-(explain how this feature would behave)
@@ -0,0 +1,106 @@
+name: 🐞 Issue report
+description: Report an issue in Tachiyomi
+labels: [Bug]
+body:
+
+  - type: textarea
+    id: reproduce-steps
+    attributes:
+      label: Steps to reproduce
+      description: Provide an example of the issue.
+      placeholder: |
+        Example:
+          1. First step
+          2. Second step
+          3. Issue here
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected behavior
+      description: Explain what you should expect to happen.
+      placeholder: |
+        Example:
+          "This should happen..."
+    validations:
+      required: true
+
+  - type: textarea
+    id: actual-behavior
+    attributes:
+      label: Actual behavior
+      description: Explain what actually happens.
+      placeholder: |
+        Example:
+          "This happened instead..."
+    validations:
+      required: true
+
+  - type: textarea
+    id: crash-logs
+    attributes:
+      label: Crash logs
+      description: |
+        If you're experiencing crashes, share the crash logs from **More → Settings → Advanced** then press **Dump crash logs**.
+      placeholder: |
+        You can paste the crash logs in pure text or upload it as an attachment.
+
+  - type: input
+    id: tachiyomi-version
+    attributes:
+      label: Tachiyomi version
+      description: You can find your Tachiyomi version in **More → About**.
+      placeholder: |
+        Example: "1.8.4"
+    validations:
+      required: true
+
+  - type: input
+    id: android-version
+    attributes:
+      label: Android version
+      description: You can find this somewhere in your Android settings.
+      placeholder: |
+        Example: "Android 11"
+    validations:
+      required: true
+
+  - type: input
+    id: device
+    attributes:
+      label: Device
+      description: List your device and model.
+      placeholder: |
+        Example: "Google Pixel 5"
+    validations:
+      required: true
+
+  - type: textarea
+    id: other-details
+    attributes:
+      label: Other details
+      placeholder: |
+        Additional details and attachments.
+
+  - type: checkboxes
+    id: acknowledgements
+    attributes:
+      label: Acknowledgements
+      description: Read this carefully, we will close and ignore your issue if you skimmed through this.
+      options:
+        - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
+          required: true
+        - label: I have written a short but informative title.
+          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 tried the [troubleshooting guide](https://tachiyomi.org/help/guides/troubleshooting/).
+          required: true
+        - label: I have updated the app to version **[1.8.4](https://github.com/jobobby04/tachiyomisy/releases/latest)**.
+          required: true
+        - label: I have updated all installed extensions.
+          required: true
+        - label: I will fill out all of the requested information in this form.
+          required: true
@@ -0,0 +1,39 @@
+name: ⭐ Feature request
+description: Suggest a feature to improve Tachiyomi
+labels: [Feature request]
+body:
+
+  - type: textarea
+    id: feature-description
+    attributes:
+      label: Describe your suggested feature
+      description: How can Tachiyomi be improved?
+      placeholder: |
+        Example:
+          "It should work like this..."
+    validations:
+      required: true
+
+  - type: textarea
+    id: other-details
+    attributes:
+      label: Other details
+      placeholder: |
+        Additional details and attachments.
+
+  - type: checkboxes
+    id: acknowledgements
+    attributes:
+      label: Acknowledgements
+      description: Read this carefully, we will close and ignore your issue if you skimmed through this.
+      options:
+        - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
+          required: true
+        - label: I have written a short but informative title.
+          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 **[1.8.4](https://github.com/jobobby04/tachiyomisy/releases/latest)**.
+          required: true
+        - label: I will fill out all of the requested information in this form.
+          required: true
@@ -1,8 +0,0 @@
---
-name: "Extension/source/catalogue issue"
-about: "Do not open an issue here. See https://github.com/tachiyomiorg/tachiyomi-extensions"
-title: "THIS ISSUE IS IN THE WRONG REPO; SEE https://github.com/tachiyomiorg/tachiyomi-extensions"
-labels: "catalog, invalid"
---
-
-DO NOT OPEN AN ISSUE IN THIS REPO. SEE https://github.com/tachiyomiorg/tachiyomi-extensions
@@ -0,0 +1,12 @@
+<!--
+  Please include a summary of the change and which issue is fixed.
+  Also make sure you've tested your code and also done a self-review of it.
+  Don't forget to check all base themes and tablet mode for relevant changes.
+  
+  If your changes are visual, please provide images below:
+
+### Images
+| Image 1 | Image 2 |
+| ------- | ------- |
+| ![](https://github.githubassets.com/images/modules/logos_page/Octocat.png) | ![](https://github.githubassets.com/images/modules/logos_page/Octocat.png) |
+-->
@@ -2,5 +2,4 @@ org.gradle.daemon=false
 org.gradle.jvmargs=-Xmx5120m
 org.gradle.workers.max=2

-kotlin.incremental=false
-kotlin.compiler.execution.strategy=in-process
+kotlin.incremental=false
@@ -20,7 +20,6 @@ jobs:
  preview:
    name: Build app preview
    needs: check_wrapper
-    if: "!startsWith(github.event.head_commit.message, '[SKIP CI]')"
    runs-on: ubuntu-latest

    steps:
@@ -28,7 +27,7 @@ jobs:
        uses: actions/checkout@v2

      - name: TAG - Bump version and push tag
-        uses: anothrNick/github-tag-action@1.17.2
+        uses: anothrNick/github-tag-action@1.39.0
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          WITH_V: true
@@ -20,7 +20,6 @@ jobs:
  build:
    name: Build app
    needs: check_wrapper
-    if: "!startsWith(github.event.head_commit.message, '[SKIP CI]')"
    runs-on: ubuntu-latest

    steps:
@@ -32,10 +31,11 @@ jobs:
      - name: Clone repo
        uses: actions/checkout@v2

-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
        with:
-          java-version: 1.8
+          java-version: 11
+          distribution: adopt

      - name: Copy CI gradle.properties
        run: |
@@ -53,12 +53,9 @@ jobs:
          write-mode: overwrite # optional, default is preserve

      - name: Build app
-        uses: eskatos/gradle-command-action@v1
+        uses: gradle/gradle-command-action@v2
        with:
-          arguments: assembleRelease --stacktrace
-          wrapper-cache-enabled: true
-          dependencies-cache-enabled: true
-          configuration-cache-enabled: true
+          arguments: assembleStandardRelease --stacktrace

      - name: Sign APK
        uses: r0adkll/sign-android-release@v1
@@ -16,7 +16,6 @@ jobs:
  build:
    name: Build app
    needs: check_wrapper
-    if: "!startsWith(github.event.head_commit.message, '[SKIP CI]')"
    runs-on: ubuntu-latest

    steps:
@@ -28,10 +27,11 @@ jobs:
      - name: Clone repo
        uses: actions/checkout@v2

-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
        with:
-          java-version: 1.8
+          java-version: 11
+          distribution: adopt

      - name: Copy CI gradle.properties
        run: |
@@ -39,12 +39,10 @@ jobs:
          cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties

      - name: Build app
-        uses: eskatos/gradle-command-action@v1
+        uses: gradle/gradle-command-action@v2
        with:
-          arguments: assembleStandardDebug
-          wrapper-cache-enabled: true
-          dependencies-cache-enabled: true
-          configuration-cache-enabled: true
+          arguments: assembleDevDebug
+
      - name: Upload APK
        uses: actions/upload-artifact@v2
        with:
@@ -1,36 +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": "title",
-                "regex": ".*THIS ISSUE IS IN THE WRONG REPO.*",
-                "message": "It was not opened in the correct repo, as the template mentioned."
-              },
-              {
-                "type": "title",
-                "regex": ".*<Write short description here>*",
-                "message": "The description in the title was not filled out."
-              },
-              {
-                "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."
-              }
-            ]
@@ -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.0
+        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"
+              }
+            ]
@@ -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'
-          pr-lock-inactive-days: '2'
+          issue-inactive-days: '2'
+          pr-inactive-days: '2'
@@ -1,76 +1,126 @@
-# Code of Conduct
+# Contributor Covenant Code of Conduct

 ## Our Pledge

-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.

 ## Our Standards

-Examples of behavior that contributes to creating a positive environment
-include:
+Examples of behavior that contributes to a positive environment for our
+community include:

-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community

-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:

-* The use of sexualized language or imagery and unwelcome sexual attention or
- advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic
- address, without explicit permission
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
- professional setting
+  professional setting

-## Our Responsibilities
+## Enforcement Responsibilities

-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
+Community moderators are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.

-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
+Community moderators have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.

 ## Scope

-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.

 ## Enforcement

 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at the Tachiyomi [Discord server](https://discord.gg/tachiyomi). All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
+reported to the community moderators responsible for enforcement at
+the [Tachiyomi Discord server](https://discord.gg/tachiyomi).
+All complaints will be reviewed and investigated promptly and fairly.

-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
+All community moderators are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community moderators will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community moderators, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.

 ## Attribution

-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org/),
+version 2.1, available at
+[v2.1](https://www.contributor-covenant.org/version/2/1/code_of_conduct.html).

-[homepage]: https://www.contributor-covenant.org
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).

-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq
+For answers to common questions about this code of conduct, see the FAQ at
+[FAQ](https://www.contributor-covenant.org/faq). Translations are available
+at [translations](https://www.contributor-covenant.org/translations).
@@ -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/github/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:
@@ -11,10 +11,10 @@ Tachiyomi is a free and open source manga reader for Android 6.0 and above. This
 ## Features

 Features of Tachiyomi(original) include:
-* Online reading from [a variety of sources](https://github.com/tachiyomiorg/tachiyomi-extensions)
-* Local reading of downloaded manga
+* Online reading from a variety of sources
+* Local reading of downloaded content
 * A configurable reader with multiple viewers, reading directions and other settings.
-* [MyAnimeList](https://myanimelist.net/), [AniList](https://anilist.co/), [Kitsu](https://kitsu.io/), [Shikimori](https://shikimori.one), and [Bangumi](https://bgm.tv/) support
+* Tracker support: [MyAnimeList](https://myanimelist.net/), [AniList](https://anilist.co/), [Kitsu](https://kitsu.io/), [Shikimori](https://shikimori.one), and [Bangumi](https://bgm.tv/)
 * Categories to organize your library
 * Light and dark themes
 * Schedule updating your library for new chapters
@@ -84,13 +84,12 @@ Please make sure to read the full guidelines. Your issue may be closed without w

 <details><summary>Bugs</summary>

-* Include version (More > About > Version)
+* Include version (More → About → Version)
 * If not latest, try updating, it may have already been solved
 * Preview version is equal to the number of commits as seen in the main page
 * Include steps to reproduce (if not obvious from description)
 * Include screenshot (if needed)
 * If it could be device-dependent, try reproducing on another device (if possible)
-* For large logs use http://pastebin.com/ (or similar)
 * Don't group unrelated requests into one issue

 DO: https://github.com/tachiyomiorg/tachiyomi/issues/24 https://github.com/tachiyomiorg/tachiyomi/issues/71
@@ -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")
@@ -11,13 +7,10 @@ plugins {
    kotlin("plugin.parcelize")
    kotlin("plugin.serialization")
    id("com.github.zellius.shortcut-helper")
-    // Realm (EH)
-    kotlin("kapt")
-    id("realm-android")
 }

-if (!gradle.startParameter.taskRequests.toString().contains("Debug")) {
-    apply(plugin = "com.google.gms.google-services")
+if (gradle.startParameter.taskRequests.toString().contains("Standard")) {
+    apply<com.google.gms.googleservices.GoogleServicesPlugin>()
    // Firebase Crashlytics
    apply(plugin = "com.google.firebase.crashlytics")
 }
@@ -25,32 +18,25 @@ if (!gradle.startParameter.taskRequests.toString().contains("Debug")) {
 shortcutHelper.setFilePath("./shortcuts.xml")

 android {
-    compileSdkVersion(AndroidConfig.compileSdk)
-    buildToolsVersion(AndroidConfig.buildTools)
+    compileSdk = AndroidConfig.compileSdk
    ndkVersion = AndroidConfig.ndk

    defaultConfig {
        applicationId = "eu.kanade.tachiyomi.sy"
-        minSdkVersion(AndroidConfig.minSdk)
-        targetSdkVersion(AndroidConfig.targetSdk)
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        versionCode = 19
-        versionName = "1.7.0"
+        minSdk = AndroidConfig.minSdk
+        targetSdk = AndroidConfig.targetSdk
+        versionCode = 35
+        versionName = "1.8.4"

        buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
        buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"")
        buildConfigField("String", "BUILD_TIME", "\"${getBuildTime()}\"")
        buildConfigField("boolean", "INCLUDE_UPDATER", "false")

-        multiDexEnabled = true
-
        ndk {
            abiFilters += setOf("armeabi-v7a", "arm64-v8a", "x86")
        }
-    }
-
-    buildFeatures {
-        viewBinding = true
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
    }

    buildTypes {
@@ -71,7 +57,7 @@ android {
        }
    }

-    flavorDimensions("default")
+    flavorDimensions += "default"

    productFlavors {
        create("standard") {
@@ -82,31 +68,41 @@ android {
            dimension = "default"
        }
        create("dev") {
-            resConfigs("en", "xxhdpi")
+            resourceConfigurations.addAll(listOf("en", "xxhdpi"))
            dimension = "default"
        }
    }

    packagingOptions {
-        exclude("META-INF/DEPENDENCIES")
-        exclude("LICENSE.txt")
-        exclude("META-INF/LICENSE")
-        exclude("META-INF/LICENSE.txt")
-        exclude("META-INF/NOTICE")
-        exclude("META-INF/*.kotlin_module")
-
-        // Compatibility for two RxJava versions (EXH)
-        exclude("META-INF/rxjava.properties")
+        resources.excludes.addAll(listOf(
+            "META-INF/DEPENDENCIES",
+            "LICENSE.txt",
+            "META-INF/LICENSE",
+            "META-INF/LICENSE.txt",
+            "META-INF/README.md",
+            "META-INF/NOTICE",
+            "META-INF/*.kotlin_module",
+            "META-INF/*.version",
+        ))
    }

    dependenciesInfo {
        includeInApk = false
    }

-    lintOptions {
-        disable("MissingTranslation", "ExtraTranslation")
-        isAbortOnError = false
-        isCheckReleaseBuilds = false
+    buildFeatures {
+        viewBinding = true
+
+        // Disable some unused things
+        aidl = false
+        renderScript = false
+        shaders = false
+    }
+
+    lint {
+        disable.addAll(listOf("MissingTranslation", "ExtraTranslation"))
+        abortOnError = false
+        checkReleaseBuilds = false
    }

    compileOptions {
@@ -120,185 +116,145 @@ android {
 }

 dependencies {
+    implementation(kotlinx.reflect)
+
+    implementation(kotlinx.bundles.coroutines)

    // 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.appcompat:appcompat:1.4.0-alpha01")
-    implementation("androidx.biometric:biometric-ktx:1.2.0-alpha03")
-    implementation("androidx.browser:browser:1.3.0")
-    implementation("androidx.cardview:cardview:1.0.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.0-beta02")
-    implementation("androidx.coordinatorlayout:coordinatorlayout:1.1.0")
-    implementation("androidx.core:core-ktx:1.6.0-beta01")
-    implementation("androidx.multidex:multidex:2.0.1")
-    implementation("androidx.preference:preference-ktx:1.1.1")
-    implementation("androidx.recyclerview:recyclerview:1.2.0")
-    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01")
+    implementation(androidx.annotation)
+    implementation(androidx.appcompat)
+    implementation(androidx.biometricktx)
+    implementation(androidx.constraintlayout)
+    implementation(androidx.coordinatorlayout)
+    implementation(androidx.corektx)
+    implementation(androidx.splashscreen)
+    implementation(androidx.recyclerview)
+    implementation(androidx.swiperefreshlayout)
+    implementation(androidx.viewpager)

-    val lifecycleVersion = "2.4.0-alpha01"
-    implementation("androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion")
-    implementation("androidx.lifecycle:lifecycle-process:$lifecycleVersion")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
+    implementation(androidx.bundles.lifecycle)

    // Job scheduling
-    implementation("androidx.work:work-runtime-ktx:2.7.0-alpha03")
+    implementation(androidx.bundles.workmanager)

-    // UI library
-    implementation("com.google.android.material:material:1.4.0-beta01")
-
-    "standardImplementation"("com.google.firebase:firebase-core:19.0.0")
-
-    // ReactiveX
-    implementation("io.reactivex:rxandroid:1.2.1")
-    implementation("io.reactivex:rxjava:1.3.8")
-    implementation("com.jakewharton.rxrelay:rxrelay:1.2.0")
-    implementation("com.github.pwittchen:reactivenetwork:0.13.0")
+    // RX
+    implementation(libs.bundles.reactivex)
+    implementation(libs.flowreactivenetwork)

    // Network client
-    val okhttpVersion = "4.9.1"
-    implementation("com.squareup.okhttp3:okhttp:$okhttpVersion")
-    implementation("com.squareup.okhttp3:logging-interceptor:$okhttpVersion")
-    implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:$okhttpVersion")
-    implementation("com.squareup.okio:okio:2.10.0")
+    implementation(libs.bundles.okhttp)
+    implementation(libs.okio)

    // TLS 1.3 support for Android < 10
-    implementation("org.conscrypt:conscrypt-android:2.5.1")
+    implementation(libs.conscrypt.android)

-    // JSON
-    val kotlinSerializationVersion = "1.1.0"
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinSerializationVersion")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$kotlinSerializationVersion")
-    implementation("com.google.code.gson:gson:2.8.6")
-    implementation("com.github.salomonbrys.kotson:kotson:2.5.0")
+    // Data serialization (JSON, protobuf)
+    implementation(kotlinx.bundles.serialization)

    // JavaScript engine
-    implementation("com.squareup.duktape:duktape-android:1.3.0")
-
-    // Disk
-    implementation("com.jakewharton:disklrucache:2.0.2")
-    implementation("com.github.tachiyomiorg:unifile:17bec43")
-    implementation("com.github.junrar:junrar:7.4.0")
+    implementation(libs.bundles.js.engine)

    // HTML parser
-    implementation("org.jsoup:jsoup:1.13.1")
+    implementation(libs.jsoup)
+
+    // Disk
+    implementation(libs.disklrucache)
+    implementation(libs.unifile)
+    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.35.5")

    // Preferences
-    implementation("com.github.tfcporciuncula.flow-preferences:flow-preferences:1.4.0")
+    implementation(libs.preferencektx)
+    implementation(libs.flowpreferences)

    // Model View Presenter
-    val nucleusVersion = "3.0.0"
-    implementation("info.android15.nucleus:nucleus:$nucleusVersion")
-    implementation("info.android15.nucleus:nucleus-support-v7:$nucleusVersion")
+    implementation(libs.bundles.nucleus)

    // Dependency injection
-    implementation("com.github.inorichi.injekt:injekt-core:65b0440")
+    implementation(libs.injekt.core)

-    // Image library
-    val coilVersion = "1.2.0"
-    implementation("io.coil-kt:coil:$coilVersion")
-    implementation("io.coil-kt:coil-gif:$coilVersion")
+    // Image loading
+    implementation(libs.bundles.coil)

-    implementation("com.github.tachiyomiorg:subsampling-scale-image-view:846abe0") {
+    implementation(libs.subsamplingscaleimageview) {
        exclude(module = "image-decoder")
    }
-    implementation("com.github.tachiyomiorg:image-decoder:7a44c9b")
-
-    // Logging
-    implementation("com.jakewharton.timber:timber:4.7.1")
-
-    // Crash reports
-    //implementation("ch.acra:acra-http:5.7.0")
+    implementation(libs.image.decoder)

    // Sort
-    implementation("com.github.gpanther:java-nat-sort:natural-comparator-1.1")
+    implementation(libs.natural.comparator)

-    // UI
-    implementation("com.github.dmytrodanylyk.android-process-button:library:1.0.4")
-    implementation("eu.davidea:flexible-adapter:5.1.0")
-    implementation("eu.davidea:flexible-adapter-ui:1.0.0")
-    implementation("com.nightlynexus.viewstatepageradapter:viewstatepageradapter:1.1.0")
-    implementation("com.github.chrisbanes:PhotoView:2.3.0")
-    implementation("com.github.tachiyomiorg:DirectionalViewPager:1.0.0")
-    implementation("dev.chrisbanes.insetter:insetter:0.6.0")
-
-    // 3.2.0+ introduces weird UI blinking or cut off issues on some devices
-    val materialDialogsVersion = "3.1.1"
-    implementation("com.afollestad.material-dialogs:core:$materialDialogsVersion")
-    implementation("com.afollestad.material-dialogs:input:$materialDialogsVersion")
-    implementation("com.afollestad.material-dialogs:datetime:$materialDialogsVersion")
+    // UI libraries
+    implementation(libs.material)
+    implementation(libs.androidprocessbutton)
+    implementation(libs.flexible.adapter.core)
+    implementation(libs.flexible.adapter.ui)
+    implementation(libs.viewstatepageradapter)
+    implementation(libs.photoview)
+    implementation(libs.directionalviewpager) {
+        exclude(group = "androidx.viewpager", module = "viewpager")
+    }
+    implementation(libs.insetter)
+    implementation(libs.markwon)

    // Conductor
-    implementation("com.bluelinelabs:conductor:2.1.5")
-    implementation("com.bluelinelabs:conductor-support:2.1.5") {
-        exclude(group = "com.android.support")
-    }
-    implementation("com.github.tachiyomiorg:conductor-support-preference:2.0.1")
+    implementation(libs.bundles.conductor)

    // FlowBinding
-    val flowbindingVersion = "1.0.0"
-    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")
+    implementation(libs.bundles.flowbinding)
+
+    // Logging
+    implementation(libs.logcat)
+
+    // Crash reports/analytics
+    // implementation(libs.acra.http)
+    // "standardImplementation"(libs.firebase.analytics)

    // Licenses
-    implementation("com.mikepenz:aboutlibraries:${BuildPluginsVersion.ABOUTLIB_PLUGIN}")
+    implementation(libs.aboutlibraries.core)
+
+    // Shizuku
+    implementation(libs.bundles.shizuku)

    // Tests
-    testImplementation("junit:junit:4.13.2")
-    testImplementation("org.assertj:assertj-core:3.16.1")
-    testImplementation("org.mockito:mockito-core:1.10.19")
+    testImplementation(libs.junit)
+    testImplementation(libs.assertj.core)
+    testImplementation(libs.mockito.core)

-    val robolectricVersion = "3.1.4"
-    testImplementation("org.robolectric:robolectric:$robolectricVersion")
-    testImplementation("org.robolectric:shadows-multidex:$robolectricVersion")
-    testImplementation("org.robolectric:shadows-play-services:$robolectricVersion")
-
-    implementation(kotlin("reflect", version = BuildPluginsVersion.KOTLIN))
-
-    val coroutinesVersion = "1.5.0"
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion")
+    testImplementation(libs.bundles.robolectric)

    // For detecting memory leaks; see https://square.github.io/leakcanary/
-    // debugImplementation("com.squareup.leakcanary:leakcanary-android:2.7")
+    // debugImplementation(libs.leakcanary.android)

    // SY -->
-    // [EXH] Android 7 SSL Workaround
-    implementation("com.google.android.gms:play-services-safetynet:17.0.0")
-
    // Changelog
-    implementation("com.github.gabrielemariotti.changeloglib:changelog:2.1.0")
+    implementation(sylibs.changelog)

    // Text distance (EH)
-    implementation ("info.debatty:java-string-similarity:2.0.0")
+    implementation (sylibs.simularity)

    // Firebase (EH)
-    implementation("com.google.firebase:firebase-analytics-ktx:19.0.0")
-    implementation("com.google.firebase:firebase-crashlytics-ktx:18.0.0")
+    implementation(sylibs.firebase.analytics)
+    implementation(sylibs.firebase.crashlytics.ktx)

    // Better logging (EH)
-    implementation("com.elvishew:xlog:1.9.0")
+    implementation(sylibs.xlog)

    // Debug utils (EH)
-    val debugOverlayVersion = "1.1.3"
-    debugImplementation("com.ms-square:debugoverlay:$debugOverlayVersion")
-    "releaseTestImplementation"("com.ms-square:debugoverlay-no-op:$debugOverlayVersion")
-    releaseImplementation("com.ms-square:debugoverlay-no-op:$debugOverlayVersion")
-    testImplementation("com.ms-square:debugoverlay-no-op:$debugOverlayVersion")
+    debugImplementation(sylibs.debugOverlay.standard)
+    "releaseTestImplementation"(sylibs.debugOverlay.noop)
+    releaseImplementation(sylibs.debugOverlay.noop)
+    testImplementation(sylibs.debugOverlay.noop)

    // RatingBar (SY)
-    implementation("me.zhanghai.android.materialratingbar:library:1.4.0")
+    implementation(sylibs.ratingbar)
 }

 tasks {
@@ -307,12 +263,13 @@ tasks {
        kotlinOptions.freeCompilerArgs += listOf(
            "-Xopt-in=kotlin.Experimental",
            "-Xopt-in=kotlin.RequiresOptIn",
-            "-Xuse-experimental=kotlin.ExperimentalStdlibApi",
-            "-Xuse-experimental=kotlinx.coroutines.FlowPreview",
-            "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
-            "-Xuse-experimental=kotlinx.coroutines.InternalCoroutinesApi",
-            "-Xuse-experimental=kotlinx.serialization.ExperimentalSerializationApi",
-            "-Xuse-experimental=coil.annotation.ExperimentalCoilApi",
+            "-Xopt-in=kotlin.ExperimentalStdlibApi",
+            "-Xopt-in=kotlinx.coroutines.FlowPreview",
+            "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+            "-Xopt-in=kotlinx.coroutines.InternalCoroutinesApi",
+            "-Xopt-in=kotlinx.serialization.ExperimentalSerializationApi",
+            "-Xopt-in=coil.annotation.ExperimentalCoilApi",
+            "-Xopt-in=kotlin.time.ExperimentalTime",
        )
    }

@@ -328,40 +285,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()
-}
@@ -69,16 +69,19 @@

 # Keep extension's common dependencies
 -keep,allowoptimization class eu.kanade.tachiyomi.** { public protected *; }
+-keep,allowoptimization class androidx.preference.** { *; }
 -keep,allowoptimization class kotlin.** { public protected *; }
+-keep,allowoptimization class kotlinx.coroutines.** { public protected *; }
 -keep,allowoptimization class okhttp3.** { public protected *; }
+-keep,allowoptimization class okio.** { public protected *; }
 -keep,allowoptimization class rx.** { public protected *; }
 -keep,allowoptimization class org.jsoup.** { public protected *; }
 -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 androidx.preference.** { *; }
-keep,allowoptimization class okio.** { *; }
-keep,allowoptimization class kotlinx.serialization.** { *; }
+-keep,allowoptimization class app.cash.quickjs.** { public protected *; }
+-keep,allowoptimization class uy.kohesive.injekt.** { public protected *; }
+-keep,allowoptimization class kotlinx.serialization.** { public protected *; }

 # RxJava 1.1.0
 -dontwarn sun.misc.**
@@ -104,33 +107,6 @@
 # === Okio: https://github.com/square/okio/tree/9b8545e7fa267c9d89753283990f24a35cd69cd6#proguard
 -dontwarn okio.**

-# === GSON: https://raw.githubusercontent.com/google/gson/master/examples/android-proguard-example/proguard.cfg
-# Gson uses generic type information stored in a class file when working with fields. Proguard
-# removes such information by default, so configure it to keep all of it.
-keepattributes Signature
-
-# For using GSON @Expose annotation
-keepattributes *Annotation*
-
-# Gson specific classes
-dontwarn sun.misc.**
-#-keep class com.google.gson.stream.** { *; }
-
-# Application classes that will be serialized/deserialized over Gson
-keep class com.google.gson.examples.android.model.** { <fields>; }
-
-# Prevent proguard from stripping interface information from TypeAdapterFactory, TypeAdapter,
-# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
-keep class * extends com.google.gson.TypeAdapter
-keep class * implements com.google.gson.TypeAdapterFactory
-keep class * implements com.google.gson.JsonSerializer
-keep class * implements com.google.gson.JsonDeserializer
-
-# Prevent R8 from leaving Data object members always null
-keepclassmembers,allowobfuscation class * {
-  @com.google.gson.annotations.SerializedName <fields>;
-}
-
 # == Nucleus
 -keepclassmembers class * extends nucleus.presenter.Presenter {
    <init>();
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
    <background android:drawable="@color/ic_launcher_background"/>
    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_tachi_monochrome_launcher" />
 </adaptive-icon>
@@ -19,26 +19,28 @@
    <!-- 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" />

    <application
        android:name=".App"
-        android:allowBackup="true"
-        android:fullBackupContent="@xml/backup_rules"
+        android:allowBackup="false"
        android:hardwareAccelerated="true"
-        android:hasFragileUserData="true"
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
        android:largeHeap="true"
        android:requestLegacyExternalStorage="true"
        android:roundIcon="@mipmap/ic_launcher_round"
-        android:theme="@style/Theme.Base"
+        android:theme="@style/Theme.Tachiyomi"
+        android:supportsRtl="true"
        android:networkSecurityConfig="@xml/network_security_config">
+
        <activity
            android:name=".ui.main.MainActivity"
            android:launchMode="singleTop"
-            android:theme="@style/Theme.Splash">
+            android:theme="@style/Theme.Tachiyomi.SplashScreen"
+            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
@@ -52,7 +54,8 @@
            android:name=".ui.main.DeepLinkActivity"
            android:launchMode="singleTask"
            android:theme="@android:style/Theme.NoDisplay"
-            android:label="@string/action_global_search">
+            android:label="@string/action_global_search"
+            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.SEARCH" />
                <action android:name="com.google.android.gms.actions.SEARCH_ACTION" />
@@ -73,9 +76,11 @@
                android:name="android.app.searchable"
                android:resource="@xml/searchable" />
        </activity>
+
        <activity
            android:name=".ui.reader.ReaderActivity"
-            android:launchMode="singleTask">
+            android:launchMode="singleTask"
+            android:exported="false">
            <intent-filter>
                <action android:name="com.samsung.android.support.REMOTE_ACTION" />
            </intent-filter>
@@ -83,15 +88,26 @@
            <meta-data android:name="com.samsung.android.support.REMOTE_ACTION"
                android:resource="@xml/s_pen_actions"/>
        </activity>
+
        <activity
            android:name=".ui.security.UnlockActivity"
-            android:theme="@style/Theme.Base" />
+            android:theme="@style/Theme.Tachiyomi"
+            android:exported="false" />
+
        <activity
            android:name=".ui.webview.WebViewActivity"
-            android:configChanges="uiMode|orientation|screenSize" />
+            android:configChanges="uiMode|orientation|screenSize"
+            android:exported="false" />
+
+        <activity
+            android:name=".extension.util.ExtensionInstallActivity"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:exported="false" />
+
        <activity
            android:name=".ui.setting.track.AnilistLoginActivity"
-            android:label="Anilist">
+            android:label="Anilist"
+            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />

@@ -105,7 +121,8 @@
        </activity>
        <activity
            android:name=".ui.setting.track.MyAnimeListLoginActivity"
-            android:label="MyAnimeList">
+            android:label="MyAnimeList"
+            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />

@@ -119,7 +136,8 @@
        </activity>
        <activity
            android:name=".ui.setting.track.ShikimoriLoginActivity"
-            android:label="Shikimori">
+            android:label="Shikimori"
+            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />

@@ -133,7 +151,8 @@
        </activity>
        <activity
            android:name=".ui.setting.track.BangumiLoginActivity"
-            android:label="Bangumi">
+            android:label="Bangumi"
+            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />

@@ -146,23 +165,10 @@
            </intent-filter>
        </activity>

-        <activity
-            android:name=".extension.util.ExtensionInstallActivity"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-
        <activity
            android:name="exh.ui.login.EhLoginActivity"
-            android:label="EHentaiLogin" />
-
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.provider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths" />
-        </provider>
+            android:label="EHentaiLogin"
+            android:exported="false"/>

        <receiver
            android:name=".data.notification.NotificationReceiver"
@@ -177,200 +183,190 @@
            android:exported="false" />

        <service
-            android:name=".data.updater.UpdaterService"
-            android:exported="false" />
-
-        <service
-            android:name=".data.backup.BackupCreateService"
+            android:name=".data.updater.AppUpdateService"
            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"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                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"
+            android:value="true" />
+
        <!-- EH -->
-        <service
-            android:name="exh.eh.EHentaiUpdateWorker"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:exported="true" />
        <activity
            android:name="exh.ui.intercept.InterceptActivity"
            android:label="@string/app_name"
-            android:theme="@style/Theme.Base">
+            android:theme="@style/Theme.Tachiyomi"
+            android:exported="true">
+            <!-- E-Hentai -->
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />

                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />

-                <!-- EH -->
-                <data
-                    android:host="g.e-hentai.org"
-                    android:pathPrefix="/g/"
-                    android:scheme="http" />
-                <data
-                    android:host="g.e-hentai.org"
-                    android:pathPrefix="/g/"
-                    android:scheme="https" />
-                <data
-                    android:host="e-hentai.org"
-                    android:pathPrefix="/g/"
-                    android:scheme="http" />
-                <data
-                    android:host="e-hentai.org"
-                    android:pathPrefix="/g/"
-                    android:scheme="https" />
+                <data android:scheme="https" />
+                <data android:scheme="http" />

-                <!-- EXH -->
-                <data
-                    android:host="exhentai.org"
-                    android:pathPrefix="/g/"
-                    android:scheme="http" />
-                <data
-                    android:host="exhentai.org"
-                    android:pathPrefix="/g/"
-                    android:scheme="https" />
+                <data android:host="e-hentai.org" />
+                <data android:host="www.e-hentai.org" />
+                <data android:host="g.e-hentai.org" />

-                <!-- nhentai -->
-                <data
-                    android:host="nhentai.net"
-                    android:pathPrefix="/g/"
-                    android:scheme="http" />
-                <data
-                    android:host="nhentai.net"
-                    android:pathPrefix="/g/"
-                    android:scheme="https" />
+                <data android:pathPattern="/g/..*" />
+            </intent-filter>
+            <!-- ExHentai -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />

-                <!-- Perv Eden -->
-                <data
-                    android:host="www.perveden.com"
-                    android:pathPattern="/.*/.*-manga/.*"
-                    android:scheme="http" />
-                <data
-                    android:host="www.perveden.com"
-                    android:pathPattern="/.*/.*-manga/.*"
-                    android:scheme="https" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />

-                <!-- Hentai Cafe -->
-                <data
-                    android:host="hentai.cafe"
-                    android:pathPrefix="/hc.fyi/"
-                    android:scheme="http" />
-                <data
-                    android:host="hentai.cafe"
-                    android:pathPrefix="/hc.fyi/"
-                    android:scheme="https" />
+                <data android:scheme="https" />
+                <data android:scheme="http" />

-                <!-- Tsumino -->
-                <data
-                    android:host="www.tsumino.com"
-                    android:pathPrefix="/Book/Info/"
-                    android:scheme="http" />
-                <data
-                    android:host="www.tsumino.com"
-                    android:pathPrefix="/Book/Info/"
-                    android:scheme="https" />
-                <data
-                    android:host="www.tsumino.com"
-                    android:pathPrefix="/Read/View/"
-                    android:scheme="http" />
-                <data
-                    android:host="www.tsumino.com"
-                    android:pathPrefix="/Read/View/"
-                    android:scheme="https" />
+                <data android:host="exhentai.org" />
+                <data android:host="www.exhentai.org" />

-                 <!-- Hitomi.la -->
-                <data
-                    android:host="hitomi.la"
-                    android:pathPrefix="/galleries/"
-                    android:scheme="http" />
-                <data
-                    android:host="hitomi.la"
-                    android:pathPrefix="/reader/"
-                    android:scheme="http" />
-                <data
-                    android:host="hitomi.la"
-                    android:pathPrefix="/galleries/"
-                    android:scheme="https" />
-                <data
-                    android:host="hitomi.la"
-                    android:pathPrefix="/reader/"
-                    android:scheme="https" />
+                <data android:pathPattern="/g/..*" />
+            </intent-filter>
+            <!-- NHentai -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />

-                <!-- Pururin.io -->
-                <data
-                    android:host="pururin.io"
-                    android:pathPrefix="/gallery/"
-                    android:scheme="http" />
-                <data
-                    android:host="pururin.io"
-                    android:pathPrefix="/gallery/"
-                    android:scheme="https" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />

-                <!-- HBrowse -->
-                <data
-                    android:host="www.hbrowse.com"
-                    android:scheme="http" />
-                <data
-                    android:host="www.hbrowse.com"
-                    android:scheme="https" />
+                <data android:scheme="https" />
+                <data android:scheme="http" />

-                <!-- MangaDex -->
-                <!--<data
-                    android:scheme="https"
-                    android:host="www.mangadex.org"
-                    android:pathPrefix="/manga/" />
-                <data
-                    android:scheme="https"
-                    android:host="mangadex.org"
-                    android:pathPrefix="/manga/" />
-                <data
-                    android:scheme="https"
-                    android:host="www.mangadex.cc"
-                    android:pathPrefix="/manga/" />
-                <data
-                    android:scheme="https"
-                    android:host="www.mangadex.cc"
-                    android:pathPrefix="/manga/" />
+                <data android:host="nhentai.net" />
+                <data android:host="www.nhentai.net" />

-                <data
-                    android:scheme="https"
-                    android:host="www.mangadex.org"
-                    android:pathPrefix="/title/" />
-                <data
-                    android:scheme="https"
-                    android:host="mangadex.org"
-                    android:pathPrefix="/title/" />
-                <data
-                    android:scheme="https"
-                    android:host="www.mangadex.cc"
-                    android:pathPrefix="/title/" />
-                <data
-                    android:scheme="https"
-                    android:host="www.mangadex.cc"
-                    android:pathPrefix="/title/" />
+                <data android:pathPattern="/g/..*" />
+            </intent-filter>
+            <!-- Perv Eden -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />

-                <data
-                    android:scheme="https"
-                    android:host="www.mangadex.org"
-                    android:pathPrefix="/chapter/" />
-                <data
-                    android:scheme="https"
-                    android:host="mangadex.org"
-                    android:pathPrefix="/chapter/" />
-                <data
-                    android:scheme="https"
-                    android:host="www.mangadex.cc"
-                    android:pathPrefix="/chapter/" />
-                <data
-                    android:scheme="https"
-                    android:host="www.mangadex.cc"
-                    android:pathPrefix="/chapter/" />-->
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:scheme="http" />
+
+                <data android:host="perveden.com" />
+                <data android:host="www.perveden.com" />
+
+                <data android:pathPattern="/.*/.*-manga/.*" />
+            </intent-filter>
+            <!-- Tsumino -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:scheme="http" />
+
+                <data android:host="tsumino.com" />
+                <data android:host="www.tsumino.com" />
+
+                <data android:pathPattern="/Read/View/..*" />
+                <data android:pathPattern="/Book/Info/..*" />
+            </intent-filter>
+            <!-- Hitomi.la -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:scheme="http" />
+
+                <data android:host="hitomi.la" />
+                <data android:host="www.hitomi.la" />
+
+                <data android:pathPattern="/reader/..*" />
+                <data android:pathPattern="/galleries/..*" />
+            </intent-filter>
+            <!-- Pururin -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:scheme="http" />
+
+                <data android:host="pururin.io" />
+
+                <data android:pathPattern="/gallery/..*" />
+            </intent-filter>
+            <!-- HBrowse -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:scheme="http" />
+
+                <data android:host="hbrowse.com" />
+                <data android:host="www.hbrowse.com" />
+
+                <!--<data android:pathPattern="/gallery/..*" />-->
+            </intent-filter>
+            <!-- Mangadex -->
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+
+                <data android:host="mangadex.org" />
+                <data android:host="mangadex.cc" />
+                <data android:host="www.mangadex.org" />
+                <data android:host="www.mangadex.cc" />
+
+                <data android:pathPattern="/manga/..*" />
+                <data android:pathPattern="/title/..*" />
+                <data android:pathPattern="/chapter/..*" />
            </intent-filter>
        </activity>
        <activity
            android:name="exh.ui.captcha.BrowserActionActivity"
-            android:theme="@style/Theme.Base" />
+            android:theme="@style/Theme.Tachiyomi"
+            android:exported="false"/>
    </application>

 </manifest>
@@ -1,5 +1,6 @@
 package eu.kanade.tachiyomi

+import android.annotation.SuppressLint
 import android.app.ActivityManager
 import android.app.Application
 import android.app.PendingIntent
@@ -7,23 +8,24 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.content.res.Configuration
 import android.graphics.Color
 import android.os.Build
 import android.os.Environment
+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.LifecycleObserver
-import androidx.lifecycle.OnLifecycleEvent
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.lifecycleScope
-import androidx.multidex.MultiDex
 import coil.ImageLoader
 import coil.ImageLoaderFactory
 import coil.decode.GifDecoder
 import coil.decode.ImageDecoderDecoder
+import coil.disk.DiskCache
+import coil.util.DebugLogger
 import com.elvishew.xlog.LogConfiguration
 import com.elvishew.xlog.LogLevel
 import com.elvishew.xlog.XLog
@@ -32,62 +34,61 @@ import com.elvishew.xlog.printer.Printer
 import com.elvishew.xlog.printer.file.backup.NeverBackupStrategy
 import com.elvishew.xlog.printer.file.clean.FileLastModifiedCleanStrategy
 import com.elvishew.xlog.printer.file.naming.DateFileNameGenerator
-import com.google.android.gms.common.GooglePlayServicesNotAvailableException
-import com.google.android.gms.common.GooglePlayServicesRepairableException
-import com.google.android.gms.security.ProviderInstaller
 import com.google.firebase.analytics.ktx.analytics
 import com.google.firebase.ktx.Firebase
 import com.ms_square.debugoverlay.DebugOverlay
 import com.ms_square.debugoverlay.modules.FpsModule
-import eu.kanade.tachiyomi.data.coil.ByteBufferFetcher
 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.network.NetworkHelper
-import eu.kanade.tachiyomi.ui.security.SecureActivityDelegate
-import eu.kanade.tachiyomi.util.system.LocaleHelper
+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 exh.debug.DebugToggles
 import exh.log.CrashlyticsPrinter
 import exh.log.EHDebugModeOverlay
 import exh.log.EHLogLevel
 import exh.log.EnhancedFilePrinter
-import exh.log.XLogTree
+import exh.log.XLogLogcatLogger
 import exh.log.xLogD
 import exh.log.xLogE
 import exh.syDebugVersion
-import io.realm.Realm
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import logcat.LogPriority
+import logcat.LogcatLogger
 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.io.File
-import java.security.NoSuchAlgorithmException
 import java.security.Security
 import java.text.SimpleDateFormat
 import java.util.Locale
-import javax.net.ssl.SSLContext
-import kotlin.time.ExperimentalTime
-import kotlin.time.days
+import kotlin.time.Duration.Companion.days

-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())
        setupExhLogging() // EXH logging
-        Timber.plant(XLogTree()) // SY Redirect Timber to XLog
+        LogcatLogger.install(XLogLogcatLogger()) // SY Redirect Logcat to XLog
        if (!BuildConfig.DEBUG) addAnalytics()

-        workaroundAndroid7BrokenSSL()
-
        // TLS 1.3 support for Android < 10
        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
            Security.insertProviderAt(Conscrypt.newProvider(), 1)
@@ -102,13 +103,10 @@ open class App : Application(), LifecycleObserver, ImageLoaderFactory {
        Injekt.importModule(AppModule(this))

        setupNotificationChannels()
-        Realm.init(this)
        if ((BuildConfig.DEBUG || BuildConfig.BUILD_TYPE == "releaseTest") && DebugToggles.ENABLE_DEBUG_OVERLAY.enabled) {
            setupDebugOverlay()
        }

-        LocaleHelper.updateConfiguration(this, resources.configuration)
-
        ProcessLifecycleOwner.get().lifecycle.addObserver(this)

        // Show notification to disable Incognito Mode when it's enabled
@@ -120,14 +118,14 @@ open class App : Application(), LifecycleObserver, ImageLoaderFactory {
                    val notification = notification(Notifications.CHANNEL_INCOGNITO_MODE) {
                        setContentTitle(getString(R.string.pref_incognito_mode))
                        setContentText(getString(R.string.notification_incognito_text))
-                        setSmallIcon(R.drawable.ic_glasses_black_24dp)
+                        setSmallIcon(R.drawable.ic_glasses_24dp)
                        setOngoing(true)

                        val pendingIntent = PendingIntent.getBroadcast(
                            this@App,
                            0,
                            Intent(ACTION_DISABLE_INCOGNITO_MODE),
-                            PendingIntent.FLAG_ONE_SHOT
+                            PendingIntent.FLAG_ONE_SHOT,
                        )
                        setContentIntent(pendingIntent)
                    }
@@ -138,71 +136,84 @@ open class App : Application(), LifecycleObserver, ImageLoaderFactory {
                }
            }
            .launchIn(ProcessLifecycleOwner.get().lifecycleScope)
-    }

-    override fun attachBaseContext(base: Context) {
-        super.attachBaseContext(base)
-        MultiDex.install(this)
-    }
+        preferences.themeMode()
+            .asImmediateFlow {
+                AppCompatDelegate.setDefaultNightMode(
+                    when (it) {
+                        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)

-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        LocaleHelper.updateConfiguration(this, newConfig, true)
+        /*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(ByteBufferFetcher())
-                add(MangaCoverFetcher())
+                add(TachiyomiImageDecoder.Factory())
+                add(MangaCoverFetcher.Factory(lazy(callFactoryInit), lazy(diskCacheInit)))
+                add(MangaCoverKeyer())
            }
-            okHttpClient(Injekt.get<NetworkHelper>().coilClient)
-            crossfade(300)
+            callFactory(callFactoryInit)
+            diskCache(diskCacheInit)
+            crossfade((300 * this@App.animatorDurationScale).toInt())
            allowRgb565(getSystemService<ActivityManager>()!!.isLowRamDevice)
+            if (preferences.verboseLogging()) logger(DebugLogger())
        }.build()
    }

-    private fun workaroundAndroid7BrokenSSL() {
-        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.N ||
-            Build.VERSION.SDK_INT == Build.VERSION_CODES.N_MR1
-        ) {
-            try {
-                SSLContext.getInstance("TLSv1.2")
-            } catch (e: NoSuchAlgorithmException) {
-                xLogE("Could not install Android 7 broken SSL workaround!", e)
-            }
-
-            try {
-                ProviderInstaller.installIfNeeded(applicationContext)
-            } catch (e: GooglePlayServicesRepairableException) {
-                xLogE("Could not install Android 7 broken SSL workaround!", e)
-            } catch (e: GooglePlayServicesNotAvailableException) {
-                xLogE("Could not install Android 7 broken SSL workaround!", e)
-            }
-        }
-    }
-
    private fun addAnalytics() {
        if (syDebugVersion != "0") {
            Firebase.analytics.setUserProperty("preview_version", syDebugVersion)
        }
    }

-    @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
-    @Suppress("unused")
-    fun onAppBackgrounded() {
-        if (preferences.lockAppAfter().get() >= 0) {
+    override fun onStop(owner: LifecycleOwner) {
+        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 setupNotificationChannels() {
-        Notifications.createChannels(this)
+        try {
+            Notifications.createChannels(this)
+        } catch (e: Exception) {
+            logcat(LogPriority.ERROR, e) { "Failed to modify notification channels" }
+        }
    }

    // EXH
@@ -226,26 +237,25 @@ open class App : Application(), LifecycleObserver, ImageLoaderFactory {
        val logFolder = File(
            Environment.getExternalStorageDirectory().absolutePath + File.separator +
                getString(R.string.app_name),
-            "logs"
+            "logs",
        )

        val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.getDefault())

-        @OptIn(ExperimentalTime::class)
        printers += EnhancedFilePrinter
            .Builder(logFolder.absolutePath) {
                fileNameGenerator = object : DateFileNameGenerator() {
                    override fun generateFileName(logLevel: Int, timestamp: Long): String {
                        return super.generateFileName(
                            logLevel,
-                            timestamp
+                            timestamp,
                        ) + "-${BuildConfig.BUILD_TYPE}.log"
                    }
                }
                flattener { timeMillis, level, tag, message ->
                    "${dateFormat.format(timeMillis)} ${LogLevel.getShortLevelName(level)}/$tag: $message"
                }
-                cleanStrategy = FileLastModifiedCleanStrategy(7.days.toLongMilliseconds())
+                cleanStrategy = FileLastModifiedCleanStrategy(7.days.inWholeMilliseconds)
                backupStrategy = NeverBackupStrategy()
            }

@@ -256,20 +266,22 @@ open class App : Application(), LifecycleObserver, ImageLoaderFactory {

        XLog.init(
            logConfig,
-            *printers.toTypedArray()
+            *printers.toTypedArray(),
        )

        xLogD("Application booting...")
        xLogD(
-            "App version: ${BuildConfig.VERSION_NAME} (${BuildConfig.FLAVOR}, ${BuildConfig.COMMIT_SHA}, ${BuildConfig.VERSION_CODE})\n" +
-                "Preview build: $syDebugVersion\n" +
-                "Android version: ${Build.VERSION.RELEASE} (SDK ${Build.VERSION.SDK_INT}) \n" +
-                "Android build ID: ${Build.DISPLAY}\n" +
-                "Device brand: ${Build.BRAND}\n" +
-                "Device manufacturer: ${Build.MANUFACTURER}\n" +
-                "Device name: ${Build.DEVICE}\n" +
-                "Device model: ${Build.MODEL}\n" +
-                "Device product name: ${Build.PRODUCT}"
+            """
+                App version: ${BuildConfig.VERSION_NAME} (${BuildConfig.FLAVOR}, ${BuildConfig.COMMIT_SHA}, ${BuildConfig.VERSION_CODE})
+                Preview build: $syDebugVersion
+                Android version: ${Build.VERSION.RELEASE} (SDK ${Build.VERSION.SDK_INT}) 
+                Android build ID: ${Build.DISPLAY}
+                Device brand: ${Build.BRAND}
+                Device manufacturer: ${Build.MANUFACTURER}
+                Device name: ${Build.DEVICE}
+                Device model: ${Build.MODEL}
+                Device product name: ${Build.PRODUCT}
+            """.trimIndent(),
        )
    }

@@ -310,8 +322,27 @@ open class App : Application(), LifecycleObserver, ImageLoaderFactory {
            }
        }
    }
+}

-    companion object {
-        private const val ACTION_DISABLE_INCOGNITO_MODE = "tachi.action.DISABLE_INCOGNITO_MODE"
+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 }
+        }
    }
 }
@@ -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
+}
@@ -1,14 +1,16 @@
 package eu.kanade.tachiyomi

 import android.app.Application
-import android.os.Handler
+import androidx.core.content.ContextCompat
 import eu.kanade.tachiyomi.data.cache.ChapterCache
 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.library.CustomMangaManager
 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
 import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.source.SourceManager
@@ -25,6 +27,8 @@ class AppModule(val app: Application) : InjektModule {
    override fun InjektRegistrar.registerInjectables() {
        addSingleton(app)

+        addSingletonFactory { Json { ignoreUnknownKeys = true } }
+
        addSingletonFactory { PreferencesHelper(app) }

        addSingletonFactory { DatabaseHelper(app) }
@@ -43,7 +47,9 @@ class AppModule(val app: Application) : InjektModule {

        addSingletonFactory { TrackManager(app) }

-        addSingletonFactory { Json { ignoreUnknownKeys = true } }
+        addSingletonFactory { DelayedTrackingStore(app) }
+
+        addSingletonFactory { ImageSaver(app) }

        // SY -->
        addSingletonFactory { CustomMangaManager(app) }
@@ -52,7 +58,7 @@ class AppModule(val app: Application) : InjektModule {
        // SY <--

        // Asynchronously init expensive components for a faster cold start
-        Handler().post {
+        ContextCompat.getMainExecutor(app).execute {
            get<PreferencesHelper>()

            get<NetworkHelper>()
@@ -5,14 +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
@@ -32,30 +39,29 @@ object Migrations {
    fun upgrade(preferences: PreferencesHelper): Boolean {
        val context = preferences.context

-        // Cancel app updater job for debug builds that don't include it
-        if (BuildConfig.DEBUG && !BuildConfig.INCLUDE_UPDATER) {
-            UpdaterJob.cancelTask(context)
-        }
-
        val oldVersion = preferences.lastVersionCode().get()
        if (oldVersion < BuildConfig.VERSION_CODE) {
            preferences.lastVersionCode().set(BuildConfig.VERSION_CODE)

+            // Always set up background tasks to ensure they're running
+            if (BuildConfig.INCLUDE_UPDATER) {
+                AppUpdateJob.setupTask(context)
+            }
+            ExtensionUpdateJob.setupTask(context)
+            LibraryUpdateJob.setupTask(context)
+            BackupCreatorJob.setupTask(context)
+
            // Fresh install
            if (oldVersion == 0) {
-                // Set up default background tasks
-                if (BuildConfig.INCLUDE_UPDATER) {
-                    UpdaterJob.setupTask(context)
-                }
-                ExtensionUpdateJob.setupTask(context)
-                LibraryUpdateJob.setupTask(context)
                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)
            }
@@ -88,7 +94,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)
@@ -98,14 +104,17 @@ object Migrations {
            }
            if (oldVersion < 44) {
                // Reset sorting preference if using removed sort by source
+                val oldSortingMode = prefs.getInt(PreferenceKeys.librarySortingMode, 0)
+
                @Suppress("DEPRECATION")
-                if (preferences.librarySortingMode().get() == LibrarySort.SOURCE) {
-                    preferences.librarySortingMode().set(LibrarySort.ALPHA)
+                if (oldSortingMode == LibrarySort.SOURCE) {
+                    prefs.edit {
+                        putInt(PreferenceKeys.librarySortingMode, LibrarySort.ALPHA)
+                    }
                }
            }
            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
@@ -122,7 +131,7 @@ object Migrations {
                    remove("pref_filter_completed_key")
                }
            }
-            if (oldVersion < 53) {
+            if (oldVersion < 54) {
                // Force MAL log out due to login flow change
                // v52: switched from scraping to WebView
                // v53: switched from WebView to OAuth
@@ -134,7 +143,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 {
@@ -145,7 +153,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)
@@ -154,12 +161,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) {
+                    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
@@ -187,6 +198,77 @@ object Migrations {
                    LibraryUpdateJob.setupTask(context, 3)
                }
            }
+            if (oldVersion < 64) {
+                val oldSortingMode = prefs.getInt(PreferenceKeys.librarySortingMode, 0)
+                val oldSortingDirection = prefs.getBoolean(PreferenceKeys.librarySortingDirection, true)
+
+                @Suppress("DEPRECATION")
+                val newSortingMode = when (oldSortingMode) {
+                    LibrarySort.ALPHA -> SortModeSetting.ALPHABETICAL
+                    LibrarySort.LAST_READ -> SortModeSetting.LAST_READ
+                    LibrarySort.LAST_CHECKED -> SortModeSetting.LAST_CHECKED
+                    LibrarySort.UNREAD -> SortModeSetting.UNREAD
+                    LibrarySort.TOTAL -> SortModeSetting.TOTAL_CHAPTERS
+                    LibrarySort.LATEST_CHAPTER -> SortModeSetting.LATEST_CHAPTER
+                    LibrarySort.CHAPTER_FETCH_DATE -> SortModeSetting.DATE_FETCHED
+                    LibrarySort.DATE_ADDED -> SortModeSetting.DATE_ADDED
+                    else -> SortModeSetting.ALPHABETICAL
+                }
+
+                val newSortingDirection = when (oldSortingDirection) {
+                    true -> SortDirectionSetting.ASCENDING
+                    else -> SortDirectionSetting.DESCENDING
+                }
+
+                prefs.edit(commit = true) {
+                    remove(PreferenceKeys.librarySortingMode)
+                    remove(PreferenceKeys.librarySortingDirection)
+                }
+
+                prefs.edit {
+                    putString(PreferenceKeys.librarySortingMode, newSortingMode.name)
+                    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
        }

@@ -1,5 +0,0 @@
-package eu.kanade.tachiyomi.annotations
-
-@Retention(AnnotationRetention.RUNTIME)
-@Target(AnnotationTarget.CLASS)
-annotation class Nsfw
@@ -28,7 +28,7 @@ abstract class AbstractBackupManager(protected val context: Context) {
    protected val customMangaManager: CustomMangaManager by injectLazy()
    // SY <--

-    abstract fun createBackup(uri: Uri, flags: Int, isJob: Boolean): String?
+    abstract fun createBackup(uri: Uri, flags: Int, isAutoBackup: Boolean): String

    /**
     * Returns manga
@@ -122,7 +122,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)
    }
@@ -14,3 +14,5 @@ abstract class AbstractBackupRestoreValidator {

    data class Results(val missingSources: List<String>, val missingTrackers: List<String>)
 }
+
+class ValidatorParseException(e: Exception) : RuntimeException(e)
@@ -11,4 +11,22 @@ 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
+
+    // SY -->
+    internal const val BACKUP_CUSTOM_INFO = 0x10
+    internal const val BACKUP_CUSTOM_INFO_MASK = 0x10
+    internal const val BACKUP_READ_MANGA = 0x20
+    internal const val BACKUP_READ_MANGA_MASK = 0x20
+    internal const val BACKUP_ALL = 0x3F
+    // SY <--
 }
@@ -1,121 +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
-
-        // SY -->
-        internal const val BACKUP_CUSTOM_INFO = 0x10
-        internal const val BACKUP_CUSTOM_INFO_MASK = 0x10
-        internal const val BACKUP_READ_MANGA = 0x20
-        internal const val BACKUP_READ_MANGA_MASK = 0x20
-        internal const val BACKUP_ALL = 0x3F
-        // SY <--
-
-        /**
-         * 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
-    }
-}
@@ -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 flags = BackupCreateService.BACKUP_ALL
+        val notifier = BackupNotifier(context)
+        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
@@ -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,
                )
            }

@@ -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.
@@ -96,7 +97,7 @@ class BackupRestoreService : Service() {

    private fun destroyJob() {
        backupRestore?.job?.cancel()
-        ioScope?.cancel()
+        ioScope.cancel()
        if (wakeLock.isHeld) {
            wakeLock.release()
        }
@@ -128,7 +129,7 @@ class BackupRestoreService : Service() {
        }

        val handler = CoroutineExceptionHandler { _, exception ->
-            Timber.e(exception)
+            logcat(LogPriority.ERROR, exception)
            backupRestore?.writeErrorLog()

            notifier.showRestoreError(exception.message)
@@ -3,19 +3,20 @@ package eu.kanade.tachiyomi.data.backup.full
 import android.content.Context
 import android.net.Uri
 import com.hippo.unifile.UniFile
+import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.backup.AbstractBackupManager
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CATEGORY
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CATEGORY_MASK
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CHAPTER
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CHAPTER_MASK
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CUSTOM_INFO
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CUSTOM_INFO_MASK
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_HISTORY
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_HISTORY_MASK
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_READ_MANGA
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_READ_MANGA_MASK
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_TRACK
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_TRACK_MASK
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_CATEGORY
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_CATEGORY_MASK
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_CHAPTER
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_CHAPTER_MASK
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_CUSTOM_INFO
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_CUSTOM_INFO_MASK
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_HISTORY
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_HISTORY_MASK
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_READ_MANGA
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_READ_MANGA_MASK
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_TRACK
+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
@@ -35,20 +36,20 @@ import eu.kanade.tachiyomi.data.database.models.MangaCategory
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.source.online.MetadataSource
 import eu.kanade.tachiyomi.util.lang.launchIO
+import eu.kanade.tachiyomi.util.system.logcat
 import exh.metadata.metadata.base.getFlatMetadataForManga
 import exh.metadata.metadata.base.insertFlatMetadataAsync
-import exh.savedsearches.JsonSavedSearch
+import exh.savedsearches.models.SavedSearch
 import exh.source.MERGED_SOURCE_ID
 import exh.source.getMainSource
 import exh.util.executeOnIO
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
+import exh.util.nullIfBlank
 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) {
@@ -59,9 +60,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

@@ -70,19 +71,21 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
                getReadManga()
            } else {
                emptyList()
-            } + getMergedManga() /* SY <-- */
+            } + getMergedManga() // SY <--

            backup = Backup(
                backupManga(databaseManga, flags),
-                backupCategories(),
+                backupCategories(flags),
+                emptyList(),
                backupExtensionInfo(databaseManga),
-                backupSavedSearches()
+                backupSavedSearches(),
            )
        }

+        var file: UniFile? = null
        try {
-            val file: UniFile = (
-                if (isJob) {
+            file = (
+                if (isAutoBackup) {
                    // Get dir of file and create
                    var dir = UniFile.fromUri(context, uri)
                    dir = dir.createDirectory("automatic")
@@ -104,11 +107,28 @@ 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) }
-            return file.uri.toString()
+            if (byteArray.isEmpty()) {
+                throw IllegalStateException(context.getString(R.string.empty_backup_error))
+            }
+
+            file.openOutputStream().also {
+                // 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
        }
    }
@@ -134,10 +154,15 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
     *
     * @return list of [BackupCategory] to be backed up
     */
-    private fun backupCategories(): List<BackupCategory> {
-        return databaseHelper.getCategories()
-            .executeAsBlocking()
-            .map { BackupCategory.copyFrom(it) }
+    private fun backupCategories(options: Int): List<BackupCategory> {
+        // Check if user wants category information in backup
+        return if (options and BACKUP_CATEGORY_MASK == BACKUP_CATEGORY) {
+            databaseHelper.getCategories()
+                .executeAsBlocking()
+                .map { BackupCategory.copyFrom(it) }
+        } else {
+            emptyList()
+        }
    }

    // SY -->
@@ -147,14 +172,12 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
     * @return list of [BackupSavedSearch] to be backed up
     */
    private fun backupSavedSearches(): List<BackupSavedSearch> {
-        return preferences.savedSearches().get().map {
-            val sourceId = it.substringBefore(':').toLong()
-            val content = Json.decodeFromString<JsonSavedSearch>(it.substringAfter(':'))
+        return databaseHelper.getSavedSearches().executeAsBlocking().map {
            BackupSavedSearch(
-                content.name,
-                content.query,
-                content.filters.toString(),
-                sourceId
+                it.name,
+                it.query.orEmpty(),
+                it.filtersJson ?: "[]",
+                it.source,
            )
        }
    }
@@ -180,8 +203,8 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
            }
        }

-        val source = sourceManager.get(manga.source)?.getMainSource()
-        if (source is MetadataSource<*, *>) {
+        val source = sourceManager.get(manga.source)?.getMainSource<MetadataSource<*, *>>()
+        if (source != null) {
            manga.id?.let { mangaId ->
                databaseHelper.getFlatMetadataForManga(mangaId).executeAsBlocking()?.let { flatMetadata ->
                    mangaObject.flatMetadata = BackupFlatMetadata.copyFrom(flatMetadata)
@@ -414,33 +437,25 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {

    // SY -->
    internal fun restoreSavedSearches(backupSavedSearches: List<BackupSavedSearch>) {
-        val currentSavedSearches = preferences.savedSearches().get().map {
-            val sourceId = it.substringBefore(':').toLong()
-            val content = Json.decodeFromString<JsonSavedSearch>(it.substringAfter(':'))
-            BackupSavedSearch(
-                content.name,
-                content.query,
-                content.filters.toString(),
-                sourceId
-            )
-        }
+        val currentSavedSearches = databaseHelper.getSavedSearches()
+            .executeAsBlocking()

-        preferences.savedSearches()
-            .set(
-                (
-                    backupSavedSearches.filter { backupSavedSearch -> currentSavedSearches.none { it.name == backupSavedSearch.name && it.source == backupSavedSearch.source } }
-                        .map {
-                            "${it.source}:" + Json.encodeToString(
-                                JsonSavedSearch(
-                                    it.name,
-                                    it.query,
-                                    Json.decodeFromString(it.filterList)
-                                )
-                            )
-                        } + preferences.savedSearches().get()
-                    )
-                    .toSet()
+        val newSavedSearches = backupSavedSearches.filter { backupSavedSearch ->
+            currentSavedSearches.none { it.name == backupSavedSearch.name && it.source == backupSavedSearch.source }
+        }.map {
+            SavedSearch(
+                id = null,
+                it.source,
+                it.name,
+                it.query.nullIfBlank(),
+                filtersJson = it.filterList.nullIfBlank()
+                    ?.takeUnless { it == "[]" },
            )
+        }.ifEmpty { null }
+
+        if (newSavedSearches != null) {
+            databaseHelper.insertSavedSearches(newSavedSearches)
+        }
    }

    /**
@@ -12,6 +12,7 @@ import eu.kanade.tachiyomi.data.backup.full.models.BackupManga
 import eu.kanade.tachiyomi.data.backup.full.models.BackupMergedMangaReference
 import eu.kanade.tachiyomi.data.backup.full.models.BackupSavedSearch
 import eu.kanade.tachiyomi.data.backup.full.models.BackupSerializer
+import eu.kanade.tachiyomi.data.backup.full.models.BackupSource
 import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.database.models.Track
@@ -48,7 +49,8 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBa
        // SY <--

        // Store source mapping for error messages
-        sourceMapping = backup.backupSources.map { it.sourceId to it.name }.toMap()
+        var backupMaps = backup.backupBrokenSources.map { BackupSource(it.name, it.sourceId) } + backup.backupSources
+        sourceMapping = backupMaps.map { it.sourceId to it.name }.toMap()

        // Restore individual manga, sort by merged source so that merged source manga go last and merged references get the proper ids
        backup.backupManga /* SY --> */.sortedBy { it.source == MERGED_SOURCE_ID } /* SY <-- */.forEach {
@@ -86,7 +88,7 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBa
        val manga = backupManga.getMangaImpl()
        val chapters = backupManga.getChaptersImpl()
        val categories = backupManga.categories
-        val history = backupManga.history
+        val history = backupManga.brokenHistory.map { BackupHistory(it.url, it.lastRead) } + backupManga.history
        val tracks = backupManga.getTrackingImpl()
        // SY -->
        val mergedMangaReferences = backupManga.mergedMangaReferences
@@ -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 = backupManager.parser.decodeFromByteArray(BackupSerializer, backupString)
+        val backup = try {
+            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
@@ -8,7 +8,8 @@ data class Backup(
    @ProtoNumber(1) val backupManga: List<BackupManga>,
    @ProtoNumber(2) var backupCategories: List<BackupCategory> = emptyList(),
    // Bump by 100 to specify this is a 0.x value
-    @ProtoNumber(100) var backupSources: List<BackupSource> = emptyList(),
+    @ProtoNumber(100) var backupBrokenSources: List<BrokenBackupSource> = emptyList(),
+    @ProtoNumber(101) var backupSources: List<BackupSource> = emptyList(),
    // SY specific values
-    @ProtoNumber(600) var backupSavedSearches: List<BackupSavedSearch> = emptyList()
+    @ProtoNumber(600) var backupSavedSearches: List<BackupSavedSearch> = emptyList(),
 )
@@ -13,7 +13,7 @@ class BackupCategory(
    // Bump by 100 to specify this is a 0.x value
    @ProtoNumber(100) var flags: Int = 0,
    // SY specific values
-    @ProtoNumber(600) var mangaOrder: List<Long> = emptyList()
+    @ProtoNumber(600) var mangaOrder: List<Long> = emptyList(),
 ) {
    fun getCategoryImpl(): CategoryImpl {
        return CategoryImpl().apply {
@@ -30,7 +30,7 @@ class BackupCategory(
                name = category.name,
                order = category.order,
                flags = category.flags,
-                mangaOrder = category.mangaOrder
+                mangaOrder = category.mangaOrder,
            )
        }
    }
@@ -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,
            )
        }
    }
@@ -11,13 +11,13 @@ import kotlinx.serialization.protobuf.ProtoNumber
 data class BackupFlatMetadata(
    @ProtoNumber(1) var searchMetadata: BackupSearchMetadata,
    @ProtoNumber(2) var searchTags: List<BackupSearchTag> = emptyList(),
-    @ProtoNumber(3) var searchTitles: List<BackupSearchTitle> = emptyList()
+    @ProtoNumber(3) var searchTitles: List<BackupSearchTitle> = emptyList(),
 ) {
    fun getFlatMetadata(mangaId: Long): FlatMetadata {
        return FlatMetadata(
            metadata = searchMetadata.getSearchMetadata(mangaId),
            tags = searchTags.map { it.getSearchTag(mangaId) },
-            titles = searchTitles.map { it.getSearchTitle(mangaId) }
+            titles = searchTitles.map { it.getSearchTitle(mangaId) },
        )
    }

@@ -26,7 +26,7 @@ data class BackupFlatMetadata(
            return BackupFlatMetadata(
                searchMetadata = BackupSearchMetadata.copyFrom(flatMetadata.metadata),
                searchTags = flatMetadata.tags.map { BackupSearchTag.copyFrom(it) },
-                searchTitles = flatMetadata.titles.map { BackupSearchTitle.copyFrom(it) }
+                searchTitles = flatMetadata.titles.map { BackupSearchTitle.copyFrom(it) },
            )
        }
    }
@@ -4,7 +4,13 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoNumber

@Serializable
-data class BackupHistory(
+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,
 )
@@ -34,8 +34,9 @@ data class BackupManga(
    // Bump by 100 for values that are not saved/implemented in 1.x but are used in 0.x
    @ProtoNumber(100) var favorite: Boolean = true,
    @ProtoNumber(101) var chapterFlags: Int = 0,
-    @ProtoNumber(102) var history: List<BackupHistory> = emptyList(),
+    @ProtoNumber(102) var brokenHistory: List<BrokenBackupHistory> = emptyList(),
    @ProtoNumber(103) var viewer_flags: Int? = null,
+    @ProtoNumber(104) var history: List<BackupHistory> = emptyList(),

    // SY specific values
    @ProtoNumber(600) var mergedMangaReferences: List<BackupMergedMangaReference> = emptyList(),
@@ -46,8 +47,9 @@ data class BackupManga(
    @ProtoNumber(800) var customTitle: String? = null,
    @ProtoNumber(801) var customArtist: String? = null,
    @ProtoNumber(802) var customAuthor: String? = null,
-    @ProtoNumber(803) var customDescription: String? = null,
-    @ProtoNumber(803) var customGenre: List<String>? = null,
+    // skipping 803 due to using duplicate value in previous builds
+    @ProtoNumber(804) var customDescription: String? = null,
+    @ProtoNumber(805) var customGenre: List<String>? = null,

    // Neko specific values
    @ProtoNumber(901) var filtered_scanlators: String? = null,
@@ -93,7 +95,7 @@ data class BackupManga(
                artist = customArtist,
                description = customDescription,
                genre = customGenre,
-                status = customStatus.takeUnless { it == 0 }
+                status = customStatus.takeUnless { it == 0 },
            )
        }
        return null
@@ -125,7 +127,7 @@ data class BackupManga(
                viewer = manga.readingModeType,
                viewer_flags = manga.viewer_flags,
                chapterFlags = manga.chapter_flags,
-                filtered_scanlators = manga.filtered_scanlators
+                filtered_scanlators = manga.filtered_scanlators,
                // SY -->
            ).also { backupManga ->
                customMangaManager?.getManga(manga)?.let {
@@ -16,7 +16,7 @@ data class BackupMergedMangaReference(
    @ProtoNumber(5) var downloadChapters: Boolean,
    @ProtoNumber(6) var mergeUrl: String,
    @ProtoNumber(7) var mangaUrl: String,
-    @ProtoNumber(8) var mangaSourceId: Long
+    @ProtoNumber(8) var mangaSourceId: Long,
 ) {
    fun getMergedMangaReference(): MergedMangaReference {
        return MergedMangaReference(
@@ -30,7 +30,7 @@ data class BackupMergedMangaReference(
            mangaSourceId = mangaSourceId,
            mergeId = null,
            mangaId = null,
-            id = null
+            id = null,
        )
    }

@@ -44,7 +44,7 @@ data class BackupMergedMangaReference(
                downloadChapters = mergedMangaReference.downloadChapters,
                mergeUrl = mergedMangaReference.mergeUrl,
                mangaUrl = mergedMangaReference.mangaUrl,
-                mangaSourceId = mergedMangaReference.mangaSourceId
+                mangaSourceId = mergedMangaReference.mangaSourceId,
            )
        }
    }
@@ -11,5 +11,5 @@ data class BackupSavedSearch(
    @ProtoNumber(1) val name: String,
    @ProtoNumber(2) val query: String = "",
    @ProtoNumber(3) val filterList: String = "",
-    @ProtoNumber(4) val source: Long = 0
+    @ProtoNumber(4) val source: Long = 0,
 )
@@ -5,15 +5,21 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoNumber

@Serializable
-data class BackupSource(
+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,
 ) {
    companion object {
        fun copyFrom(source: Source): BackupSource {
            return BackupSource(
                name = source.name,
-                sourceId = source.id
+                sourceId = source.id,
            )
        }
    }
@@ -32,8 +32,7 @@ data class BackupTracking(
            media_id = this@BackupTracking.mediaId
            library_id = this@BackupTracking.libraryId
            title = this@BackupTracking.title
-            // convert from float to int because of 1.x types
-            last_chapter_read = this@BackupTracking.lastChapterRead.toInt()
+            last_chapter_read = this@BackupTracking.lastChapterRead
            total_chapters = this@BackupTracking.totalChapters
            score = this@BackupTracking.score
            status = this@BackupTracking.status
@@ -51,14 +50,13 @@ data class BackupTracking(
                // forced not null so its compatible with 1.x backup system
                libraryId = track.library_id!!,
                title = track.title,
-                // convert to float for 1.x
-                lastChapterRead = track.last_chapter_read.toFloat(),
+                lastChapterRead = track.last_chapter_read,
                totalChapters = track.total_chapters,
                score = track.score,
                status = track.status,
                startedReadingDate = track.started_reading_date,
                finishedReadingDate = track.finished_reading_date,
-                trackingUrl = track.tracking_url
+                trackingUrl = track.tracking_url,
            )
        }
    }
@@ -9,7 +9,7 @@ data class BackupSearchMetadata(
    @ProtoNumber(1) var uploader: String? = null,
    @ProtoNumber(2) var extra: String,
    @ProtoNumber(3) var indexedExtra: String? = null,
-    @ProtoNumber(4) var extraVersion: Int
+    @ProtoNumber(4) var extraVersion: Int,
 ) {
    fun getSearchMetadata(mangaId: Long): SearchMetadata {
        return SearchMetadata(
@@ -17,7 +17,7 @@ data class BackupSearchMetadata(
            uploader = uploader,
            extra = extra,
            indexedExtra = indexedExtra,
-            extraVersion = extraVersion
+            extraVersion = extraVersion,
        )
    }

@@ -27,7 +27,7 @@ data class BackupSearchMetadata(
                uploader = searchMetadata.uploader,
                extra = searchMetadata.extra,
                indexedExtra = searchMetadata.indexedExtra,
-                extraVersion = searchMetadata.extraVersion
+                extraVersion = searchMetadata.extraVersion,
            )
        }
    }
@@ -8,7 +8,7 @@ import kotlinx.serialization.protobuf.ProtoNumber
 data class BackupSearchTag(
    @ProtoNumber(1) var namespace: String? = null,
    @ProtoNumber(2) var name: String,
-    @ProtoNumber(3) var type: Int
+    @ProtoNumber(3) var type: Int,
 ) {
    fun getSearchTag(mangaId: Long): SearchTag {
        return SearchTag(
@@ -16,7 +16,7 @@ data class BackupSearchTag(
            mangaId = mangaId,
            namespace = namespace,
            name = name,
-            type = type
+            type = type,
        )
    }

@@ -25,7 +25,7 @@ data class BackupSearchTag(
            return BackupSearchTag(
                namespace = searchTag.namespace,
                name = searchTag.name,
-                type = searchTag.type
+                type = searchTag.type,
            )
        }
    }
@@ -7,14 +7,14 @@ import kotlinx.serialization.protobuf.ProtoNumber
@Serializable
 data class BackupSearchTitle(
    @ProtoNumber(1) var title: String,
-    @ProtoNumber(2) var type: Int
+    @ProtoNumber(2) var type: Int,
 ) {
    fun getSearchTitle(mangaId: Long): SearchTitle {
        return SearchTitle(
            id = null,
            mangaId = mangaId,
            title = title,
-            type = type
+            type = type,
        )
    }

@@ -22,7 +22,7 @@ data class BackupSearchTitle(
        fun copyFrom(searchTitle: SearchTitle): BackupSearchTitle {
            return BackupSearchTitle(
                title = searchTitle.title,
-                type = searchTitle.type
+                type = searchTitle.type,
            )
        }
    }
@@ -2,60 +2,69 @@ package eu.kanade.tachiyomi.data.backup.legacy

 import android.content.Context
 import android.net.Uri
-import com.github.salomonbrys.kotson.fromJson
-import com.github.salomonbrys.kotson.registerTypeAdapter
-import com.github.salomonbrys.kotson.registerTypeHierarchyAdapter
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import com.google.gson.JsonArray
-import com.google.gson.JsonElement
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.backup.AbstractBackupManager
-import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.CURRENT_VERSION
+import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.Companion.CURRENT_VERSION
 import eu.kanade.tachiyomi.data.backup.legacy.models.DHistory
-import eu.kanade.tachiyomi.data.backup.legacy.serializer.CategoryTypeAdapter
-import eu.kanade.tachiyomi.data.backup.legacy.serializer.ChapterTypeAdapter
-import eu.kanade.tachiyomi.data.backup.legacy.serializer.HistoryTypeAdapter
-import eu.kanade.tachiyomi.data.backup.legacy.serializer.MangaTypeAdapter
-import eu.kanade.tachiyomi.data.backup.legacy.serializer.MergedMangaReferenceTypeAdapter
-import eu.kanade.tachiyomi.data.backup.legacy.serializer.TrackTypeAdapter
-import eu.kanade.tachiyomi.data.database.models.CategoryImpl
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.CategoryImplTypeSerializer
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.CategoryTypeSerializer
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.ChapterImplTypeSerializer
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.ChapterTypeSerializer
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.HistoryTypeSerializer
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.MangaImplTypeSerializer
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.MangaTypeSerializer
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.MergedMangaTypeSerializer
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.TrackImplTypeSerializer
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.TrackTypeSerializer
+import eu.kanade.tachiyomi.data.database.models.Category
 import eu.kanade.tachiyomi.data.database.models.Chapter
-import eu.kanade.tachiyomi.data.database.models.ChapterImpl
 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.MangaImpl
 import eu.kanade.tachiyomi.data.database.models.Track
-import eu.kanade.tachiyomi.data.database.models.TrackImpl
 import eu.kanade.tachiyomi.data.database.models.toMangaInfo
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.model.toSManga
 import eu.kanade.tachiyomi.source.online.all.MergedSource
 import exh.eh.EHentaiThrottleManager
 import exh.merged.sql.models.MergedMangaReference
-import exh.savedsearches.JsonSavedSearch
+import exh.savedsearches.models.SavedSearch
 import exh.source.MERGED_SOURCE_ID
+import exh.util.nullIfBlank
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import timber.log.Timber
-import java.lang.RuntimeException
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.contentOrNull
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonPrimitive
+import kotlinx.serialization.modules.SerializersModule
+import kotlinx.serialization.modules.contextual
 import kotlin.math.max

 class LegacyBackupManager(context: Context, version: Int = CURRENT_VERSION) : AbstractBackupManager(context) {

-    val parser: Gson = when (version) {
-        2 -> GsonBuilder()
-            .registerTypeAdapter<MangaImpl>(MangaTypeAdapter.build())
-            .registerTypeHierarchyAdapter<ChapterImpl>(ChapterTypeAdapter.build())
-            .registerTypeAdapter<CategoryImpl>(CategoryTypeAdapter.build())
-            .registerTypeAdapter<DHistory>(HistoryTypeAdapter.build())
-            .registerTypeHierarchyAdapter<TrackImpl>(TrackTypeAdapter.build())
-            // SY -->
-            .registerTypeAdapter<MergedMangaReference>(MergedMangaReferenceTypeAdapter.build())
-            // SY <--
-            .create()
+    val parser: Json = when (version) {
+        2 -> Json {
+            // Forks may have added items to backup
+            ignoreUnknownKeys = true
+
+            // Register custom serializers
+            serializersModule = SerializersModule {
+                contextual(MangaTypeSerializer)
+                contextual(MangaImplTypeSerializer)
+                contextual(ChapterTypeSerializer)
+                contextual(ChapterImplTypeSerializer)
+                contextual(CategoryTypeSerializer)
+                contextual(CategoryImplTypeSerializer)
+                contextual(TrackTypeSerializer)
+                contextual(TrackImplTypeSerializer)
+                contextual(HistoryTypeSerializer)
+                // SY -->
+                contextual(MergedMangaTypeSerializer)
+                // SY <--
+            }
+        }
        else -> throw Exception("Unknown backup version")
    }

@@ -63,9 +72,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) {
@@ -116,12 +125,11 @@ class LegacyBackupManager(context: Context, version: Int = CURRENT_VERSION) : Ab
    /**
     * Restore the categories from Json
     *
-     * @param jsonCategories array containing categories
+     * @param backupCategories array containing categories
     */
-    internal fun restoreCategories(jsonCategories: JsonArray) {
+    internal fun restoreCategories(backupCategories: List<Category>) {
        // Get categories from file and from db
        val dbCategories = databaseHelper.getCategories().executeAsBlocking()
-        val backupCategories = parser.fromJson<List<CategoryImpl>>(jsonCategories)

        // Iterate over them
        backupCategories.forEach { category ->
@@ -281,58 +289,39 @@ class LegacyBackupManager(context: Context, version: Int = CURRENT_VERSION) : Ab
    }

    // SY -->
-    internal fun restoreSavedSearches(jsonSavedSearches: JsonElement) {
-        val backupSavedSearches = jsonSavedSearches.asString.split("***").toSet()
+    internal fun restoreSavedSearches(jsonSavedSearches: String) {
+        val backupSavedSearches = jsonSavedSearches.split("***").toSet()
+
+        val currentSavedSearches = databaseHelper.getSavedSearches().executeAsBlocking()

        val newSavedSearches = backupSavedSearches.mapNotNull {
-            try {
-                val id = it.substringBefore(':').toLong()
-                val content = Json.decodeFromString<JsonSavedSearch>(it.substringAfter(':'))
-                id to content
-            } catch (t: RuntimeException) {
-                // Load failed
-                Timber.e(t, "Failed to load saved search!")
-                t.printStackTrace()
-                null
-            }
-        }.toMutableList()
+            runCatching {
+                val content = parser.decodeFromString<JsonObject>(it.substringAfter(':'))
+                SavedSearch(
+                    id = null,
+                    source = it.substringBefore(':').toLongOrNull() ?: return@mapNotNull null,
+                    content["name"]!!.jsonPrimitive.content,
+                    content["query"]!!.jsonPrimitive.contentOrNull?.nullIfBlank(),
+                    Json.encodeToString(content["filters"]!!.jsonArray),
+                )
+            }.getOrNull()
+        }.filter { backupSavedSearch ->
+            currentSavedSearches.none { it.name == backupSavedSearch.name && it.source == backupSavedSearch.source }
+        }.ifEmpty { null }

-        val currentSources = newSavedSearches.map { it.first }.toSet()
-
-        newSavedSearches += preferences.savedSearches().get().mapNotNull {
-            try {
-                val id = it.substringBefore(':').toLong()
-                val content = Json.decodeFromString<JsonSavedSearch>(it.substringAfter(':'))
-                id to content
-            } catch (t: RuntimeException) {
-                // Load failed
-                Timber.e(t, "Failed to load saved search!")
-                t.printStackTrace()
-                null
-            }
-        }.toMutableList()
-
-        val otherSerialized = preferences.savedSearches().get().mapNotNull {
-            val sourceId = it.split(":")[0].toLongOrNull() ?: return@mapNotNull null
-            if (sourceId in currentSources) return@mapNotNull null
-            it
+        if (newSavedSearches != null) {
+            databaseHelper.insertSavedSearches(newSavedSearches)
        }
-
-        val newSerialized = newSavedSearches.map {
-            "${it.first}:" + Json.encodeToString(it.second)
-        }
-        preferences.savedSearches().set((otherSerialized + newSerialized).toSet())
    }

    /**
     * Restore the categories from Json
     *
-     * @param jsonMergedMangaReferences array containing md manga references
+     * @param backupMergedMangaReferences array containing md manga references
     */
-    internal fun restoreMergedMangaReferences(jsonMergedMangaReferences: JsonArray) {
+    internal fun restoreMergedMangaReferences(backupMergedMangaReferences: List<MergedMangaReference>) {
        // Get merged manga references from file and from db
        val dbMergedMangaReferences = databaseHelper.getMergedMangaReferences().executeAsBlocking()
-        val backupMergedMangaReferences = parser.fromJson<List<MergedMangaReference>>(jsonMergedMangaReferences)
        var lastMergeManga: Manga? = null

        // Iterate over them
@@ -2,26 +2,26 @@ package eu.kanade.tachiyomi.data.backup.legacy

 import android.content.Context
 import android.net.Uri
-import com.github.salomonbrys.kotson.fromJson
-import com.google.gson.JsonArray
-import com.google.gson.JsonElement
-import com.google.gson.JsonObject
-import com.google.gson.JsonParser
-import com.google.gson.stream.JsonReader
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.backup.AbstractBackupRestore
 import eu.kanade.tachiyomi.data.backup.BackupNotifier
 import eu.kanade.tachiyomi.data.backup.legacy.models.Backup
-import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.MANGAS
 import eu.kanade.tachiyomi.data.backup.legacy.models.DHistory
+import eu.kanade.tachiyomi.data.backup.legacy.models.MangaObject
+import eu.kanade.tachiyomi.data.database.models.Category
 import eu.kanade.tachiyomi.data.database.models.Chapter
-import eu.kanade.tachiyomi.data.database.models.ChapterImpl
 import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.database.models.MangaImpl
 import eu.kanade.tachiyomi.data.database.models.Track
-import eu.kanade.tachiyomi.data.database.models.TrackImpl
 import eu.kanade.tachiyomi.source.Source
 import exh.EXHMigrations
+import exh.merged.sql.models.MergedMangaReference
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.decodeFromJsonElement
+import kotlinx.serialization.json.decodeFromStream
+import kotlinx.serialization.json.intOrNull
+import kotlinx.serialization.json.jsonPrimitive
+import okio.source
 import java.util.Date

 class LegacyBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBackupRestore<LegacyBackupManager>(context, notifier) {
@@ -30,59 +30,59 @@ class LegacyBackupRestore(context: Context, notifier: BackupNotifier) : Abstract
        // SY -->
        throttleManager.resetThrottle()
        // SY <--
-        val reader = JsonReader(context.contentResolver.openInputStream(uri)!!.bufferedReader())
-        val json = JsonParser.parseReader(reader).asJsonObject

-        val version = json.get(Backup.VERSION)?.asInt ?: 1
+        // 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)!!,
+        )
+
+        // Get parser version
+        val version = backupObject["version"]?.jsonPrimitive?.intOrNull ?: 1
+
+        // Initialize manager
        backupManager = LegacyBackupManager(context, version)

-        val mangasJson = json.get(MANGAS).asJsonArray
-        restoreAmount = mangasJson.size() + 3 // +1 for categories, +1 for saved searches, +1 for merged manga references
+        // Decode the json object to a Backup object
+        val backup = backupManager.parser.decodeFromJsonElement<Backup>(backupObject)

-        // Restore categories
-        json.get(Backup.CATEGORIES)?.let { restoreCategories(it) }
+        restoreAmount = backup.mangas.size + 3 // +1 for categories, +1 for saved searches, +1 for merged manga references

        // SY -->
-        json.get(Backup.SAVEDSEARCHES)?.let { restoreSavedSearches(it) }
+        backup.savedSearches?.let { restoreSavedSearches(it) }

-        json.get(Backup.MERGEDMANGAREFERENCES)?.let { restoreMergedMangaReferences(it) }
+        backup.mergedMangaReferences?.let { restoreMergedMangaReferences(it) }
        // SY <--

+        // Restore categories
+        backup.categories?.let { restoreCategories(it) }
+
        // Store source mapping for error messages
-        sourceMapping = LegacyBackupRestoreValidator.getSourceMapping(json)
+        sourceMapping = LegacyBackupRestoreValidator.getSourceMapping(backup.extensions ?: emptyList())

        // Restore individual manga
-        mangasJson.forEach {
+        backup.mangas.forEach {
            if (job?.isActive != true) {
                return false
            }

-            restoreManga(it.asJsonObject)
+            restoreManga(it)
        }

        return true
    }

-    private fun restoreCategories(categoriesJson: JsonElement) {
-        db.inTransaction {
-            backupManager.restoreCategories(categoriesJson.asJsonArray)
-        }
-
-        restoreProgress += 1
-        showRestoreProgress(restoreProgress, restoreAmount, context.getString(R.string.categories))
-    }
-
    // SY -->
-    private fun restoreSavedSearches(savedSearchesJson: JsonElement) {
-        backupManager.restoreSavedSearches(savedSearchesJson)
+    private fun restoreSavedSearches(savedSearches: String) {
+        backupManager.restoreSavedSearches(savedSearches)

        restoreProgress += 1
        showRestoreProgress(restoreProgress, restoreAmount, context.getString(R.string.saved_searches))
    }

-    private fun restoreMergedMangaReferences(mergedMangaReferencesJson: JsonElement) {
+    private fun restoreMergedMangaReferences(mergedMangaReferences: List<MergedMangaReference>) {
        db.inTransaction {
-            backupManager.restoreMergedMangaReferences(mergedMangaReferencesJson.asJsonArray)
+            backupManager.restoreMergedMangaReferences(mergedMangaReferences)
        }

        restoreProgress += 1
@@ -90,28 +90,21 @@ class LegacyBackupRestore(context: Context, notifier: BackupNotifier) : Abstract
    }
    // SY <--

-    private suspend fun restoreManga(mangaJson: JsonObject) {
-        val manga = backupManager.parser.fromJson<MangaImpl>(
-            mangaJson.get(
-                Backup.MANGA
-            )
-        )
-        val chapters = backupManager.parser.fromJson<List<ChapterImpl>>(
-            mangaJson.get(Backup.CHAPTERS)
-                ?: JsonArray()
-        )
-        val categories = backupManager.parser.fromJson<List<String>>(
-            mangaJson.get(Backup.CATEGORIES)
-                ?: JsonArray()
-        )
-        val history = backupManager.parser.fromJson<List<DHistory>>(
-            mangaJson.get(Backup.HISTORY)
-                ?: JsonArray()
-        )
-        val tracks = backupManager.parser.fromJson<List<TrackImpl>>(
-            mangaJson.get(Backup.TRACK)
-                ?: JsonArray()
-        )
+    private fun restoreCategories(categoriesJson: List<Category>) {
+        db.inTransaction {
+            backupManager.restoreCategories(categoriesJson)
+        }
+
+        restoreProgress += 1
+        showRestoreProgress(restoreProgress, restoreAmount, context.getString(R.string.categories))
+    }
+
+    private suspend fun restoreManga(mangaJson: MangaObject) {
+        val manga = mangaJson.manga
+        val chapters = mangaJson.chapters ?: emptyList()
+        val categories = mangaJson.categories ?: emptyList()
+        val history = mangaJson.history ?: emptyList()
+        val tracks = mangaJson.track ?: emptyList()

        // EXH -->
        EXHMigrations.migrateBackupEntry(manga)
@@ -150,7 +143,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)

@@ -180,7 +173,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)
@@ -202,7 +195,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)
@@ -2,14 +2,14 @@ package eu.kanade.tachiyomi.data.backup.legacy

 import android.content.Context
 import android.net.Uri
-import com.google.gson.JsonObject
-import com.google.gson.JsonParser
-import com.google.gson.stream.JsonReader
 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,30 +17,34 @@ class LegacyBackupRestoreValidator : AbstractBackupRestoreValidator() {
     * @return List of missing sources or missing trackers.
     */
    override fun validate(context: Context, uri: Uri): Results {
-        val reader = JsonReader(context.contentResolver.openInputStream(uri)!!.bufferedReader())
-        val json = JsonParser.parseReader(reader).asJsonObject
+        val backupManager = LegacyBackupManager(context)

-        val version = json.get(Backup.VERSION)
-        val mangasJson = json.get(Backup.MANGAS)
-        if (version == null || mangasJson == null) {
+        val backup = try {
+            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))
        }

-        val mangas = mangasJson.asJsonArray
-        if (mangas.size() == 0) {
+        if (backup.mangas.isEmpty()) {
            throw Exception(context.getString(R.string.invalid_backup_file_missing_manga))
        }

-        val sources = getSourceMapping(json)
+        val sources = getSourceMapping(backup.extensions ?: emptyList())
        val missingSources = sources
            .filter { sourceManager.get(it.key) == null }
            .values
            .sorted()

-        val trackers = mangas
-            .filter { it.asJsonObject.has("track") }
-            .flatMap { it.asJsonObject["track"].asJsonArray }
-            .map { it.asJsonObject["s"].asInt }
+        val trackers = backup.mangas
+            .filterNot { it.track.isNullOrEmpty() }
+            .flatMap { it.track ?: emptyList() }
+            .map { it.sync_id }
            .distinct()
        val missingTrackers = trackers
            .mapNotNull { trackManager.getService(it) }
@@ -52,15 +56,11 @@ class LegacyBackupRestoreValidator : AbstractBackupRestoreValidator() {
    }

    companion object {
-        fun getSourceMapping(json: JsonObject): Map<Long, String> {
-            val extensionsMapping = json.get(Backup.EXTENSIONS) ?: return emptyMap()
-
-            return extensionsMapping.asJsonArray
-                .map {
-                    val items = it.asString.split(":")
-                    items[0].toLong() to items[1]
-                }
-                .toMap()
+        fun getSourceMapping(extensionsMapping: List<String>): Map<Long, String> {
+            return extensionsMapping.associate {
+                val items = it.split(":")
+                items[0].toLong() to items[1]
+            }
        }
    }
 }
@@ -1,30 +1,43 @@
 package eu.kanade.tachiyomi.data.backup.legacy.models

+import eu.kanade.tachiyomi.data.database.models.Category
+import eu.kanade.tachiyomi.data.database.models.Chapter
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.models.Track
+import exh.merged.sql.models.MergedMangaReference
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale

-/**
- * Json values
- */
-object Backup {
-    const val CURRENT_VERSION = 2
-    const val MANGA = "manga"
-    const val MANGAS = "mangas"
-    const val TRACK = "track"
-    const val CHAPTERS = "chapters"
-    const val CATEGORIES = "categories"
-    const val EXTENSIONS = "extensions"
-    const val HISTORY = "history"
-    const val VERSION = "version"
+@Serializable
+data class Backup(
+    val version: Int? = null,
+    var mangas: MutableList<MangaObject> = mutableListOf(),
+    var categories: List<@Contextual Category>? = null,
+    var extensions: List<String>? = null,
+    // SY Specific values
+    @SerialName("mergedmangareferences")
+    var mergedMangaReferences: List<@Contextual MergedMangaReference>? = null,
+    var savedSearches: String? = null,
+) {
+    companion object {
+        const val CURRENT_VERSION = 2

-    // SY -->
-    const val SAVEDSEARCHES = "savedsearches"
-    const val MERGEDMANGAREFERENCES = "mergedmangareferences"
-    // SY <--
-
-    fun getDefaultFilename(): String {
-        val date = SimpleDateFormat("yyyy-MM-dd_HH-mm", Locale.getDefault()).format(Date())
-        return "tachiyomi_$date.json"
+        fun getDefaultFilename(): String {
+            val date = SimpleDateFormat("yyyy-MM-dd_HH-mm", Locale.getDefault()).format(Date())
+            return "tachiyomi_$date.json"
+        }
    }
 }
+
+@Serializable
+data class MangaObject(
+    var manga: @Contextual Manga,
+    var chapters: List<@Contextual Chapter>? = null,
+    var categories: List<String>? = null,
+    var track: List<@Contextual Track>? = null,
+    var history: List<@Contextual DHistory>? = null,
+)
@@ -1,31 +0,0 @@
-package eu.kanade.tachiyomi.data.backup.legacy.serializer
-
-import com.github.salomonbrys.kotson.typeAdapter
-import com.google.gson.TypeAdapter
-import eu.kanade.tachiyomi.data.database.models.CategoryImpl
-
-/**
- * JSON Serializer used to write / read [CategoryImpl] to / from json
- */
-object CategoryTypeAdapter {
-
-    fun build(): TypeAdapter<CategoryImpl> {
-        return typeAdapter {
-            write {
-                beginArray()
-                value(it.name)
-                value(it.order)
-                endArray()
-            }
-
-            read {
-                beginArray()
-                val category = CategoryImpl()
-                category.name = nextString()
-                category.order = nextInt()
-                endArray()
-                category
-            }
-        }
-    }
-}
@@ -0,0 +1,49 @@
+package eu.kanade.tachiyomi.data.backup.legacy.serializer
+
+import eu.kanade.tachiyomi.data.database.models.Category
+import eu.kanade.tachiyomi.data.database.models.CategoryImpl
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.buildClassSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonDecoder
+import kotlinx.serialization.json.JsonEncoder
+import kotlinx.serialization.json.add
+import kotlinx.serialization.json.buildJsonArray
+import kotlinx.serialization.json.int
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonPrimitive
+
+/**
+ * JSON Serializer used to write / read [CategoryImpl] to / from json
+ */
+open class CategoryBaseSerializer<T : Category> : KSerializer<T> {
+    override val descriptor: SerialDescriptor = buildClassSerialDescriptor("Category")
+
+    override fun serialize(encoder: Encoder, value: T) {
+        encoder as JsonEncoder
+        encoder.encodeJsonElement(
+            buildJsonArray {
+                add(value.name)
+                add(value.order)
+            },
+        )
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    override fun deserialize(decoder: Decoder): T {
+        // make a category impl and cast as T so that the serializer accepts it
+        return CategoryImpl().apply {
+            decoder as JsonDecoder
+            val array = decoder.decodeJsonElement().jsonArray
+            name = array[0].jsonPrimitive.content
+            order = array[1].jsonPrimitive.int
+        } as T
+    }
+}
+
+// Allow for serialization of a category and category impl
+object CategoryTypeSerializer : CategoryBaseSerializer<Category>()
+
+object CategoryImplTypeSerializer : CategoryBaseSerializer<CategoryImpl>()
@@ -1,59 +0,0 @@
-package eu.kanade.tachiyomi.data.backup.legacy.serializer
-
-import com.github.salomonbrys.kotson.typeAdapter
-import com.google.gson.TypeAdapter
-import com.google.gson.stream.JsonToken
-import eu.kanade.tachiyomi.data.database.models.ChapterImpl
-
-/**
- * JSON Serializer used to write / read [ChapterImpl] to / from json
- */
-object ChapterTypeAdapter {
-
-    private const val URL = "u"
-    private const val READ = "r"
-    private const val BOOKMARK = "b"
-    private const val LAST_READ = "l"
-
-    fun build(): TypeAdapter<ChapterImpl> {
-        return typeAdapter {
-            write {
-                if (it.read || it.bookmark || it.last_page_read != 0) {
-                    beginObject()
-                    name(URL)
-                    value(it.url)
-                    if (it.read) {
-                        name(READ)
-                        value(1)
-                    }
-                    if (it.bookmark) {
-                        name(BOOKMARK)
-                        value(1)
-                    }
-                    if (it.last_page_read != 0) {
-                        name(LAST_READ)
-                        value(it.last_page_read)
-                    }
-                    endObject()
-                }
-            }
-
-            read {
-                val chapter = ChapterImpl()
-                beginObject()
-                while (hasNext()) {
-                    if (peek() == JsonToken.NAME) {
-                        when (nextName()) {
-                            URL -> chapter.url = nextString()
-                            READ -> chapter.read = nextInt() == 1
-                            BOOKMARK -> chapter.bookmark = nextInt() == 1
-                            LAST_READ -> chapter.last_page_read = nextInt()
-                        }
-                    }
-                }
-                endObject()
-                chapter
-            }
-        }
-    }
-}
@@ -0,0 +1,66 @@
+package eu.kanade.tachiyomi.data.backup.legacy.serializer
+
+import eu.kanade.tachiyomi.data.database.models.Chapter
+import eu.kanade.tachiyomi.data.database.models.ChapterImpl
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.buildClassSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonDecoder
+import kotlinx.serialization.json.JsonEncoder
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.intOrNull
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
+import kotlinx.serialization.json.put
+
+/**
+ * JSON Serializer used to write / read [ChapterImpl] to / from json
+ */
+open class ChapterBaseSerializer<T : Chapter> : KSerializer<T> {
+
+    override val descriptor = buildClassSerialDescriptor("Chapter")
+
+    override fun serialize(encoder: Encoder, value: T) {
+        encoder as JsonEncoder
+        encoder.encodeJsonElement(
+            buildJsonObject {
+                put(URL, value.url)
+                if (value.read) {
+                    put(READ, 1)
+                }
+                if (value.bookmark) {
+                    put(BOOKMARK, 1)
+                }
+                if (value.last_page_read != 0) {
+                    put(LAST_READ, value.last_page_read)
+                }
+            },
+        )
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    override fun deserialize(decoder: Decoder): T {
+        // make a chapter impl and cast as T so that the serializer accepts it
+        return ChapterImpl().apply {
+            decoder as JsonDecoder
+            val jsonObject = decoder.decodeJsonElement().jsonObject
+            url = jsonObject[URL]!!.jsonPrimitive.content
+            read = jsonObject[READ]?.jsonPrimitive?.intOrNull == 1
+            bookmark = jsonObject[BOOKMARK]?.jsonPrimitive?.intOrNull == 1
+            last_page_read = jsonObject[LAST_READ]?.jsonPrimitive?.intOrNull ?: last_page_read
+        } as T
+    }
+
+    companion object {
+        private const val URL = "u"
+        private const val READ = "r"
+        private const val BOOKMARK = "b"
+        private const val LAST_READ = "l"
+    }
+}
+
+// Allow for serialization of a chapter and chapter impl
+object ChapterTypeSerializer : ChapterBaseSerializer<Chapter>()
+
+object ChapterImplTypeSerializer : ChapterBaseSerializer<ChapterImpl>()
@@ -1,32 +0,0 @@
-package eu.kanade.tachiyomi.data.backup.legacy.serializer
-
-import com.github.salomonbrys.kotson.typeAdapter
-import com.google.gson.TypeAdapter
-import eu.kanade.tachiyomi.data.backup.legacy.models.DHistory
-
-/**
- * JSON Serializer used to write / read [DHistory] to / from json
- */
-object HistoryTypeAdapter {
-
-    fun build(): TypeAdapter<DHistory> {
-        return typeAdapter {
-            write {
-                if (it.lastRead != 0L) {
-                    beginArray()
-                    value(it.url)
-                    value(it.lastRead)
-                    endArray()
-                }
-            }
-
-            read {
-                beginArray()
-                val url = nextString()
-                val lastRead = nextLong()
-                endArray()
-                DHistory(url, lastRead)
-            }
-        }
-    }
-}
@@ -0,0 +1,41 @@
+package eu.kanade.tachiyomi.data.backup.legacy.serializer
+
+import eu.kanade.tachiyomi.data.backup.legacy.models.DHistory
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.buildClassSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonDecoder
+import kotlinx.serialization.json.JsonEncoder
+import kotlinx.serialization.json.add
+import kotlinx.serialization.json.buildJsonArray
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonPrimitive
+import kotlinx.serialization.json.long
+
+/**
+ * JSON Serializer used to write / read [DHistory] to / from json
+ */
+object HistoryTypeSerializer : KSerializer<DHistory> {
+    override val descriptor: SerialDescriptor = buildClassSerialDescriptor("History")
+
+    override fun serialize(encoder: Encoder, value: DHistory) {
+        encoder as JsonEncoder
+        encoder.encodeJsonElement(
+            buildJsonArray {
+                add(value.url)
+                add(value.lastRead)
+            },
+        )
+    }
+
+    override fun deserialize(decoder: Decoder): DHistory {
+        decoder as JsonDecoder
+        val array = decoder.decodeJsonElement().jsonArray
+        return DHistory(
+            url = array[0].jsonPrimitive.content,
+            lastRead = array[1].jsonPrimitive.long,
+        )
+    }
+}
@@ -1,39 +0,0 @@
-package eu.kanade.tachiyomi.data.backup.legacy.serializer
-
-import com.github.salomonbrys.kotson.typeAdapter
-import com.google.gson.TypeAdapter
-import eu.kanade.tachiyomi.data.database.models.MangaImpl
-
-/**
- * JSON Serializer used to write / read [MangaImpl] to / from json
- */
-object MangaTypeAdapter {
-
-    fun build(): TypeAdapter<MangaImpl> {
-        return typeAdapter {
-            write {
-                beginArray()
-                value(it.url)
-                // SY -->
-                value(it.originalTitle)
-                // SY <--
-                value(it.source)
-                value(it.viewer_flags)
-                value(it.chapter_flags)
-                endArray()
-            }
-
-            read {
-                beginArray()
-                val manga = MangaImpl()
-                manga.url = nextString()
-                manga.title = nextString()
-                manga.source = nextLong()
-                manga.viewer_flags = nextInt()
-                manga.chapter_flags = nextInt()
-                endArray()
-                manga
-            }
-        }
-    }
-}
@@ -0,0 +1,56 @@
+package eu.kanade.tachiyomi.data.backup.legacy.serializer
+
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.models.MangaImpl
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.buildClassSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonDecoder
+import kotlinx.serialization.json.JsonEncoder
+import kotlinx.serialization.json.add
+import kotlinx.serialization.json.buildJsonArray
+import kotlinx.serialization.json.int
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonPrimitive
+import kotlinx.serialization.json.long
+
+/**
+ * JSON Serializer used to write / read [MangaImpl] to / from json
+ */
+open class MangaBaseSerializer<T : Manga> : KSerializer<T> {
+    override val descriptor: SerialDescriptor = buildClassSerialDescriptor("Manga")
+
+    override fun serialize(encoder: Encoder, value: T) {
+        encoder as JsonEncoder
+        encoder.encodeJsonElement(
+            buildJsonArray {
+                add(value.url)
+                add(value.title)
+                add(value.source)
+                add(value.viewer_flags)
+                add(value.chapter_flags)
+            },
+        )
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    override fun deserialize(decoder: Decoder): T {
+        // make a manga impl and cast as T so that the serializer accepts it
+        return MangaImpl().apply {
+            decoder as JsonDecoder
+            val array = decoder.decodeJsonElement().jsonArray
+            url = array[0].jsonPrimitive.content
+            title = array[1].jsonPrimitive.content
+            source = array[2].jsonPrimitive.long
+            viewer_flags = array[3].jsonPrimitive.int
+            chapter_flags = array[4].jsonPrimitive.int
+        } as T
+    }
+}
+
+// Allow for serialization of a manga and manga impl
+object MangaTypeSerializer : MangaBaseSerializer<Manga>()
+
+object MangaImplTypeSerializer : MangaBaseSerializer<MangaImpl>()
@@ -1,45 +0,0 @@
-package eu.kanade.tachiyomi.data.backup.legacy.serializer
-
-import com.github.salomonbrys.kotson.typeAdapter
-import com.google.gson.TypeAdapter
-import exh.merged.sql.models.MergedMangaReference
-
-/**
- * JSON Serializer used to write / read [MergedMangaReference] to / from json
- */
-object MergedMangaReferenceTypeAdapter {
-
-    fun build(): TypeAdapter<MergedMangaReference> {
-        return typeAdapter {
-            write {
-                beginArray()
-                value(it.mangaUrl)
-                value(it.mergeUrl)
-                value(it.mangaSourceId)
-                value(it.chapterSortMode)
-                value(it.chapterPriority)
-                value(it.getChapterUpdates)
-                value(it.isInfoManga)
-                value(it.downloadChapters)
-                endArray()
-            }
-
-            read {
-                beginArray()
-                MergedMangaReference(
-                    id = null,
-                    mangaUrl = nextString(),
-                    mergeUrl = nextString(),
-                    mangaSourceId = nextLong(),
-                    chapterSortMode = nextInt(),
-                    chapterPriority = nextInt(),
-                    getChapterUpdates = nextBoolean(),
-                    isInfoManga = nextBoolean(),
-                    downloadChapters = nextBoolean(),
-                    mangaId = null,
-                    mergeId = null
-                )
-            }
-        }
-    }
-}
@@ -0,0 +1,58 @@
+package eu.kanade.tachiyomi.data.backup.legacy.serializer
+
+import exh.merged.sql.models.MergedMangaReference
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.buildClassSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonDecoder
+import kotlinx.serialization.json.JsonEncoder
+import kotlinx.serialization.json.add
+import kotlinx.serialization.json.boolean
+import kotlinx.serialization.json.buildJsonArray
+import kotlinx.serialization.json.int
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonPrimitive
+import kotlinx.serialization.json.long
+
+/**
+ * JSON Serializer used to write / read [MergedMangaReference] to / from json
+ */
+object MergedMangaTypeSerializer : KSerializer<MergedMangaReference> {
+    override val descriptor: SerialDescriptor = buildClassSerialDescriptor("Manga")
+
+    override fun serialize(encoder: Encoder, value: MergedMangaReference) {
+        encoder as JsonEncoder
+        encoder.encodeJsonElement(
+            buildJsonArray {
+                add(value.mangaUrl)
+                add(value.mergeUrl)
+                add(value.mangaSourceId)
+                add(value.chapterSortMode)
+                add(value.chapterPriority)
+                add(value.getChapterUpdates)
+                add(value.isInfoManga)
+                add(value.downloadChapters)
+            },
+        )
+    }
+
+    override fun deserialize(decoder: Decoder): MergedMangaReference {
+        decoder as JsonDecoder
+        val array = decoder.decodeJsonElement().jsonArray
+        return MergedMangaReference(
+            id = null,
+            mangaUrl = array[0].jsonPrimitive.content,
+            mergeUrl = array[1].jsonPrimitive.content,
+            mangaSourceId = array[2].jsonPrimitive.long,
+            chapterSortMode = array[3].jsonPrimitive.int,
+            chapterPriority = array[4].jsonPrimitive.int,
+            getChapterUpdates = array[5].jsonPrimitive.boolean,
+            isInfoManga = array[6].jsonPrimitive.boolean,
+            downloadChapters = array[7].jsonPrimitive.boolean,
+            mangaId = null,
+            mergeId = null,
+        )
+    }
+}
@@ -1,59 +0,0 @@
-package eu.kanade.tachiyomi.data.backup.legacy.serializer
-
-import com.github.salomonbrys.kotson.typeAdapter
-import com.google.gson.TypeAdapter
-import com.google.gson.stream.JsonToken
-import eu.kanade.tachiyomi.data.database.models.TrackImpl
-
-/**
- * JSON Serializer used to write / read [TrackImpl] to / from json
- */
-object TrackTypeAdapter {
-
-    private const val SYNC = "s"
-    private const val MEDIA = "r"
-    private const val LIBRARY = "ml"
-    private const val TITLE = "t"
-    private const val LAST_READ = "l"
-    private const val TRACKING_URL = "u"
-
-    fun build(): TypeAdapter<TrackImpl> {
-        return typeAdapter {
-            write {
-                beginObject()
-                name(TITLE)
-                value(it.title)
-                name(SYNC)
-                value(it.sync_id)
-                name(MEDIA)
-                value(it.media_id)
-                name(LIBRARY)
-                value(it.library_id)
-                name(LAST_READ)
-                value(it.last_chapter_read)
-                name(TRACKING_URL)
-                value(it.tracking_url)
-                endObject()
-            }
-
-            read {
-                val track = TrackImpl()
-                beginObject()
-                while (hasNext()) {
-                    if (peek() == JsonToken.NAME) {
-                        when (nextName()) {
-                            TITLE -> track.title = nextString()
-                            SYNC -> track.sync_id = nextInt()
-                            MEDIA -> track.media_id = nextInt()
-                            LIBRARY -> track.library_id = nextLong()
-                            LAST_READ -> track.last_chapter_read = nextInt()
-                            TRACKING_URL -> track.tracking_url = nextString()
-                        }
-                    }
-                }
-                endObject()
-                track
-            }
-        }
-    }
-}
@@ -0,0 +1,68 @@
+package eu.kanade.tachiyomi.data.backup.legacy.serializer
+
+import eu.kanade.tachiyomi.data.database.models.Track
+import eu.kanade.tachiyomi.data.database.models.TrackImpl
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.buildClassSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonDecoder
+import kotlinx.serialization.json.JsonEncoder
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.float
+import kotlinx.serialization.json.int
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
+import kotlinx.serialization.json.long
+import kotlinx.serialization.json.put
+
+/**
+ * JSON Serializer used to write / read [TrackImpl] to / from json
+ */
+open class TrackBaseSerializer<T : Track> : KSerializer<T> {
+    override val descriptor: SerialDescriptor = buildClassSerialDescriptor("Track")
+
+    override fun serialize(encoder: Encoder, value: T) {
+        encoder as JsonEncoder
+        encoder.encodeJsonElement(
+            buildJsonObject {
+                put(TITLE, value.title)
+                put(SYNC, value.sync_id)
+                put(MEDIA, value.media_id)
+                put(LIBRARY, value.library_id)
+                put(LAST_READ, value.last_chapter_read)
+                put(TRACKING_URL, value.tracking_url)
+            },
+        )
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    override fun deserialize(decoder: Decoder): T {
+        // make a track impl and cast as T so that the serializer accepts it
+        return TrackImpl().apply {
+            decoder as JsonDecoder
+            val jsonObject = decoder.decodeJsonElement().jsonObject
+            title = jsonObject[TITLE]!!.jsonPrimitive.content
+            sync_id = jsonObject[SYNC]!!.jsonPrimitive.int
+            media_id = jsonObject[MEDIA]!!.jsonPrimitive.int
+            library_id = jsonObject[LIBRARY]!!.jsonPrimitive.long
+            last_chapter_read = jsonObject[LAST_READ]!!.jsonPrimitive.float
+            tracking_url = jsonObject[TRACKING_URL]!!.jsonPrimitive.content
+        } as T
+    }
+
+    companion object {
+        private const val SYNC = "s"
+        private const val MEDIA = "r"
+        private const val LIBRARY = "ml"
+        private const val TITLE = "t"
+        private const val LAST_READ = "l"
+        private const val TRACKING_URL = "u"
+    }
+}
+
+// Allow for serialization of a track and track impl
+object TrackTypeSerializer : TrackBaseSerializer<Track>()
+
+object TrackImplTypeSerializer : TrackBaseSerializer<TrackImpl>()
@@ -93,7 +93,7 @@ class ChapterCache(private val context: Context) {
            File(context.cacheDir, PARAMETER_CACHE_DIRECTORY),
            PARAMETER_APP_VERSION,
            PARAMETER_VALUE_COUNT,
-            cacheSize * 1024 * 1024
+            cacheSize * 1024 * 1024,
        )
    }
    // <-- EH
@@ -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 {
@@ -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
-}
@@ -1,159 +1,267 @@
 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.size.Size
+import coil.request.Options
+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.util.Date
+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> {
-    private val coverCache: CoverCache by injectLazy()
-    private val sourceManager: SourceManager by injectLazy()
-    private val defaultClient = Injekt.get<NetworkHelper>().coilClient
+class MangaCoverFetcher(
+    private val manga: Manga,
+    private val sourceLazy: Lazy<HttpSource?>,
+    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? {
-        if (data.thumbnail_url.isNullOrBlank()) return null
-        return data.thumbnail_url!!
-    }
+    // For non-custom cover
+    private val diskCacheKey: String? by lazy { MangaCoverKeyer().key(manga, options) }
+    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 customCoverFile = coverCache.getCustomCoverFile(data)
+        val useCustomCover = options.parameters.value(USE_CUSTOM_COVER) ?: true
+        val customCoverFile = coverCache.getCustomCoverFile(manga)
        if (useCustomCover && customCoverFile.exists()) {
            return fileLoader(customCoverFile)
        }

-        val cover = data.thumbnail_url
-        return when (getResourceType(cover)) {
-            Type.URL -> httpLoader(data, options)
-            Type.File -> fileLoader(data)
+        // diskCacheKey is thumbnail_url
+        url = diskCacheKey ?: error("No cover specified")
+        return when (getResourceType(url)) {
+            Type.URL -> httpLoader()
+            Type.File -> fileLoader(File(url.substringAfter("file://")))
            null -> error("Invalid image")
        }
    }

-    private suspend fun httpLoader(manga: Manga, options: Options): FetchResult {
-        val coverFile = coverCache.getCoverFile(manga) ?: error("No cover specified")
-
-        // Use previously cached cover if exist
-        if (coverFile.exists() && options.diskCachePolicy.readEnabled) {
-            if (!manga.favorite) {
-                coverFile.setLastModified(Date().time)
-            }
-            return fileLoader(coverFile)
-        }
-
-        val (response, body) = awaitGetCall(manga, options)
-        if (!response.isSuccessful) {
-            body.close()
-            throw HttpException(response)
-        }
-
-        // Write to disk for future use
-        if (options.diskCachePolicy.writeEnabled) {
-            response.peekBody(Long.MAX_VALUE).source().use { input ->
-                val tmpFile = File(coverFile.absolutePath + "_tmp")
-                tmpFile.parentFile?.mkdirs()
-                tmpFile.sink().buffer().use { output ->
-                    output.writeAll(input)
-                }
-                if (coverFile.exists()) {
-                    coverFile.delete()
-                }
-                tmpFile.renameTo(coverFile)
-            }
-        }
-
-        return SourceResult(
-            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> {
-        val call = getCall(manga, options)
-        val response = call.await()
-        return response to checkNotNull(response.body) { "Null response source" }
-    }
-
-    private fun getCall(manga: Manga, options: Options): Call {
-        val source = sourceManager.get(manga.source) as? HttpSource
-        val client = source?.client ?: defaultClient
-
-        val newClient = client.newBuilder().build()
-
-        val request = Request.Builder().url(manga.thumbnail_url!!).also {
-            if (source != null) {
-                it.headers(source.headers)
-            }
-
-            val networkRead = options.networkCachePolicy.readEnabled
-            val diskRead = options.diskCachePolicy.readEnabled
-            when {
-                !networkRead && diskRead -> {
-                    it.cacheControl(CacheControl.FORCE_CACHE)
-                }
-                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()
-
-        return newClient.newCall(request)
-    }
-
-    private fun fileLoader(manga: Manga): FetchResult {
-        return fileLoader(File(manga.thumbnail_url!!.substringAfter("file://")))
-    }
-
    private fun fileLoader(file: File): FetchResult {
        return SourceResult(
-            source = file.source().buffer(),
+            source = ImageSource(file = file.toOkioPath(), diskCacheKey = diskCacheKey),
            mimeType = "image/*",
-            dataSource = DataSource.DISK
+            dataSource = DataSource.DISK,
        )
    }

+    private suspend fun httpLoader(): FetchResult {
+        // Only cache separately if it's a library item
+        val libraryCoverCacheFile = if (manga.favorite) {
+            coverCache.getCoverFile(manga) ?: error("No cover specified")
+        } else {
+            null
+        }
+        if (libraryCoverCacheFile?.exists() == true && options.diskCachePolicy.readEnabled) {
+            return fileLoader(libraryCoverCacheFile)
+        }
+
+        var snapshot = readFromDiskCache()
+        try {
+            // 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
+    }
+
+    private fun newRequest(): Request {
+        val request = Request.Builder()
+            .url(url)
+            .headers(sourceLazy.value?.headers ?: options.headers)
+            // Support attaching custom data to the network request.
+            .tag(Parameters::class.java, options.parameters)
+
+        val diskRead = options.diskCachePolicy.readEnabled
+        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 request.build()
+    }
+
+    private fun moveSnapshotToCoverCache(snapshot: DiskCache.Snapshot, cacheFile: File?): File? {
+        if (cacheFile == null) return null
+        return try {
+            diskCacheLazy.value.run {
+                fileSystem.source(snapshot.data).use { input ->
+                    writeSourceToCoverCache(input, cacheFile)
+                }
+                remove(diskCacheKey!!)
+            }
+            cacheFile.takeIf { it.exists() }
+        } catch (e: Exception) {
+            logcat(LogPriority.ERROR, e) { "Failed to write snapshot data to cover cache ${cacheFile.name}" }
+            null
+        }
+    }
+
+    private fun writeResponseToCoverCache(response: Response, cacheFile: File?): File? {
+        if (cacheFile == null || !options.diskCachePolicy.writeEnabled) return null
+        return try {
+            response.peekBody(Long.MAX_VALUE).source().use { input ->
+                writeSourceToCoverCache(input, cacheFile)
+            }
+            cacheFile.takeIf { it.exists() }
+        } catch (e: Exception) {
+            logcat(LogPriority.ERROR, e) { "Failed to write response data to cover cache ${cacheFile.name}" }
+            null
+        }
+    }
+
+    private fun writeSourceToCoverCache(input: Source, cacheFile: File) {
+        cacheFile.parentFile?.mkdirs()
+        cacheFile.delete()
+        try {
+            cacheFile.sink().buffer().use { output ->
+                output.writeAll(input)
+            }
+        } catch (e: Exception) {
+            cacheFile.delete()
+            throw e
+        }
+    }
+
+    private fun readFromDiskCache(): DiskCache.Snapshot? {
+        return if (options.diskCachePolicy.readEnabled) diskCacheLazy.value[diskCacheKey!!] else null
+    }
+
+    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? {
        return when {
            cover.isNullOrEmpty() -> null
-            cover.startsWith("http") || cover.startsWith("Custom-", true) -> Type.URL
+            cover.startsWith("http", true) || cover.startsWith("Custom-", true) -> Type.URL
            cover.startsWith("/") || cover.startsWith("file://") -> Type.File
            else -> null
        }
@@ -163,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"

@@ -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() }
+    }
+}
@@ -0,0 +1,61 @@
+package eu.kanade.tachiyomi.data.coil
+
+import android.os.Build
+import androidx.core.graphics.drawable.toDrawable
+import coil.ImageLoader
+import coil.decode.DecodeResult
+import coil.decode.Decoder
+import coil.decode.ImageDecoderDecoder
+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
+
+/**
+ * A [Decoder] that uses built-in [ImageDecoder] to decode images that is not supported by the system.
+ */
+class TachiyomiImageDecoder(private val resources: ImageSource, private val options: Options) : Decoder {
+
+    override suspend fun decode(): DecodeResult {
+        val decoder = resources.sourceOrNull()?.use {
+            ImageDecoder.newInstance(it.inputStream())
+        }
+
+        check(decoder != null && decoder.width > 0 && decoder.height > 0) { "Failed to initialize decoder." }
+
+        val bitmap = decoder.decode(rgb565 = options.allowRgb565)
+        decoder.recycle()
+
+        check(bitmap != null) { "Failed to decode image." }
+
+        return DecodeResult(
+            drawable = bitmap.toDrawable(options.context.resources),
+            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()
+    }
+}
@@ -21,6 +21,9 @@ import eu.kanade.tachiyomi.data.database.queries.HistoryQueries
 import eu.kanade.tachiyomi.data.database.queries.MangaCategoryQueries
 import eu.kanade.tachiyomi.data.database.queries.MangaQueries
 import eu.kanade.tachiyomi.data.database.queries.TrackQueries
+import exh.favorites.sql.mappers.FavoriteEntryTypeMapping
+import exh.favorites.sql.models.FavoriteEntry
+import exh.favorites.sql.queries.FavoriteEntryQueries
 import exh.merged.sql.mappers.MergedMangaTypeMapping
 import exh.merged.sql.models.MergedMangaReference
 import exh.merged.sql.queries.MergedQueries
@@ -33,13 +36,33 @@ import exh.metadata.sql.models.SearchTitle
 import exh.metadata.sql.queries.SearchMetadataQueries
 import exh.metadata.sql.queries.SearchTagQueries
 import exh.metadata.sql.queries.SearchTitleQueries
+import exh.savedsearches.mappers.FeedSavedSearchTypeMapping
+import exh.savedsearches.mappers.SavedSearchTypeMapping
+import exh.savedsearches.models.FeedSavedSearch
+import exh.savedsearches.models.SavedSearch
+import exh.savedsearches.queries.FeedSavedSearchQueries
+import exh.savedsearches.queries.SavedSearchQueries
 import io.requery.android.database.sqlite.RequerySQLiteOpenHelperFactory

 /**
 * This class provides operations to manage the database through its interfaces.
 */
 open class DatabaseHelper(context: Context) :
-    MangaQueries, ChapterQueries, TrackQueries, CategoryQueries, MangaCategoryQueries, HistoryQueries /* SY --> */, SearchMetadataQueries, SearchTagQueries, SearchTitleQueries, MergedQueries /* SY <-- */ {
+    MangaQueries,
+    ChapterQueries,
+    TrackQueries,
+    CategoryQueries,
+    MangaCategoryQueries,
+    HistoryQueries,
+    /* SY --> */
+    SearchMetadataQueries,
+    SearchTagQueries,
+    SearchTitleQueries,
+    MergedQueries,
+    FavoriteEntryQueries,
+    SavedSearchQueries,
+    FeedSavedSearchQueries
+/* SY <-- */ {

    private val configuration = SupportSQLiteOpenHelper.Configuration.builder(context)
        .name(DbOpenCallback.DATABASE_NAME)
@@ -59,6 +82,9 @@ open class DatabaseHelper(context: Context) :
        .addTypeMapping(SearchTag::class.java, SearchTagTypeMapping())
        .addTypeMapping(SearchTitle::class.java, SearchTitleTypeMapping())
        .addTypeMapping(MergedMangaReference::class.java, MergedMangaTypeMapping())
+        .addTypeMapping(FavoriteEntry::class.java, FavoriteEntryTypeMapping())
+        .addTypeMapping(SavedSearch::class.java, SavedSearchTypeMapping())
+        .addTypeMapping(FeedSavedSearch::class.java, FeedSavedSearchTypeMapping())
        // SY <--
        .build()

@@ -8,10 +8,13 @@ import eu.kanade.tachiyomi.data.database.tables.HistoryTable
 import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable
 import eu.kanade.tachiyomi.data.database.tables.MangaTable
 import eu.kanade.tachiyomi.data.database.tables.TrackTable
+import exh.favorites.sql.tables.FavoriteEntryTable
 import exh.merged.sql.tables.MergedTable
 import exh.metadata.sql.tables.SearchMetadataTable
 import exh.metadata.sql.tables.SearchTagTable
 import exh.metadata.sql.tables.SearchTitleTable
+import exh.savedsearches.tables.FeedSavedSearchTable
+import exh.savedsearches.tables.SavedSearchTable

 class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {

@@ -24,7 +27,7 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
        /**
         * Version of the database.
         */
-        const val DATABASE_VERSION = /* SY --> */ 7 /* SY <-- */
+        const val DATABASE_VERSION = /* SY --> */ 13 // SY <--
    }

    override fun onCreate(db: SupportSQLiteDatabase) = with(db) {
@@ -39,6 +42,9 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
        execSQL(SearchTagTable.createTableQuery)
        execSQL(SearchTitleTable.createTableQuery)
        execSQL(MergedTable.createTableQuery)
+        execSQL(FavoriteEntryTable.createTableQuery)
+        execSQL(SavedSearchTable.createTableQuery)
+        execSQL(FeedSavedSearchTable.createTableQuery)
        // SY <--

        // DB indexes
@@ -55,6 +61,7 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
        execSQL(SearchTitleTable.createMangaIdIndexQuery)
        execSQL(SearchTitleTable.createTitleIndexQuery)
        execSQL(MergedTable.createIndexQuery)
+        execSQL(FeedSavedSearchTable.createSavedSearchIdIndexQuery)
        // SY <--
    }

@@ -81,6 +88,29 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
        if (oldVersion < 7) {
            db.execSQL("DROP TABLE IF EXISTS manga_related")
        }
+        if (oldVersion < 8) {
+            db.execSQL(MangaTable.addNextUpdateCol)
+        }
+        if (oldVersion < 9) {
+            db.execSQL(TrackTable.renameTableToTemp)
+            db.execSQL(TrackTable.createTableQuery)
+            db.execSQL(TrackTable.insertFromTempTable)
+            db.execSQL(TrackTable.dropTempTable)
+        }
+        if (oldVersion < 10) {
+            db.execSQL(ChapterTable.fixDateUploadIfNeeded)
+        }
+        if (oldVersion < 11) {
+            db.execSQL(FavoriteEntryTable.createTableQuery)
+        }
+        if (oldVersion < 12) {
+            db.execSQL(FavoriteEntryTable.fixTableQuery)
+        }
+        if (oldVersion < 13) {
+            db.execSQL(SavedSearchTable.createTableQuery)
+            db.execSQL(FeedSavedSearchTable.createTableQuery)
+            db.execSQL(FeedSavedSearchTable.createSavedSearchIdIndexQuery)
+        }
    }

    override fun onConfigure(db: SupportSQLiteDatabase) {
@@ -21,7 +21,7 @@ import eu.kanade.tachiyomi.data.database.tables.CategoryTable.TABLE
 class CategoryTypeMapping : SQLiteTypeMapping<Category>(
    CategoryPutResolver(),
    CategoryGetResolver(),
-    CategoryDeleteResolver()
+    CategoryDeleteResolver(),
 )

 class CategoryPutResolver : DefaultPutResolver<Category>() {
@@ -42,20 +42,20 @@ class CategoryPutResolver : DefaultPutResolver<Category>() {
            COL_NAME to obj.name,
            COL_ORDER to obj.order,
            COL_FLAGS to obj.flags,
-            COL_MANGA_ORDER to obj.mangaOrder.joinToString("/")
+            COL_MANGA_ORDER to obj.mangaOrder.joinToString("/"),
        )
 }

 class CategoryGetResolver : DefaultGetResolver<Category>() {

    override fun mapFromCursor(cursor: Cursor): Category = CategoryImpl().apply {
-        id = cursor.getInt(cursor.getColumnIndex(COL_ID))
-        name = cursor.getString(cursor.getColumnIndex(COL_NAME))
-        order = cursor.getInt(cursor.getColumnIndex(COL_ORDER))
-        flags = cursor.getInt(cursor.getColumnIndex(COL_FLAGS))
+        id = cursor.getInt(cursor.getColumnIndexOrThrow(COL_ID))
+        name = cursor.getString(cursor.getColumnIndexOrThrow(COL_NAME))
+        order = cursor.getInt(cursor.getColumnIndexOrThrow(COL_ORDER))
+        flags = cursor.getInt(cursor.getColumnIndexOrThrow(COL_FLAGS))

        // SY -->
-        val orderString = cursor.getString(cursor.getColumnIndex(COL_MANGA_ORDER))
+        val orderString = cursor.getString(cursor.getColumnIndexOrThrow(COL_MANGA_ORDER))
        mangaOrder = orderString?.split("/")?.mapNotNull { it.toLongOrNull() }.orEmpty()
        // SY <--
    }
@@ -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))
-        manga_id = cursor.getLong(cursor.getColumnIndex(COL_MANGA_ID))
-        url = cursor.getString(cursor.getColumnIndex(COL_URL))
-        name = cursor.getString(cursor.getColumnIndex(COL_NAME))
-        scanlator = cursor.getString(cursor.getColumnIndex(COL_SCANLATOR))
-        read = cursor.getInt(cursor.getColumnIndex(COL_READ)) == 1
-        bookmark = cursor.getInt(cursor.getColumnIndex(COL_BOOKMARK)) == 1
-        date_fetch = cursor.getLong(cursor.getColumnIndex(COL_DATE_FETCH))
-        date_upload = cursor.getLong(cursor.getColumnIndex(COL_DATE_UPLOAD))
-        last_page_read = cursor.getInt(cursor.getColumnIndex(COL_LAST_PAGE_READ))
-        chapter_number = cursor.getFloat(cursor.getColumnIndex(COL_CHAPTER_NUMBER))
-        source_order = cursor.getInt(cursor.getColumnIndex(COL_SOURCE_ORDER))
+        id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_ID))
+        manga_id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_MANGA_ID))
+        url = cursor.getString(cursor.getColumnIndexOrThrow(COL_URL))
+        name = cursor.getString(cursor.getColumnIndexOrThrow(COL_NAME))
+        scanlator = cursor.getString(cursor.getColumnIndexOrThrow(COL_SCANLATOR))
+        read = cursor.getInt(cursor.getColumnIndexOrThrow(COL_READ)) == 1
+        bookmark = cursor.getInt(cursor.getColumnIndexOrThrow(COL_BOOKMARK)) == 1
+        date_fetch = cursor.getLong(cursor.getColumnIndexOrThrow(COL_DATE_FETCH))
+        date_upload = cursor.getLong(cursor.getColumnIndexOrThrow(COL_DATE_UPLOAD))
+        last_page_read = cursor.getInt(cursor.getColumnIndexOrThrow(COL_LAST_PAGE_READ))
+        chapter_number = cursor.getFloat(cursor.getColumnIndexOrThrow(COL_CHAPTER_NUMBER))
+        source_order = cursor.getInt(cursor.getColumnIndexOrThrow(COL_SOURCE_ORDER))
    }
 }

@@ -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))
-        chapter_id = cursor.getLong(cursor.getColumnIndex(COL_CHAPTER_ID))
-        last_read = cursor.getLong(cursor.getColumnIndex(COL_LAST_READ))
-        time_read = cursor.getLong(cursor.getColumnIndex(COL_TIME_READ))
+        id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_ID))
+        chapter_id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_CHAPTER_ID))
+        last_read = cursor.getLong(cursor.getColumnIndexOrThrow(COL_LAST_READ))
+        time_read = cursor.getLong(cursor.getColumnIndexOrThrow(COL_TIME_READ))
    }
 }

@@ -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))
-        manga_id = cursor.getLong(cursor.getColumnIndex(COL_MANGA_ID))
-        category_id = cursor.getInt(cursor.getColumnIndex(COL_CATEGORY_ID))
+        id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_ID))
+        manga_id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_MANGA_ID))
+        category_id = cursor.getInt(cursor.getColumnIndexOrThrow(COL_CATEGORY_ID))
    }
 }

@@ -34,7 +34,7 @@ import eu.kanade.tachiyomi.data.database.tables.MangaTable.TABLE
 class MangaTypeMapping : SQLiteTypeMapping<Manga>(
    MangaPutResolver(),
    MangaGetResolver(),
-    MangaDeleteResolver()
+    MangaDeleteResolver(),
 )

 class MangaPutResolver : DefaultPutResolver<Manga>() {
@@ -70,30 +70,30 @@ class MangaPutResolver : DefaultPutResolver<Manga>() {
            COL_CHAPTER_FLAGS to obj.chapter_flags,
            COL_COVER_LAST_MODIFIED to obj.cover_last_modified,
            COL_DATE_ADDED to obj.date_added,
-            COL_FILTERED_SCANLATORS to obj.filtered_scanlators
+            COL_FILTERED_SCANLATORS to obj.filtered_scanlators,
        )
 }

 interface BaseMangaGetResolver {
    fun mapBaseFromCursor(manga: Manga, cursor: Cursor) = manga.apply {
-        id = cursor.getLong(cursor.getColumnIndex(COL_ID))
-        source = cursor.getLong(cursor.getColumnIndex(COL_SOURCE))
-        url = cursor.getString(cursor.getColumnIndex(COL_URL))
-        artist = cursor.getString(cursor.getColumnIndex(COL_ARTIST))
-        author = cursor.getString(cursor.getColumnIndex(COL_AUTHOR))
-        description = cursor.getString(cursor.getColumnIndex(COL_DESCRIPTION))
-        genre = cursor.getString(cursor.getColumnIndex(COL_GENRE))
-        title = cursor.getString(cursor.getColumnIndex(COL_TITLE))
-        status = cursor.getInt(cursor.getColumnIndex(COL_STATUS))
-        thumbnail_url = cursor.getString(cursor.getColumnIndex(COL_THUMBNAIL_URL))
-        favorite = cursor.getInt(cursor.getColumnIndex(COL_FAVORITE)) == 1
-        last_update = cursor.getLong(cursor.getColumnIndex(COL_LAST_UPDATE))
-        initialized = cursor.getInt(cursor.getColumnIndex(COL_INITIALIZED)) == 1
-        viewer_flags = cursor.getInt(cursor.getColumnIndex(COL_VIEWER))
-        chapter_flags = cursor.getInt(cursor.getColumnIndex(COL_CHAPTER_FLAGS))
-        cover_last_modified = cursor.getLong(cursor.getColumnIndex(COL_COVER_LAST_MODIFIED))
-        date_added = cursor.getLong(cursor.getColumnIndex(COL_DATE_ADDED))
-        filtered_scanlators = cursor.getString(cursor.getColumnIndex(COL_FILTERED_SCANLATORS))
+        id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_ID))
+        source = cursor.getLong(cursor.getColumnIndexOrThrow(COL_SOURCE))
+        url = cursor.getString(cursor.getColumnIndexOrThrow(COL_URL))
+        artist = cursor.getString(cursor.getColumnIndexOrThrow(COL_ARTIST))
+        author = cursor.getString(cursor.getColumnIndexOrThrow(COL_AUTHOR))
+        description = cursor.getString(cursor.getColumnIndexOrThrow(COL_DESCRIPTION))
+        genre = cursor.getString(cursor.getColumnIndexOrThrow(COL_GENRE))
+        title = cursor.getString(cursor.getColumnIndexOrThrow(COL_TITLE))
+        status = cursor.getInt(cursor.getColumnIndexOrThrow(COL_STATUS))
+        thumbnail_url = cursor.getString(cursor.getColumnIndexOrThrow(COL_THUMBNAIL_URL))
+        favorite = cursor.getInt(cursor.getColumnIndexOrThrow(COL_FAVORITE)) == 1
+        last_update = cursor.getLong(cursor.getColumnIndexOrThrow(COL_LAST_UPDATE))
+        initialized = cursor.getInt(cursor.getColumnIndexOrThrow(COL_INITIALIZED)) == 1
+        viewer_flags = cursor.getInt(cursor.getColumnIndexOrThrow(COL_VIEWER))
+        chapter_flags = cursor.getInt(cursor.getColumnIndexOrThrow(COL_CHAPTER_FLAGS))
+        cover_last_modified = cursor.getLong(cursor.getColumnIndexOrThrow(COL_COVER_LAST_MODIFIED))
+        date_added = cursor.getLong(cursor.getColumnIndexOrThrow(COL_DATE_ADDED))
+        filtered_scanlators = cursor.getString(cursor.getColumnIndexOrThrow(COL_FILTERED_SCANLATORS))
    }
 }

@@ -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))
-        manga_id = cursor.getLong(cursor.getColumnIndex(COL_MANGA_ID))
-        sync_id = cursor.getInt(cursor.getColumnIndex(COL_SYNC_ID))
-        media_id = cursor.getInt(cursor.getColumnIndex(COL_MEDIA_ID))
-        library_id = cursor.getLong(cursor.getColumnIndex(COL_LIBRARY_ID))
-        title = cursor.getString(cursor.getColumnIndex(COL_TITLE))
-        last_chapter_read = cursor.getInt(cursor.getColumnIndex(COL_LAST_CHAPTER_READ))
-        total_chapters = cursor.getInt(cursor.getColumnIndex(COL_TOTAL_CHAPTERS))
-        status = cursor.getInt(cursor.getColumnIndex(COL_STATUS))
-        score = cursor.getFloat(cursor.getColumnIndex(COL_SCORE))
-        tracking_url = cursor.getString(cursor.getColumnIndex(COL_TRACKING_URL))
-        started_reading_date = cursor.getLong(cursor.getColumnIndex(COL_START_DATE))
-        finished_reading_date = cursor.getLong(cursor.getColumnIndex(COL_FINISH_DATE))
+        id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_ID))
+        manga_id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_MANGA_ID))
+        sync_id = cursor.getInt(cursor.getColumnIndexOrThrow(COL_SYNC_ID))
+        media_id = cursor.getInt(cursor.getColumnIndexOrThrow(COL_MEDIA_ID))
+        library_id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_LIBRARY_ID))
+        title = cursor.getString(cursor.getColumnIndexOrThrow(COL_TITLE))
+        last_chapter_read = cursor.getFloat(cursor.getColumnIndexOrThrow(COL_LAST_CHAPTER_READ))
+        total_chapters = cursor.getInt(cursor.getColumnIndexOrThrow(COL_TOTAL_CHAPTERS))
+        status = cursor.getInt(cursor.getColumnIndexOrThrow(COL_STATUS))
+        score = cursor.getFloat(cursor.getColumnIndexOrThrow(COL_SCORE))
+        tracking_url = cursor.getString(cursor.getColumnIndexOrThrow(COL_TRACKING_URL))
+        started_reading_date = cursor.getLong(cursor.getColumnIndexOrThrow(COL_START_DATE))
+        finished_reading_date = cursor.getLong(cursor.getColumnIndexOrThrow(COL_FINISH_DATE))
    }
 }

@@ -1,5 +1,10 @@
 package eu.kanade.tachiyomi.data.database.models

+import android.content.Context
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.ui.library.setting.DisplayModeSetting
+import eu.kanade.tachiyomi.ui.library.setting.SortDirectionSetting
+import eu.kanade.tachiyomi.ui.library.setting.SortModeSetting
 import java.io.Serializable

 interface Category : Serializable {
@@ -16,12 +21,28 @@ interface Category : Serializable {
    var mangaOrder: List<Long>
    // SY <--

+    private fun setFlags(flag: Int, mask: Int) {
+        flags = flags and mask.inv() or (flag and mask)
+    }
+
+    var displayMode: Int
+        get() = flags and DisplayModeSetting.MASK
+        set(mode) = setFlags(mode, DisplayModeSetting.MASK)
+
+    var sortMode: Int
+        get() = flags and SortModeSetting.MASK
+        set(mode) = setFlags(mode, SortModeSetting.MASK)
+
+    var sortDirection: Int
+        get() = flags and SortDirectionSetting.MASK
+        set(mode) = setFlags(mode, SortDirectionSetting.MASK)
+
    companion object {

        fun create(name: String): Category = CategoryImpl().apply {
            this.name = name
        }

-        fun createDefault(): Category = create("Default").apply { id = 0 }
+        fun createDefault(context: Context): Category = create(context.getString(R.string.label_default)).apply { id = 0 }
    }
 }
@@ -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

@@ -13,6 +13,7 @@ interface Manga : SManga {

    var favorite: Boolean

+    // last time the chapter list changed in any way
    var last_update: Long

    var date_added: Long
@@ -34,7 +35,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()
    }

    // SY -->
@@ -131,6 +133,6 @@ fun Manga.toMangaInfo(): MangaInfo {
        genres = this.getGenres() ?: emptyList(),
        key = this.url,
        status = this.status,
-        title = this.title
+        title = this.title,
    )
 }
@@ -12,8 +12,6 @@ open class MangaImpl : Manga {
    override lateinit var url: String

    // SY -->
-    private val customMangaManager: CustomMangaManager by injectLazy()
-
    override var title: String
        get() = if (favorite) {
            val customTitle = customMangaManager.getManga(this)?.title
@@ -91,4 +89,10 @@ open class MangaImpl : Manga {
    override fun hashCode(): Int {
        return url.hashCode() + id.hashCode()
    }
+
+    // SY -->
+    companion object {
+        private val customMangaManager: CustomMangaManager by injectLazy()
+    }
+    // SY <--
 }
@@ -0,0 +1,3 @@
+package eu.kanade.tachiyomi.data.database.models
+
+data class SourceIdMangaCount(val source: Long, val count: Int)
@@ -16,7 +16,7 @@ interface Track : Serializable {

    var title: String

-    var last_chapter_read: Int
+    var last_chapter_read: Float

    var total_chapters: Int

@@ -14,7 +14,7 @@ class TrackImpl : Track {

    override lateinit var title: String

-    override var last_chapter_read: Int = 0
+    override var last_chapter_read: Float = 0F

    override var total_chapters: Int = 0

@@ -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()

@@ -25,7 +25,7 @@ interface ChapterQueries : DbProvider {
                .table(ChapterTable.TABLE)
                .where("${ChapterTable.COL_MANGA_ID} = ?")
                .whereArgs(mangaId)
-                .build()
+                .build(),
        )
        .prepare()
    // SY <--
@@ -37,7 +37,7 @@ interface ChapterQueries : DbProvider {
                .query(getRecentsQuery())
                .args(date.time)
                .observesTables(ChapterTable.TABLE)
-                .build()
+                .build(),
        )
        .withGetResolver(MangaChapterGetResolver.INSTANCE)
        .prepare()
@@ -49,7 +49,7 @@ interface ChapterQueries : DbProvider {
                .table(ChapterTable.TABLE)
                .where("${ChapterTable.COL_ID} = ?")
                .whereArgs(id)
-                .build()
+                .build(),
        )
        .prepare()

@@ -60,7 +60,7 @@ interface ChapterQueries : DbProvider {
                .table(ChapterTable.TABLE)
                .where("${ChapterTable.COL_URL} = ?")
                .whereArgs(url)
-                .build()
+                .build(),
        )
        .prepare()

@@ -71,7 +71,7 @@ interface ChapterQueries : DbProvider {
                .table(ChapterTable.TABLE)
                .where("${ChapterTable.COL_URL} = ? AND ${ChapterTable.COL_MANGA_ID} = ?")
                .whereArgs(url, mangaId)
-                .build()
+                .build(),
        )
        .prepare()

@@ -83,7 +83,7 @@ interface ChapterQueries : DbProvider {
                .table(ChapterTable.TABLE)
                .where("${ChapterTable.COL_URL} = ?")
                .whereArgs(url)
-                .build()
+                .build(),
        )
        .prepare()

@@ -94,7 +94,7 @@ interface ChapterQueries : DbProvider {
                .table(ChapterTable.TABLE)
                .where("${ChapterTable.COL_URL} IN (?) AND (${ChapterTable.COL_READ} = 1 OR ${ChapterTable.COL_LAST_PAGE_READ} != 0)")
                .whereArgs(urls.joinToString { "\"$it\"" })
-                .build()
+                .build(),
        )
        .prepare()
    // SY <--
@@ -5,6 +5,7 @@ import com.pushtorefresh.storio.sqlite.queries.RawQuery
 import eu.kanade.tachiyomi.data.database.DbProvider
 import eu.kanade.tachiyomi.data.database.models.History
 import eu.kanade.tachiyomi.data.database.models.MangaChapterHistory
+import eu.kanade.tachiyomi.data.database.resolvers.HistoryChapterIdPutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.HistoryLastReadPutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.MangaChapterHistoryGetResolver
 import eu.kanade.tachiyomi.data.database.tables.HistoryTable
@@ -32,7 +33,7 @@ interface HistoryQueries : DbProvider {
                .query(getRecentMangasQuery(search))
                .args(date.time, limit, offset)
                .observesTables(HistoryTable.TABLE)
-                .build()
+                .build(),
        )
        .withGetResolver(MangaChapterHistoryGetResolver.INSTANCE)
        .prepare()
@@ -44,7 +45,7 @@ interface HistoryQueries : DbProvider {
                .query(getHistoryByMangaId())
                .args(mangaId)
                .observesTables(HistoryTable.TABLE)
-                .build()
+                .build(),
        )
        .prepare()

@@ -55,7 +56,7 @@ interface HistoryQueries : DbProvider {
                .query(getHistoryByChapterUrl())
                .args(chapterUrl)
                .observesTables(HistoryTable.TABLE)
-                .build()
+                .build(),
        )
        .prepare()

@@ -83,7 +84,7 @@ interface HistoryQueries : DbProvider {
        .byQuery(
            DeleteQuery.builder()
                .table(HistoryTable.TABLE)
-                .build()
+                .build(),
        )
        .prepare()

@@ -93,7 +94,24 @@ interface HistoryQueries : DbProvider {
                .table(HistoryTable.TABLE)
                .where("${HistoryTable.COL_LAST_READ} = ?")
                .whereArgs(0)
-                .build()
+                .build(),
        )
        .prepare()
+
+    // SY -->
+    fun updateHistoryChapterIds(history: List<History>) = db.put()
+        .objects(history)
+        .withPutResolver(HistoryChapterIdPutResolver())
+        .prepare()
+
+    fun deleteHistoryIds(ids: List<Long>) = db.delete()
+        .byQuery(
+            DeleteQuery.builder()
+                .table(HistoryTable.TABLE)
+                .where("${HistoryTable.COL_ID} IN (?)")
+                .whereArgs(ids.joinToString())
+                .build(),
+        )
+        .prepare()
+    // SY <--
 }
@@ -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()

@@ -1,11 +1,14 @@
 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
 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
@@ -16,6 +19,7 @@ import eu.kanade.tachiyomi.data.database.resolvers.MangaLastUpdatedPutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.MangaMigrationPutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.MangaThumbnailPutResolver
 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
@@ -25,38 +29,48 @@ import exh.metadata.sql.tables.SearchMetadataTable

 interface MangaQueries : DbProvider {

-    fun getMangas() = db.get()
-        .listOfObjects(Manga::class.java)
-        .withQuery(
-            Query.builder()
-                .table(MangaTable.TABLE)
-                .build()
-        )
-        .prepare()
-
    fun getLibraryMangas() = db.get()
        .listOfObjects(LibraryManga::class.java)
        .withQuery(
            RawQuery.builder()
                .query(libraryQuery)
                .observesTables(MangaTable.TABLE, ChapterTable.TABLE, MangaCategoryTable.TABLE, CategoryTable.TABLE)
-                .build()
+                .build(),
        )
        .withGetResolver(LibraryMangaGetResolver.INSTANCE)
        .prepare()

-    fun getFavoriteMangas() = db.get()
-        .listOfObjects(Manga::class.java)
+    fun getDuplicateLibraryManga(manga: Manga) = db.get()
+        .`object`(Manga::class.java)
        .withQuery(
            Query.builder()
                .table(MangaTable.TABLE)
-                .where("${MangaTable.COL_FAVORITE} = ?")
-                .whereArgs(1)
-                .orderBy(MangaTable.COL_TITLE)
-                .build()
+                .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)
+            .where("${MangaTable.COL_FAVORITE} = ?")
+            .whereArgs(1)
+
+        if (sortByTitle) {
+            queryBuilder = queryBuilder.orderBy(MangaTable.COL_TITLE)
+        }
+
+        return db.get()
+            .listOfObjects(Manga::class.java)
+            .withQuery(queryBuilder.build())
+            .prepare()
+    }
+
    fun getManga(url: String, sourceId: Long) = db.get()
        .`object`(Manga::class.java)
        .withQuery(
@@ -64,7 +78,7 @@ interface MangaQueries : DbProvider {
                .table(MangaTable.TABLE)
                .where("${MangaTable.COL_URL} = ? AND ${MangaTable.COL_SOURCE} = ?")
                .whereArgs(url, sourceId)
-                .build()
+                .build(),
        )
        .prepare()

@@ -75,17 +89,37 @@ 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()
+
    // SY -->
+    fun getMangas() = db.get()
+        .listOfObjects(Manga::class.java)
+        .withQuery(
+            Query.builder()
+                .table(MangaTable.TABLE)
+                .build(),
+        )
+        .prepare()
+
    fun getReadNotInLibraryMangas() = db.get()
        .listOfObjects(Manga::class.java)
        .withQuery(
            RawQuery.builder()
                .query(getReadMangaNotInLibraryQuery())
-                .build()
+                .build(),
        )
        .prepare()

@@ -121,7 +155,7 @@ interface MangaQueries : DbProvider {

    fun updateChapterFlags(manga: List<Manga>) = db.put()
        .objects(manga)
-        .withPutResolver(MangaFlagsPutResolver(MangaTable.COL_CHAPTER_FLAGS, Manga::chapter_flags, true))
+        .withPutResolver(MangaFlagsPutResolver(MangaTable.COL_CHAPTER_FLAGS, Manga::chapter_flags))
        .prepare()

    fun updateViewerFlags(manga: Manga) = db.put()
@@ -131,7 +165,7 @@ interface MangaQueries : DbProvider {

    fun updateViewerFlags(manga: List<Manga>) = db.put()
        .objects(manga)
-        .withPutResolver(MangaFlagsPutResolver(MangaTable.COL_VIEWER, Manga::viewer_flags, true))
+        .withPutResolver(MangaFlagsPutResolver(MangaTable.COL_VIEWER, Manga::viewer_flags))
        .prepare()

    fun updateLastUpdated(manga: Manga) = db.put()
@@ -165,38 +199,40 @@ 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)
+                // SY -->
                .where(
                    """
-                    ${MangaTable.COL_FAVORITE} = ? AND ${MangaTable.COL_ID} NOT IN (
+                    ${MangaTable.COL_FAVORITE} = ? AND ${MangaTable.COL_SOURCE} IN (${Queries.placeholders(sourceIds.size)}) AND ${MangaTable.COL_ID} NOT IN (
                        SELECT ${MergedTable.COL_MANGA_ID} FROM ${MergedTable.TABLE} WHERE ${MergedTable.COL_MANGA_ID} != ${MergedTable.COL_MERGE_ID}
                    )
-                    """.trimIndent()
+                    """.trimIndent(),
                )
-                .whereArgs(0)
-                .build()
+                // SY <--
+                .whereArgs(0, *sourceIds.toTypedArray())
+                .build(),
        )
        .prepare()

    // SY -->
-    fun deleteMangasNotInLibraryAndNotRead() = db.delete()
+    fun deleteMangasNotInLibraryAndNotReadBySourceIds(sourceIds: List<Long>) = db.delete()
        .byQuery(
            DeleteQuery.builder()
                .table(MangaTable.TABLE)
                .where(
                    """
-                    ${MangaTable.COL_FAVORITE} = ? AND ${MangaTable.COL_ID} NOT IN (
+                    ${MangaTable.COL_FAVORITE} = ? AND ${MangaTable.COL_SOURCE} IN (${Queries.placeholders(sourceIds.size)}) AND ${MangaTable.COL_ID} NOT IN (
                        SELECT ${MergedTable.COL_MANGA_ID} FROM ${MergedTable.TABLE} WHERE ${MergedTable.COL_MANGA_ID} != ${MergedTable.COL_MERGE_ID}
                    ) AND ${MangaTable.COL_ID} NOT IN (
                        SELECT ${ChapterTable.COL_MANGA_ID} FROM ${ChapterTable.TABLE} WHERE ${ChapterTable.COL_READ} = 1 OR ${ChapterTable.COL_LAST_PAGE_READ} != 0
                    )
-                    """.trimIndent()
+                    """.trimIndent(),
                )
-                .whereArgs(0)
-                .build()
+                .whereArgs(0, *sourceIds.toTypedArray())
+                .build(),
        )
        .prepare()
    // SY <--
@@ -205,7 +241,7 @@ interface MangaQueries : DbProvider {
        .byQuery(
            DeleteQuery.builder()
                .table(MangaTable.TABLE)
-                .build()
+                .build(),
        )
        .prepare()

@@ -215,7 +251,7 @@ interface MangaQueries : DbProvider {
            RawQuery.builder()
                .query(getLastReadMangaQuery())
                .observesTables(MangaTable.TABLE)
-                .build()
+                .build(),
        )
        .prepare()

@@ -225,7 +261,7 @@ interface MangaQueries : DbProvider {
            RawQuery.builder()
                .query(getTotalChapterMangaQuery())
                .observesTables(MangaTable.TABLE)
-                .build()
+                .build(),
        )
        .prepare()

@@ -235,7 +271,7 @@ interface MangaQueries : DbProvider {
            RawQuery.builder()
                .query(getLatestChapterMangaQuery())
                .observesTables(MangaTable.TABLE)
-                .build()
+                .build(),
        )
        .prepare()

@@ -245,7 +281,7 @@ interface MangaQueries : DbProvider {
            RawQuery.builder()
                .query(getChapterFetchDateMangaQuery())
                .observesTables(MangaTable.TABLE)
-                .build()
+                .build(),
        )
        .prepare()

@@ -260,9 +296,9 @@ interface MangaQueries : DbProvider {
                    INNER JOIN ${SearchMetadataTable.TABLE}
                        ON ${MangaTable.TABLE}.${MangaTable.COL_ID} = ${SearchMetadataTable.TABLE}.${SearchMetadataTable.COL_MANGA_ID}
                    ORDER BY ${MangaTable.TABLE}.${MangaTable.COL_ID}
-                    """.trimIndent()
+                    """.trimIndent(),
                )
-                .build()
+                .build(),
        )
        .prepare()

@@ -277,9 +313,9 @@ interface MangaQueries : DbProvider {
                        ON ${MangaTable.TABLE}.${MangaTable.COL_ID} = ${SearchMetadataTable.TABLE}.${SearchMetadataTable.COL_MANGA_ID}
                    WHERE ${MangaTable.TABLE}.${MangaTable.COL_FAVORITE} = 1
                    ORDER BY ${MangaTable.TABLE}.${MangaTable.COL_ID}
-                    """.trimIndent()
+                    """.trimIndent(),
                )
-                .build()
+                .build(),
        )
        .prepare()

@@ -294,9 +330,9 @@ interface MangaQueries : DbProvider {
                        ON ${MangaTable.TABLE}.${MangaTable.COL_ID} = ${SearchMetadataTable.TABLE}.${SearchMetadataTable.COL_MANGA_ID}
                    WHERE ${MangaTable.TABLE}.${MangaTable.COL_FAVORITE} = 1
                    ORDER BY ${MangaTable.TABLE}.${MangaTable.COL_ID}
-                    """.trimIndent()
+                    """.trimIndent(),
                )
-                .build()
+                .build(),
        )
        .prepare()
    // SY <--
@@ -1,5 +1,8 @@
 package eu.kanade.tachiyomi.data.database.queries

+import eu.kanade.tachiyomi.data.database.resolvers.SourceIdMangaCountGetResolver
+import exh.savedsearches.tables.FeedSavedSearchTable
+import exh.savedsearches.tables.SavedSearchTable
 import exh.source.MERGED_SOURCE_ID
 import eu.kanade.tachiyomi.data.database.tables.CategoryTable as Category
 import eu.kanade.tachiyomi.data.database.tables.ChapterTable as Chapter
@@ -22,6 +25,19 @@ fun getMergedMangaQuery() =
    ON ${Manga.TABLE}.${Manga.COL_ID} = M.${Merged.COL_MANGA_ID}
 """

+/**
+ * Query to get the manga merged into a merged manga
+ */
+fun getMergedMangaForDownloadingQuery() =
+    """
+    SELECT ${Manga.TABLE}.*
+    FROM (
+        SELECT ${Merged.COL_MANGA_ID} FROM ${Merged.TABLE} WHERE ${Merged.COL_MERGE_ID} = ? AND ${Merged.COL_DOWNLOAD_CHAPTERS} = 1
+    ) AS M
+    JOIN ${Manga.TABLE}
+    ON ${Manga.TABLE}.${Manga.COL_ID} = M.${Merged.COL_MANGA_ID}
+"""
+
 /**
 * Query to get all the manga that are merged into other manga
 */
@@ -74,23 +90,49 @@ fun getReadMangaNotInLibraryQuery() =
 """

 /**
- * Query to get the manga from the library, with their categories and unread count.
+ * Query to get the global feed saved searches
+ */
+fun getGlobalFeedSavedSearchQuery() =
+    """
+    SELECT ${SavedSearchTable.TABLE}.*
+    FROM (
+        SELECT ${FeedSavedSearchTable.COL_SAVED_SEARCH_ID} FROM ${FeedSavedSearchTable.TABLE} WHERE ${FeedSavedSearchTable.COL_GLOBAL} = 1
+    ) AS M
+    JOIN ${SavedSearchTable.TABLE}
+    ON ${SavedSearchTable.TABLE}.${SavedSearchTable.COL_ID} = M.${FeedSavedSearchTable.COL_SAVED_SEARCH_ID}
+"""
+
+/**
+ * Query to get the source feed saved searches
+ */
+fun getSourceFeedSavedSearchQuery() =
+    """
+    SELECT ${SavedSearchTable.TABLE}.*
+    FROM (
+        SELECT ${FeedSavedSearchTable.COL_SAVED_SEARCH_ID} FROM ${FeedSavedSearchTable.TABLE} WHERE ${FeedSavedSearchTable.COL_GLOBAL} = 0 AND ${FeedSavedSearchTable.COL_SOURCE} = ?
+    ) AS M
+    JOIN ${SavedSearchTable.TABLE}
+    ON ${SavedSearchTable.TABLE}.${SavedSearchTable.COL_ID} = M.${FeedSavedSearchTable.COL_SAVED_SEARCH_ID}
+"""
+
+/**
+ * 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}, COALESCE(R.read, 0) AS ${Manga.COL_READ}
+        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.TABLE}.${Chapter.COL_MANGA_ID}, COUNT(*) AS unread
+                SELECT ${Chapter.TABLE}.${Chapter.COL_MANGA_ID}, COUNT(*) AS unreadCount
                FROM ${Chapter.TABLE}
                WHERE ${Chapter.COL_READ} = 0
                GROUP BY ${Chapter.TABLE}.${Chapter.COL_MANGA_ID}
            ) AS C
            ON ${Manga.TABLE}.${Manga.COL_ID} = C.${Chapter.COL_MANGA_ID}
            LEFT JOIN (
-                SELECT ${Chapter.COL_MANGA_ID}, COUNT(*) AS read
+                SELECT ${Chapter.COL_MANGA_ID}, COUNT(*) AS readCount
                FROM ${Chapter.TABLE}
                WHERE ${Chapter.COL_READ} = 1
                GROUP BY ${Chapter.COL_MANGA_ID}
@@ -99,10 +141,10 @@ val libraryQuery =
            WHERE ${Manga.COL_FAVORITE} = 1 AND ${Manga.COL_SOURCE} <> $MERGED_SOURCE_ID
            GROUP BY ${Manga.TABLE}.${Manga.COL_ID}
        UNION
-        SELECT ${Manga.TABLE}.*, COALESCE(C.unread, 0) AS ${Manga.COL_UNREAD}, COALESCE(R.read, 0) AS ${Manga.COL_READ}
+        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 ${Merged.TABLE}.${Merged.COL_MERGE_ID}, COUNT(*) as unread
+                SELECT ${Merged.TABLE}.${Merged.COL_MERGE_ID}, COUNT(*) as unreadCount
                FROM ${Merged.TABLE}
                JOIN ${Chapter.TABLE}
                ON ${Chapter.TABLE}.${Chapter.COL_MANGA_ID} = ${Merged.TABLE}.${Merged.COL_MANGA_ID}
@@ -111,7 +153,7 @@ val libraryQuery =
            ) AS C
            ON ${Manga.TABLE}.${Manga.COL_ID} = C.${Merged.COL_MERGE_ID}
            LEFT JOIN (
-                SELECT ${Merged.TABLE}.${Merged.COL_MERGE_ID}, COUNT(*) as read
+                SELECT ${Merged.TABLE}.${Merged.COL_MERGE_ID}, COUNT(*) as readCount
                FROM ${Merged.TABLE}
                JOIN ${Chapter.TABLE}
                ON ${Chapter.TABLE}.${Chapter.COL_MANGA_ID} = ${Merged.TABLE}.${Merged.COL_MANGA_ID}
@@ -241,3 +283,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}
+    """
@@ -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()
 }
@@ -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,
        )
 }
@@ -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,
        )
 }
@@ -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,
        )
 }
@@ -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,
        )
 }
--- a/Show More
+++ b/Show More