Release v1.8.3

Add Simplified Chinese translation (#584 )
* Add Simplified Chinese translation Work In Program Part 1 * Add more translate * Add more translate * Add more translate * Add more translate * Fix * Minor changes * Fix some strings * Fix some strings
2022-04-22 19:39:42 -04:00 · 2022-04-22 19:38:51 -04:00 · 2022-04-22 19:27:15 -04:00 · 2022-04-22 19:23:45 -04:00 · 2022-04-22 19:23:37 -04:00 · 2022-04-22 19:22:12 -04:00
1363 changed files with 88653 additions and 60864 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
@@ -1,33 +0,0 @@
 1. **Before reporting a new issue, take a look at the [FAQ](https://tachiyomi.org/help/faq/), the [changelog](https://github.com/inorichi/tachiyomi/releases) and the already opened [issues](https://github.com/inorichi/tachiyomi/issues).**
 2. If you are unsure, ask here: [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/tachiyomi)
 3. What is your type of issue?
    * [Catalogue request](#catalogue-requests)
    * [Bugs](#bugs)
    * [Feature requests](#feature-requests)
    * [Translations](https://tachiyomi.org/help/contribution/#translation)
 4. After following 1. and 3. you can [open your issue](https://github.com/inorichi/tachiyomi/issues/new)
 ***
 # Catalogue requests
 * Catalogue requests should be created at https://github.com/inorichi/tachiyomi-extensions#readme, not here
 # Bugs
 * 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/inorichi/tachiyomi/issues/24 https://github.com/inorichi/tachiyomi/issues/71
 DON'T: https://github.com/inorichi/tachiyomi/issues/75
 # Feature requests
 * Write a detailed issue, explaining what it should do or how. Avoid writing just "like X app does"
 * Include screenshot (if needed)
@@ -1,2 +1 @@
 github: inorichi
 ko_fi: inorichi
@@ -2,9 +2,15 @@
 I acknowledge that:
- I have updated to the latest version of the app (stable is v1.4.0)
+- I have updated:
- I have updated all extensions
+  - To the latest version of the app (stable is v1.8.3)
- If this is an issue with an extension, that I should be opening an issue in https://github.com/inorichi/tachiyomi-extensions
+  - 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**
@@ -24,3 +30,5 @@ I acknowledge that:
 ## Other details
 Additional details and attachments.
 If you're experiencing crashes, share the crash logs from More → Settings → Advanced → Dump crash logs.
@@ -1,36 +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.4.0)
 - I have updated all extensions
 - If this is an issue with an extension, that I should be opening an issue in https://github.com/inorichi/tachiyomi-extensions
 **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.
@@ -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.
+    about: Guides, troubleshooting, and answers to common questions
  - name: Tachiyomi extensions GitHub repository
    url: https://github.com/inorichi/tachiyomi-extensions
    about: Issues about an extension/source/catalogue should be opened here instead.
@@ -1,24 +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.4.0)
 - I have updated all extensions
 - If this is an issue with an extension, that I should be opening an issue in https://github.com/inorichi/tachiyomi-extensions
 **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.3"
    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.3](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.3](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/inorichi/tachiyomi-extensions"
 title: "THIS ISSUE IS IN THE WRONG REPO; SEE https://github.com/inorichi/tachiyomi-extensions"
 labels: "catalog, invalid"
 ---
 DO NOT OPEN AN ISSUE IN THIS REPO. SEE https://github.com/inorichi/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.incremental=false
 kotlin.compiler.execution.strategy=in-process
@@ -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:
@@ -18,9 +18,8 @@ jobs:
        uses: gradle/wrapper-validation-action@v1
  build:
-    name: Build app release
+    name: Build app
    needs: check_wrapper
    if: "!startsWith(github.event.head_commit.message, '[SKIP CI]')"
    runs-on: ubuntu-latest
    steps:
@@ -32,10 +31,10 @@ jobs:
      - name: Clone repo
        uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
        uses: actions/setup-java@v1
        with:
-          java-version: 1.8
+          java-version: 11
      - name: Copy CI gradle.properties
        run: |
@@ -53,28 +52,20 @@ 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
+          arguments: assembleStandardRelease --stacktrace
          wrapper-cache-enabled: true
          dependencies-cache-enabled: true
          configuration-cache-enabled: true
-      - name: Sign Android Release
+      - name: Sign APK
        uses: r0adkll/sign-android-release@v1
        with:
          # The directory to find your release to sign
          releaseDirectory: app/build/outputs/apk/standard/release
          # The key used to sign your release in base64 encoded format
          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
          # The key alias
          alias: ${{ secrets.ALIAS }}
          # The password to the keystore
          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
          # The password for the key
          keyPassword: ${{ secrets.KEY_PASSWORD }}
-      - name: Create Release
+      - name: Create release
        id: create_release
        uses: actions/create-release@v1
        env:
@@ -85,7 +76,7 @@ jobs:
          draft: true
          prerelease: false
-      - name: Upload Release APK
+      - name: Upload APK to release
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -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,10 @@ jobs:
      - name: Clone repo
        uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
        uses: actions/setup-java@v1
        with:
-          java-version: 1.8
+          java-version: 11
      - name: Copy CI gradle.properties
        run: |
@@ -39,12 +38,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
+          arguments: assembleDevDebug
-          wrapper-cache-enabled: true
+
          dependencies-cache-enabled: true
          configuration-cache-enabled: true
      - name: Upload APK
        uses: actions/upload-artifact@v2
        with:
@@ -1,37 +0,0 @@
 name: Issue closer
 on:
  issues:
    types: [opened, edited, reopened]
 jobs:
  autoclose:
    runs-on: ubuntu-latest
    steps:
    - name: Autoclose when created in wrong repo
      uses: arkon/issue-closer-action@v1.1
      with:
        repo-token: ${{ secrets.GITHUB_TOKEN }}
        type: title
        regex: ".*THIS ISSUE IS IN THE WRONG REPO.*"
        message: "@${issue.user.login} this issue was automatically closed because it was not opened in the correct repo, as the template mentioned."
    - name: Autoclose when no short description provided
      uses: arkon/issue-closer-action@v1.1
      with:
        repo-token: ${{ secrets.GITHUB_TOKEN }}
        type: title
        regex: ".*<Write short description here>*"
        message: "@${issue.user.login} this issue was automatically closed because you did not fill out the description in the title."
    - name: Autoclose when body acknowledgement section not removed
      uses: arkon/issue-closer-action@v1.1
      with:
        repo-token: ${{ secrets.GITHUB_TOKEN }}
        type: body
        regex: ".*DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT.*"
        message: "@${issue.user.login} this issue was automatically closed because the acknowledgment section was not removed."
    - name: Autoclose when body requested information not filled out
      uses: arkon/issue-closer-action@v1.1
      with:
        repo-token: ${{ secrets.GITHUB_TOKEN }}
        type: body
        regex: ".*\\* (Tachiyomi version|Android version|Device): \\?.*"
        message: "@${issue.user.login} this issue was automatically closed because the requested information was not filled out."
@@ -0,0 +1,35 @@
 name: Issue moderator
 on:
  issues:
    types: [opened, edited, reopened]
  issue_comment:
    types: [created]
 jobs:
  moderate:
    runs-on: ubuntu-latest
    steps:
      - name: Moderate issues
        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"
              }
            ]
@@ -0,0 +1,19 @@
 name: Lock threads
 on:
  # Daily
  schedule:
    - cron: '0 0 * * *'
  # Manual trigger
  workflow_dispatch:
    inputs:
 jobs:
  lock:
    runs-on: ubuntu-latest
    steps:
      - uses: dessant/lock-threads@v3
        with:
          github-token: ${{ github.token }}
          issue-inactive-days: '2'
          pr-inactive-days: '2'
@@ -0,0 +1,126 @@
 # Contributor Covenant Code of Conduct
 ## Our Pledge
 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 a positive environment for our
 community include:
 * 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 include:
 * 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 email
  address, without their explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
  professional setting
 ## Enforcement Responsibilities
 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.
 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 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 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.
 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](https://www.contributor-covenant.org/),
 version 2.1, available at
 [v2.1](https://www.contributor-covenant.org/version/2/1/code_of_conduct.html).
 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 the FAQ at
 [FAQ](https://www.contributor-covenant.org/faq). Translations are available
 at [translations](https://www.contributor-covenant.org/translations).
@@ -0,0 +1,50 @@
 Looking to report an issue/bug or make a feature request? Please refer to the [README file](https://github.com/tachiyomiorg/tachiyomi#issues-feature-requests-and-contributing).
 ---
 Thanks for your interest in contributing to Tachiyomi!
 # Code contributions
 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
 Translations are done externally via Weblate. See [our website](https://tachiyomi.org/help/contribution/#translation) for more details.
 # Forks
 Forks are allowed so long as they abide by [the project's LICENSE](https://github.com/tachiyomiorg/tachiyomi/blob/master/LICENSE).
 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/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:
    - If you want to use Firebase analytics, replace [`google-services.json`](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/src/standard/google-services.json) with your own
    - If you want to use ACRA crash reporting, replace the `ACRA_URI` endpoint in [`build.gradle.kts`](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/build.gradle.kts) with your own
@@ -174,29 +174,3 @@
      of your accepting any such warranty or additional liability.
   END OF TERMS AND CONDITIONS
   APPENDIX: How to apply the Apache License to your work.
      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "{}"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.
   Copyright {yyyy} {name of copyright owner}
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
       http://www.apache.org/licenses/LICENSE-2.0
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
@@ -1,20 +1,20 @@
 | Preview Builds | Release Builds | Tachiyomi Support Server |
 |-------|----------|----------|
-| [![Preview](https://github.com/jobobby04/TachiyomiSYPreview/workflows/Remote%20Dispatch%20Build%20App/badge.svg)](https://github.com/jobobby04/TachiyomiSYPreview/releases) | [![stable release](https://img.shields.io/github/release/jobobby04/tachiyomisy.svg?maxAge=3600&label=download)](https://github.com/jobobby04/tachiyomisy/releases/latest) | [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/tachiyomi) |
+| [![Preview](https://github.com/jobobby04/TachiyomiSYPreview/workflows/Remote%20Dispatch%20Build%20App/badge.svg)](https://github.com/jobobby04/TachiyomiSYPreview/releases) | [![stable release](https://img.shields.io/github/release/jobobby04/tachiyomisy.svg?maxAge=3600&label=download)](https://github.com/jobobby04/tachiyomisy/releases/latest) | [![Discord](https://img.shields.io/discord/349436576037732353.svg?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/tachiyomi) |
 # ![app icon](./.github/readme-images/app-icon.png)TachiyomiSY
-Tachiyomi is a free and open source manga reader for Android 5.0 and above. This version of Tachiyomi, TachiyomiSY was based off TachiyomiAZ. This version is meant to push forward in the ways of usability and features. TachiyomiSY tries to push forward where it can, but staying in a place where it can easily grab updates and features from the main app, it tries to make new features, or take features from other forks like J2K and Neko.
+Tachiyomi is a free and open source manga reader for Android 6.0 and above. This version of Tachiyomi, TachiyomiSY was based off TachiyomiAZ. This version is meant to push forward in the ways of usability and features. TachiyomiSY tries to push forward where it can, but staying in a place where it can easily grab updates and features from the main app, it tries to make new features, or take features from other forks like J2K and Neko.
 ![screenshots of app](./.github/readme-images/screens.png)
 ## Features
 Features of Tachiyomi(original) include:
-* Online reading from sources such as MangaDex, MangaSee, Mangakakalot, [and more](https://github.com/inorichi/tachiyomi-extensions)
+* Online reading from a variety of sources
-* Local reading of downloaded manga
+* 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
@@ -52,18 +52,19 @@ Features of TachiyomiSY include:
 * Enhanced views for internal and integrated sources
 * Enhanced usability for internal and delegated sources
-* Custom sources:
+Custom sources:
-* * E-Hentai/ExHentai
+* E-Hentai/ExHentai
-* Additional features for some extensions, features include custom description, opening in app, batch add to library, and a bunch of other things based on the source:
+
-* * 8Muses (EroMuse)
+Additional features for some extensions, features include custom description, opening in app, batch add to library, and a bunch of other things based on the source:
-* * HBrowse
+* 8Muses (EroMuse)
-* * HentaiCafe (inside Foolside)
+* HBrowse
-* * Hitomi.la
+* HentaiCafe (inside Foolside)
-* * Mangadex
+* Hitomi.la
-* * NHentai
+* Mangadex
-* * PervEden (EN and IT)
+* NHentai
-* * Puruin
+* PervEden (EN and IT)
-* * Tsumino
+* Puruin
 * Tsumino
 ## Download
 Get the app from our [releases page](https://github.com/jobobby04/tachiyomisy/releases/latest).
@@ -83,18 +84,17 @@ 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/inorichi/tachiyomi/issues/24 https://github.com/inorichi/tachiyomi/issues/71
+DO: https://github.com/tachiyomiorg/tachiyomi/issues/24 https://github.com/tachiyomiorg/tachiyomi/issues/71
-DON'T: https://github.com/inorichi/tachiyomi/issues/75
+DON'T: https://github.com/tachiyomiorg/tachiyomi/issues/75
 </details>
@@ -103,7 +103,17 @@ DON'T: https://github.com/inorichi/tachiyomi/issues/75
 * Write a detailed issue, explaining what it should do or how. Avoid writing just "like X app does"
 * Include screenshot (if needed)
-Source requests should be created at https://github.com/inorichi/tachiyomi-extensions, they do not belong in this repository.
+Source requests should be created at https://github.com/tachiyomiorg/tachiyomi-extensions, they do not belong in this repository.
 </details>
 <details><summary>Contributing</summary>
 See [CONTRIBUTING.md](./CONTRIBUTING.md).
 </details>
 <details><summary>Code of Conduct</summary>
 See [CODE_OF_CONDUCT.md](./CODE_OF_CONDUCT.md).
 </details>
 ## FAQ
@@ -1,372 +0,0 @@
 import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile
 import java.text.SimpleDateFormat
 apply plugin: 'com.android.application'
 apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlinx-serialization'
 apply plugin: 'com.github.zellius.shortcut-helper'
 // Realm (EH)
 apply plugin: 'realm-android'
 shortcutHelper.filePath = './shortcuts.xml'
 ext {
    // 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
    getCommitCount = {
        return 'git rev-list --count HEAD'.execute().text.trim()
        // return "1"
    }
    getGitSha = {
        return 'git rev-parse --short HEAD'.execute().text.trim()
        // return "1"
    }
    getBuildTime = {
        def df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm'Z'")
        df.setTimeZone(TimeZone.getTimeZone("UTC"))
        return df.format(new Date())
    }
 }
 android {
    compileSdkVersion AndroidConfig.compileSdk
    buildToolsVersion AndroidConfig.buildTools
    ndkVersion AndroidConfig.ndk
    defaultConfig {
        applicationId "eu.kanade.tachiyomi.sy"
        minSdkVersion AndroidConfig.minSdk
        targetSdkVersion AndroidConfig.targetSdk
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        versionCode 10
        versionName "1.4.0"
        buildConfigField "String", "COMMIT_COUNT", "\"${getCommitCount()}\""
        buildConfigField "String", "COMMIT_SHA", "\"${getGitSha()}\""
        buildConfigField "String", "BUILD_TIME", "\"${getBuildTime()}\""
        buildConfigField "boolean", "INCLUDE_UPDATER", "true"
        multiDexEnabled true
        ndk {
            abiFilters "armeabi-v7a", "arm64-v8a", "x86"
        }
    }
    buildFeatures {
        viewBinding = true
    }
    buildTypes {
        debug {
            versionNameSuffix "-${getCommitCount()}"
            applicationIdSuffix ".debug"
        }
        releaseTest {
            applicationIdSuffix ".rt"
 //            minifyEnabled true
 //            shrinkResources true
            zipAlignEnabled true
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
        release {
            minifyEnabled true
            shrinkResources true
            zipAlignEnabled true
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }
    flavorDimensions "default"
    productFlavors {
        standard {
            buildConfigField "boolean", "INCLUDE_UPDATER", "true"
            dimension "default"
        }
        fdroid {
            dimension "default"
        }
        dev {
            resConfigs "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'
    }
    dependenciesInfo {
        includeInApk = false
    }
    lintOptions {
        disable 'MissingTranslation'
        disable 'ExtraTranslation'
        abortOnError false
        checkReleaseBuilds false
    }
    compileOptions {
        sourceCompatibility = JavaVersion.VERSION_1_8
        targetCompatibility = JavaVersion.VERSION_1_8
    }
    kotlinOptions {
        jvmTarget = JavaVersion.VERSION_1_8.toString()
    }
 }
 androidExtensions {
    experimental = true
 }
 dependencies {
    // Source models and interfaces from Tachiyomi 1.x
    implementation 'tachiyomi.sourceapi:source-api:1.1'
    // AndroidX libraries
    implementation 'androidx.annotation:annotation:1.2.0-alpha01'
    implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
    implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha01'
    implementation 'androidx.browser:browser:1.3.0'
    implementation 'androidx.cardview:cardview:1.0.0'
    implementation 'androidx.constraintlayout:constraintlayout:2.1.0-alpha1'
    implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
    implementation 'androidx.core:core-ktx:1.5.0-alpha05'
    implementation 'androidx.multidex:multidex:2.0.1'
    implementation 'androidx.preference:preference-ktx:1.1.1'
    implementation 'androidx.recyclerview:recyclerview:1.2.0-beta01'
    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01'
    final lifecycle_version = '2.3.0-beta01'
    implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
    implementation "androidx.lifecycle:lifecycle-process:$lifecycle_version"
    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
    // Job scheduling
    implementation "androidx.work:work-runtime-ktx:2.5.0-beta02"
    // UI library
    implementation 'com.google.android.material:material:1.3.0-alpha04'
    standardImplementation 'com.google.firebase:firebase-core:18.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'
    // Network client
    final okhttp_version = '4.10.0-RC1'
    implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
    implementation "com.squareup.okhttp3:logging-interceptor:$okhttp_version"
    implementation "com.squareup.okhttp3:okhttp-dnsoverhttps:$okhttp_version"
    implementation 'com.squareup.okio:okio:2.9.0'
    // TLS 1.3 support for Android < 10
    implementation 'org.conscrypt:conscrypt-android:2.5.1'
    // REST
    final retrofit_version = '2.9.0'
    implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
    implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.8.0"
    implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
    implementation "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
    // JSON
    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1"
    implementation 'com.google.code.gson:gson:2.8.6'
    implementation 'com.github.salomonbrys.kotson:kotson:2.5.0'
    // JavaScript engine
    implementation 'com.squareup.duktape:duktape-android:1.3.0'
    // Disk
    implementation 'com.jakewharton:disklrucache:2.0.2'
    implementation 'com.github.inorichi:unifile:e9ee588'
    implementation 'com.github.junrar:junrar:7.4.0'
    // HTML parser
    implementation 'org.jsoup:jsoup:1.13.1'
    // [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'
    // Database
    implementation 'androidx.sqlite:sqlite-ktx:2.1.0'
    implementation 'com.github.inorichi.storio:storio-common:8be19de@aar'
    implementation 'com.github.inorichi.storio:storio-sqlite:8be19de@aar'
    implementation 'io.requery:sqlite-android:3.33.0'
    // Preferences
    implementation 'com.github.tfcporciuncula.flow-preferences:flow-preferences:1.3.3'
    // Model View Presenter
    final nucleus_version = '3.0.0'
    implementation "info.android15.nucleus:nucleus:$nucleus_version"
    implementation "info.android15.nucleus:nucleus-support-v7:$nucleus_version"
    // Dependency injection
    implementation "com.github.inorichi.injekt:injekt-core:65b0440"
    // Image library
    final glide_version = '4.11.0'
    implementation "com.github.bumptech.glide:glide:$glide_version"
    implementation "com.github.bumptech.glide:okhttp3-integration:$glide_version"
    kapt "com.github.bumptech.glide:compiler:$glide_version"
    implementation 'com.github.tachiyomiorg:subsampling-scale-image-view:6caf219'
    // Logging
    implementation 'com.jakewharton.timber:timber:4.7.1'
    // Crash reports
    //implementation 'ch.acra:acra-http:5.7.0'
    // Sort
    implementation 'com.github.gpanther:java-nat-sort:natural-comparator-1.1'
    // UI
    implementation 'com.dmitrymalkovich.android:material-design-dimens:1.4'
    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.nononsenseapps:filepicker:2.5.2'
    implementation 'com.nightlynexus.viewstatepageradapter:viewstatepageradapter:1.1.0'
    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
    implementation 'com.github.carlosesco:DirectionalViewPager:a844dbca0a'
    // 3.2.0+ introduces weird UI blinking or cut off issues on some devices
    final material_dialogs_version = '3.1.1'
    implementation "com.afollestad.material-dialogs:core:$material_dialogs_version"
    implementation "com.afollestad.material-dialogs:input:$material_dialogs_version"
    implementation "com.afollestad.material-dialogs:datetime:$material_dialogs_version"
    // 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:1.1.1'
    // FlowBinding
    final flowbinding_version = '0.12.0'
    implementation "io.github.reactivecircus.flowbinding:flowbinding-android:$flowbinding_version"
    implementation "io.github.reactivecircus.flowbinding:flowbinding-appcompat:$flowbinding_version"
    implementation "io.github.reactivecircus.flowbinding:flowbinding-recyclerview:$flowbinding_version"
    implementation "io.github.reactivecircus.flowbinding:flowbinding-swiperefreshlayout:$flowbinding_version"
    implementation "io.github.reactivecircus.flowbinding:flowbinding-viewpager:$flowbinding_version"
    // Licenses
    implementation "com.mikepenz:aboutlibraries:$BuildPluginsVersion.ABOUTLIB_PLUGIN"
    // Tests
    testImplementation 'junit:junit:4.13'
    testImplementation 'org.assertj:assertj-core:3.16.1'
    testImplementation 'org.mockito:mockito-core:1.10.19'
    final robolectric_version = '3.1.4'
    testImplementation "org.robolectric:robolectric:$robolectric_version"
    testImplementation "org.robolectric:shadows-multidex:$robolectric_version"
    testImplementation "org.robolectric:shadows-play-services:$robolectric_version"
    implementation "org.jetbrains.kotlin:kotlin-reflect:$BuildPluginsVersion.KOTLIN"
    final coroutines_version = '1.4.1'
    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
    // For detecting memory leaks; see https://square.github.io/leakcanary/
 //    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.4'
    // SY for mangadex utils
    implementation "org.jetbrains.kotlinx:kotlinx-serialization-protobuf:1.0.1"
    // Text distance (EH)
    implementation 'info.debatty:java-string-similarity:2.0.0'
    // Firebase (EH)
    implementation 'com.google.firebase:firebase-analytics-ktx:18.0.0'
    implementation 'com.google.firebase:firebase-crashlytics-ktx:17.3.0'
    // Better logging (EH)
    implementation 'com.elvishew:xlog:1.7.1'
    // Debug utils (EH)
    final def debug_overlay_version = '1.1.3'
    debugImplementation "com.ms-square:debugoverlay:$debug_overlay_version"
    releaseTestImplementation "com.ms-square:debugoverlay:$debug_overlay_version"
    releaseImplementation "com.ms-square:debugoverlay-no-op:$debug_overlay_version"
    testImplementation "com.ms-square:debugoverlay-no-op:$debug_overlay_version"
    // RatingBar (SY)
    implementation 'me.zhanghai.android.materialratingbar:library:1.4.0'
    // JsonReader for similar manga
    implementation 'com.squareup.moshi:moshi:1.11.0'
    implementation 'androidx.gridlayout:gridlayout:1.0.0'
 }
 buildscript {
    repositories {
        mavenCentral()
    }
    dependencies {
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$BuildPluginsVersion.KOTLIN"
    }
 }
 repositories {
    mavenCentral()
    jcenter()
 }
 // See https://kotlinlang.org/docs/reference/experimental.html#experimental-status-of-experimental-api-markers
 tasks.withType(AbstractKotlinCompile).all {
    kotlinOptions.freeCompilerArgs += [
            "-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.serialization.ExperimentalSerializationApi",
    ]
 }
 // Duplicating Hebrew string assets due to some locale code issues on different devices
 task copyHebrewStrings(type: Copy) {
    from './src/main/res/values-he'
    into './src/main/res/values-iw'
    include '**/*'
 }
 preBuild.dependsOn(formatKotlin, copyHebrewStrings)
 if (!getGradle().getStartParameter().getTaskRequests().toString().contains("Debug")) {
    apply plugin: 'com.google.gms.google-services'
    // Firebase Crashlytics
    apply plugin: 'com.google.firebase.crashlytics'
 }
@@ -0,0 +1,292 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
    id("com.android.application")
    id("com.mikepenz.aboutlibraries.plugin")
    kotlin("android")
    kotlin("plugin.parcelize")
    kotlin("plugin.serialization")
    id("com.github.zellius.shortcut-helper")
 }
 if (gradle.startParameter.taskRequests.toString().contains("Standard")) {
    apply<com.google.gms.googleservices.GoogleServicesPlugin>()
    // Firebase Crashlytics
    apply(plugin = "com.google.firebase.crashlytics")
 }
 shortcutHelper.setFilePath("./shortcuts.xml")
 android {
    compileSdk = AndroidConfig.compileSdk
    ndkVersion = AndroidConfig.ndk
    defaultConfig {
        applicationId = "eu.kanade.tachiyomi.sy"
        minSdk = AndroidConfig.minSdk
        targetSdk = AndroidConfig.targetSdk
        versionCode = 34
        versionName = "1.8.3"
        buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
        buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"")
        buildConfigField("String", "BUILD_TIME", "\"${getBuildTime()}\"")
        buildConfigField("boolean", "INCLUDE_UPDATER", "false")
        ndk {
            abiFilters += setOf("armeabi-v7a", "arm64-v8a", "x86")
        }
        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
    }
    buildTypes {
        named("debug") {
            versionNameSuffix = "-${getCommitCount()}"
            applicationIdSuffix = ".debug"
        }
        create("releaseTest") {
            applicationIdSuffix = ".rt"
            //isMinifyEnabled = true
            //isShrinkResources = true
            setProguardFiles(listOf(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"))
        }
        named("release") {
            isMinifyEnabled = true
            isShrinkResources = true
            setProguardFiles(listOf(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"))
        }
    }
    flavorDimensions += "default"
    productFlavors {
        create("standard") {
            buildConfigField("boolean", "INCLUDE_UPDATER", "true")
            dimension = "default"
        }
        create("fdroid") {
            dimension = "default"
        }
        create("dev") {
            resourceConfigurations.addAll(listOf("en", "xxhdpi"))
            dimension = "default"
        }
    }
    packagingOptions {
        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
    }
    buildFeatures {
        viewBinding = true
        // Disable some unused things
        aidl = false
        renderScript = false
        shaders = false
    }
    lint {
        disable.addAll(listOf("MissingTranslation", "ExtraTranslation"))
        abortOnError = false
        checkReleaseBuilds = false
    }
    compileOptions {
        sourceCompatibility = JavaVersion.VERSION_1_8
        targetCompatibility = JavaVersion.VERSION_1_8
    }
    kotlinOptions {
        jvmTarget = JavaVersion.VERSION_1_8.toString()
    }
 }
 dependencies {
    implementation(kotlinx.reflect)
    implementation(kotlinx.bundles.coroutines)
    // Source models and interfaces from Tachiyomi 1.x
    implementation(libs.tachiyomi.api)
    // AndroidX libraries
    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)
    implementation(androidx.bundles.lifecycle)
    // Job scheduling
    implementation(androidx.bundles.workmanager)
    // RX
    implementation(libs.bundles.reactivex)
    implementation(libs.flowreactivenetwork)
    // Network client
    implementation(libs.bundles.okhttp)
    implementation(libs.okio)
    // TLS 1.3 support for Android < 10
    implementation(libs.conscrypt.android)
    // Data serialization (JSON, protobuf)
    implementation(kotlinx.bundles.serialization)
    // JavaScript engine
    implementation(libs.bundles.js.engine)
    // HTML parser
    implementation(libs.jsoup)
    // Disk
    implementation(libs.disklrucache)
    implementation(libs.unifile)
    implementation(libs.junrar)
    // Database
    implementation(libs.bundles.sqlite)
    implementation("com.github.inorichi.storio:storio-common:8be19de@aar")
    implementation("com.github.inorichi.storio:storio-sqlite:8be19de@aar")
    // Preferences
    implementation(libs.preferencektx)
    implementation(libs.flowpreferences)
    // Model View Presenter
    implementation(libs.bundles.nucleus)
    // Dependency injection
    implementation(libs.injekt.core)
    // Image loading
    implementation(libs.bundles.coil)
    implementation(libs.subsamplingscaleimageview) {
        exclude(module = "image-decoder")
    }
    implementation(libs.image.decoder)
    // Sort
    implementation(libs.natural.comparator)
    // 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(libs.bundles.conductor)
    // FlowBinding
    implementation(libs.bundles.flowbinding)
    // Logging
    implementation(libs.logcat)
    // Crash reports/analytics
    // implementation(libs.acra.http)
    // "standardImplementation"(libs.firebase.analytics)
    // Licenses
    implementation(libs.aboutlibraries.core)
    // Shizuku
    implementation(libs.bundles.shizuku)
    // Tests
    testImplementation(libs.junit)
    testImplementation(libs.assertj.core)
    testImplementation(libs.mockito.core)
    testImplementation(libs.bundles.robolectric)
    // For detecting memory leaks; see https://square.github.io/leakcanary/
    // debugImplementation(libs.leakcanary.android)
    // SY -->
    // Changelog
    implementation(sylibs.changelog)
    // Text distance (EH)
    implementation (sylibs.simularity)
    // Firebase (EH)
    implementation(sylibs.firebase.analytics)
    implementation(sylibs.firebase.crashlytics.ktx)
    // Better logging (EH)
    implementation(sylibs.xlog)
    // Debug utils (EH)
    debugImplementation(sylibs.debugOverlay.standard)
    "releaseTestImplementation"(sylibs.debugOverlay.noop)
    releaseImplementation(sylibs.debugOverlay.noop)
    testImplementation(sylibs.debugOverlay.noop)
    // RatingBar (SY)
    implementation(sylibs.ratingbar)
 }
 tasks {
    // See https://kotlinlang.org/docs/reference/experimental.html#experimental-status-of-experimental-api(-markers)
    withType<KotlinCompile> {
        kotlinOptions.freeCompilerArgs += listOf(
            "-Xopt-in=kotlin.Experimental",
            "-Xopt-in=kotlin.RequiresOptIn",
            "-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",
        )
    }
    // Duplicating Hebrew string assets due to some locale code issues on different devices
    val copyHebrewStrings = task("copyHebrewStrings", type = Copy::class) {
        from("./src/main/res/values-he")
        into("./src/main/res/values-iw")
        include("**/*")
    }
    preBuild {
        dependsOn(formatKotlin, copyHebrewStrings)
    }
 }
 buildscript {
    dependencies {
        classpath(kotlinx.gradle)
    }
 }
@@ -0,0 +1,34 @@
 -allowaccessmodification
 -dontusemixedcaseclassnames
 -verbose
 -keepattributes *Annotation*
 -keepclasseswithmembernames,includedescriptorclasses class * {
    native <methods>;
 }
 -keepclassmembers enum * {
    public static **[] values();
    public static ** valueOf(java.lang.String);
 }
 -keepclassmembers class * implements android.os.Parcelable {
  public static final ** CREATOR;
 }
 -keep class androidx.annotation.Keep
 -keep @androidx.annotation.Keep class * {*;}
 -keepclasseswithmembers class * {
    @androidx.annotation.Keep <methods>;
 }
 -keepclasseswithmembers class * {
    @androidx.annotation.Keep <fields>;
 }
 -keepclasseswithmembers class * {
    @androidx.annotation.Keep <init>(...);
 }
@@ -58,6 +58,7 @@
    kotlinx.serialization.KSerializer serializer(...);
 }
 # Filter serializer
 -keep,includedescriptorclasses class xyz.nulldev.ts.api.http.serializer.**$$serializer { *; }
 -keepclassmembers class xyz.nulldev.ts.api.http.serializer.** {
    *** Companion;
@@ -66,37 +67,25 @@
    kotlinx.serialization.KSerializer serializer(...);
 }
-# Madokami extension username and password crash fix
+# Keep extension's common dependencies
-keepclassmembers class androidx.preference.EditTextPreference {
+-keep,allowoptimization class eu.kanade.tachiyomi.** { public protected *; }
-      *** mOnBindEditTextListener;
+-keep,allowoptimization class androidx.preference.** { *; }
-      *** mText;
+-keep,allowoptimization class kotlin.** { public protected *; }
-      public *;
+-keep,allowoptimization class kotlinx.coroutines.** { public protected *; }
-}
+-keep,allowoptimization class okhttp3.** { public protected *; }
-
+-keep,allowoptimization class okio.** { public protected *; }
-# Hitomi extension crash fix
+-keep,allowoptimization class rx.** { public protected *; }
-keepclassmembers class rx.Single {
+-keep,allowoptimization class org.jsoup.** { public protected *; }
-      *** onSubscribe;
+-keep,allowoptimization class com.google.gson.** { public protected *; }
-      final *;
+-keep,allowoptimization class com.github.salomonbrys.kotson.** { public protected *; }
-      protected *;
+-keep,allowoptimization class com.squareup.duktape.** { public protected *; }
-      public *;
+-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.**
 -keepclassmembers class rx.internal.util.unsafe.*ArrayQueue*Field* {
   long producerIndex;
   long consumerIndex;
 }
 -keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueProducerNodeRef {
    rx.internal.util.atomic.LinkedQueueNode producerNode;
 }
 -keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueConsumerNodeRef {
    rx.internal.util.atomic.LinkedQueueNode consumerNode;
 }
 -dontnote rx.internal.util.PlatformDependent
 # === Reactive network: https://github.com/pwittchen/ReactiveNetwork/tree/v0.12.4#proguard-configuration
@@ -118,32 +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,
 # JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
 -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>();
@@ -155,20 +118,6 @@
 ## From original config: "Attempt to fix: java.lang.NoClassDefFoundError: uy.kohesive.injekt.registry.default.DefaultRegistrar$NOKEY$1"
 -keep class uy.kohesive.injekt.** { *; }
 # === Glide
 -keep public class * implements com.bumptech.glide.module.GlideModule
 -keep public class * extends com.bumptech.glide.module.AppGlideModule
 -keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
  **[] $VALUES;
  public *;
 }
 -dontwarn com.bumptech.glide.load.resource.bitmap.VideoDecoder
 # === Glide-transformations: https://github.com/wasabeef/glide-transformations/blob/3aa8e53c6a51b8351d312f802ba1354c5b115168/transformations/proguard-rules.txt
 -dontwarn jp.co.cyberagent.android.gpuimage.**
 # === Conductor
 # This isn't in the consumer proguard rules yet: https://github.com/bluelinelabs/Conductor/pull/550/files
 -keepclassmembers public class * extends com.bluelinelabs.conductor.ControllerChangeHandler {
@@ -17,7 +17,7 @@
        android:shortcutDisabledMessage="@string/app_not_available"
        android:shortcutId="show_recently_updated"
        android:shortcutLongLabel="@string/label_recent_updates"
-        android:shortcutShortLabel="@string/short_recent_updates">
+        android:shortcutShortLabel="@string/label_recent_updates">
        <intent
            android:action="eu.kanade.tachiyomi.SHOW_RECENTLY_UPDATED"
            android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
@@ -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>
@@ -2,34 +2,45 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="eu.kanade.tachiyomi">
    <!-- Internet -->
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
    <!-- Storage -->
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <!-- For background jobs -->
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
    <uses-permission android:name="android.permission.WAKE_LOCK" />
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
    <!-- 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.FOREGROUND_SERVICE" />
+    <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:allowBackup="false"
        android:fullBackupContent="@xml/backup_rules"
        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.Tachiyomi.Light"
+        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" />
@@ -43,7 +54,8 @@
            android:name=".ui.main.DeepLinkActivity"
            android:launchMode="singleTask"
            android:theme="@android:style/Theme.NoDisplay"
-            android:label="@string/process_text_action_name">
+            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" />
@@ -55,7 +67,7 @@
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
            <intent-filter>
-                <action android:name="android.intent.action.PROCESS_TEXT" />
+                <action android:name="android.intent.action.SEND" />
                <category android:name="android.intent.category.DEFAULT" />
                <data android:mimeType="text/plain" />
            </intent-filter>
@@ -64,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>
@@ -74,19 +88,26 @@
            <meta-data android:name="com.samsung.android.support.REMOTE_ACTION"
                android:resource="@xml/s_pen_actions"/>
        </activity>
        <activity
-            android:name=".ui.security.BiometricUnlockActivity"
+            android:name=".ui.security.UnlockActivity"
-            android:theme="@style/Theme.Splash" />
+            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=".widget.CustomLayoutPickerActivity"
+            android:name=".extension.util.ExtensionInstallActivity"
-            android:label="@string/app_name"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
-            android:theme="@style/FilePickerTheme" />
+            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" />
@@ -100,10 +121,23 @@
        </activity>
        <activity
            android:name=".ui.setting.track.MyAnimeListLoginActivity"
-            android:configChanges="uiMode|orientation|screenSize" />
+            android:label="MyAnimeList"
            android:exported="true">
            <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:host="myanimelist-auth"
                    android:scheme="tachiyomi" />
            </intent-filter>
        </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" />
@@ -117,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" />
@@ -131,18 +166,9 @@
        </activity>
        <activity
-            android:name=".extension.util.ExtensionInstallActivity"
+            android:name="exh.ui.login.EhLoginActivity"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+            android:label="EHentaiLogin"
-
+            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>
        <receiver
            android:name=".data.notification.NotificationReceiver"
@@ -157,187 +183,190 @@
            android:exported="false" />
        <service
-            android:name=".data.updater.UpdaterService"
+            android:name=".data.updater.AppUpdateService"
            android:exported="false" />
        <service
            android:name=".data.backup.BackupCreateService"
            android:exported="false" />
        <service
            android:name=".data.backup.BackupRestoreService"
            android:exported="false" />
-        <!-- EH -->
+        <service android:name=".extension.util.ExtensionInstallService"
        <service
            android:name="exh.md.similar.SimilarUpdateService"
            android:exported="false" />
-        <service
+        <provider
-            android:name="exh.eh.EHentaiUpdateWorker"
+            android:name="androidx.core.content.FileProvider"
-            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:authorities="${applicationId}.provider"
-            android:exported="true" />
+            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 -->
        <activity
            android:name="exh.ui.intercept.InterceptActivity"
            android:label="@string/app_name"
-            android:theme="@style/Theme.EHActivity">
+            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:scheme="https" />
-                <data
+                <data android:scheme="http" />
                    android:host="g.e-hentai.org"
                    android:pathPattern="/g/.*"
                    android:scheme="http" />
                <data
                    android:host="g.e-hentai.org"
                    android:pathPattern="/g/.*"
                    android:scheme="https" />
                <data
                    android:host="e-hentai.org"
                    android:pathPattern="/g/.*"
                    android:scheme="http" />
                <data
                    android:host="e-hentai.org"
                    android:pathPattern="/g/.*"
                    android:scheme="https" />
-                <!-- EXH -->
+                <data android:host="e-hentai.org" />
-                <data
+                <data android:host="www.e-hentai.org" />
-                    android:host="exhentai.org"
+                <data android:host="g.e-hentai.org" />
                    android:pathPattern="/g/.*"
                    android:scheme="http" />
                <data
                    android:host="exhentai.org"
                    android:pathPattern="/g/.*"
                    android:scheme="https" />
-                <!-- nhentai -->
+                <data android:pathPattern="/g/..*" />
-                <data
+            </intent-filter>
-                    android:host="nhentai.net"
+            <!-- ExHentai -->
-                    android:pathPattern="/g/.*"
+            <intent-filter>
-                    android:scheme="http" />
+                <action android:name="android.intent.action.VIEW" />
                <data
                    android:host="nhentai.net"
                    android:pathPattern="/g/.*"
                    android:scheme="https" />
-                <!-- Perv Eden -->
+                <category android:name="android.intent.category.DEFAULT" />
-                <data
+                <category android:name="android.intent.category.BROWSABLE" />
                    android:host="www.perveden.com"
                    android:pathPattern="/.*/.*-manga/.*"
                    android:scheme="http" />
                <data
                    android:host="www.perveden.com"
                    android:pathPattern="/.*/.*-manga/.*"
                    android:scheme="https" />
-                <!-- Hentai Cafe -->
+                <data android:scheme="https" />
-                <data
+                <data android:scheme="http" />
                    android:host="hentai.cafe"
                    android:pathPattern="/.*/.*"
                    android:scheme="http" />
                <data
                    android:host="hentai.cafe"
                    android:pathPattern="/.*/.*"
                    android:scheme="https" />
-                <!-- Tsumino -->
+                <data android:host="exhentai.org" />
-                <data
+                <data android:host="www.exhentai.org" />
                    android:host="www.tsumino.com"
                    android:pathPattern="/Book/Info/.*"
                    android:scheme="http" />
                <data
                    android:host="www.tsumino.com"
                    android:pathPattern="/Book/Info/.*"
                    android:scheme="https" />
                <data
                    android:host="www.tsumino.com"
                    android:pathPattern="/Read/View/.*"
                    android:scheme="http" />
                <data
                    android:host="www.tsumino.com"
                    android:pathPattern="/Read/View/.*"
                    android:scheme="https" />
-                 <!-- Hitomi.la -->
+                <data android:pathPattern="/g/..*" />
-                <data
+            </intent-filter>
-                    android:host="hitomi.la"
+            <!-- NHentai -->
-                    android:pathPattern="/galleries/.*"
+            <intent-filter>
-                    android:scheme="http" />
+                <action android:name="android.intent.action.VIEW" />
                <data
                    android:host="hitomi.la"
                    android:pathPattern="/reader/.*"
                    android:scheme="http" />
                <data
                    android:host="hitomi.la"
                    android:pathPattern="/galleries/.*"
                    android:scheme="https" />
                <data
                    android:host="hitomi.la"
                    android:pathPattern="/reader/.*"
                    android:scheme="https" />
-                <!-- Pururin.io -->
+                <category android:name="android.intent.category.DEFAULT" />
-                <data
+                <category android:name="android.intent.category.BROWSABLE" />
                    android:host="pururin.io"
                    android:pathPattern="/gallery/.*"
                    android:scheme="http" />
                <data
                    android:host="pururin.io"
                    android:pathPattern="/gallery/.*"
                    android:scheme="https" />
-                <!-- HBrowse -->
+                <data android:scheme="https" />
-                <data
+                <data android:scheme="http" />
                    android:host="www.hbrowse.com"
                    android:scheme="http" />
                <data
                    android:host="www.hbrowse.com"
                    android:scheme="https" />
-                <!-- MangaDex -->
+                <data android:host="nhentai.net" />
-                <data
+                <data android:host="www.nhentai.net" />
                    android:scheme="https"
                    android:host="www.mangadex.org"
                    android:pathPattern="/manga/..*" />
                <data
                    android:scheme="https"
                    android:host="mangadex.org"
                    android:pathPattern="/manga/..*" />
                <data
                    android:scheme="https"
                    android:host="www.mangadex.cc"
                    android:pathPattern="/manga/..*" />
                <data
                    android:scheme="https"
                    android:host="www.mangadex.cc"
                    android:pathPattern="/manga/..*" />
-                <data
+                <data android:pathPattern="/g/..*" />
-                    android:scheme="https"
+            </intent-filter>
-                    android:host="www.mangadex.org"
+            <!-- Perv Eden -->
-                    android:pathPattern="/title/..*" />
+            <intent-filter>
-                <data
+                <action android:name="android.intent.action.VIEW" />
-                    android:scheme="https"
+
-                    android:host="mangadex.org"
+                <category android:name="android.intent.category.DEFAULT" />
-                    android:pathPattern="/title/..*" />
+                <category android:name="android.intent.category.BROWSABLE" />
-                <data
+
-                    android:scheme="https"
+                <data android:scheme="https" />
-                    android:host="www.mangadex.cc"
+                <data android:scheme="http" />
-                    android:pathPattern="/title/..*" />
+
-                <data
+                <data android:host="perveden.com" />
-                    android:scheme="https"
+                <data android:host="www.perveden.com" />
-                    android:host="www.mangadex.cc"
+
-                    android:pathPattern="/title/..*" />
+                <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.EHActivity" />
+            android:theme="@style/Theme.Tachiyomi"
            android:exported="false"/>
    </application>
 </manifest>
@@ -1,16 +1,31 @@
 package eu.kanade.tachiyomi
 import android.annotation.SuppressLint
 import android.app.ActivityManager
 import android.app.Application
 import android.app.PendingIntent
 import android.content.BroadcastReceiver
 import android.content.Context
-import android.content.res.Configuration
+import android.content.Intent
 import android.content.IntentFilter
 import android.graphics.Color
 import android.os.Build
 import android.os.Environment
-import androidx.lifecycle.Lifecycle
+import android.os.Looper
-import androidx.lifecycle.LifecycleObserver
+import android.webkit.WebView
-import androidx.lifecycle.OnLifecycleEvent
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.getSystemService
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ProcessLifecycleOwner
-import androidx.multidex.MultiDex
+import androidx.lifecycle.lifecycleScope
 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
@@ -19,155 +34,185 @@ 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.FirebaseAnalytics
 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.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.ui.security.SecureActivityDelegate
+import eu.kanade.tachiyomi.network.NetworkHelper
-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.XLogLogcatLogger
 import exh.log.xLogD
 import exh.log.xLogE
 import exh.syDebugVersion
-import io.realm.Realm
+import kotlinx.coroutines.flow.launchIn
-import io.realm.RealmConfiguration
+import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.GlobalScope
+import logcat.LogPriority
-import kotlinx.coroutines.launch
+import logcat.LogcatLogger
 import org.conscrypt.Conscrypt
 import timber.log.Timber
 import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.InjektScope
+import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import uy.kohesive.injekt.registry.default.DefaultRegistrar
 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.Duration.Companion.days
 import kotlin.concurrent.thread
 import kotlin.time.ExperimentalTime
 import kotlin.time.days
-open class App : Application(), LifecycleObserver {
+open class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory {
-    private lateinit var firebaseAnalytics: FirebaseAnalytics
+    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())
+        // if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree())
        setupExhLogging() // EXH logging
        LogcatLogger.install(XLogLogcatLogger()) // SY Redirect Logcat to XLog
        if (!BuildConfig.DEBUG) addAnalytics()
        workaroundAndroid7BrokenSSL()
        // Debug tool; see https://fbflipper.com/
        // SoLoader.init(this, false)
        // if (BuildConfig.DEBUG && FlipperUtils.shouldEnableFlipper(this)) {
        //     val client = AndroidFlipperClient.getInstance(this)
        //     client.addPlugin(InspectorFlipperPlugin(this, DescriptorMapping.withDefaults()))
        //     client.addPlugin(DatabasesFlipperPlugin(this))
        //     client.start()
        // }
        // TLS 1.3 support for Android < 10
        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
            Security.insertProviderAt(Conscrypt.newProvider(), 1)
        }
-        Injekt = InjektScope(DefaultRegistrar())
+        // Avoid potential crashes
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
            val process = getProcessName()
            if (packageName != process) WebView.setDataDirectorySuffix(process)
        }
        Injekt.importModule(AppModule(this))
        setupNotificationChannels()
        Realm.init(this)
        GlobalScope.launch { deleteOldMetadataRealm() } // Delete old metadata DB (EH)
        if ((BuildConfig.DEBUG || BuildConfig.BUILD_TYPE == "releaseTest") && DebugToggles.ENABLE_DEBUG_OVERLAY.enabled) {
            setupDebugOverlay()
        }
        LocaleHelper.updateConfiguration(this, resources.configuration)
        ProcessLifecycleOwner.get().lifecycle.addObserver(this)
    }
-    override fun attachBaseContext(base: Context) {
+        // Show notification to disable Incognito Mode when it's enabled
-        super.attachBaseContext(base)
+        preferences.incognitoMode().asFlow()
-        MultiDex.install(this)
+            .onEach { enabled ->
-    }
+                val notificationManager = NotificationManagerCompat.from(this)
                if (enabled) {
                    disableIncognitoReceiver.register()
                    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_24dp)
                        setOngoing(true)
-    override fun onConfigurationChanged(newConfig: Configuration) {
+                        val pendingIntent = PendingIntent.getBroadcast(
-        super.onConfigurationChanged(newConfig)
+                            this@App,
-        LocaleHelper.updateConfiguration(this, newConfig, true)
+                            0,
-    }
+                            Intent(ACTION_DISABLE_INCOGNITO_MODE),
-
+                            PendingIntent.FLAG_ONE_SHOT,
-    private fun workaroundAndroid7BrokenSSL() {
+                        )
-        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.N ||
+                        setContentIntent(pendingIntent)
-            Build.VERSION.SDK_INT == Build.VERSION_CODES.N_MR1
+                    }
-        ) {
+                    notificationManager.notify(Notifications.ID_INCOGNITO_MODE, notification)
-            try {
+                } else {
-                SSLContext.getInstance("TLSv1.2")
+                    disableIncognitoReceiver.unregister()
-            } catch (e: NoSuchAlgorithmException) {
+                    notificationManager.cancel(Notifications.ID_INCOGNITO_MODE)
-                XLog.tag("Init").e("Could not install Android 7 broken SSL workaround!", e)
+                }
            }
            .launchIn(ProcessLifecycleOwner.get().lifecycleScope)
-            try {
+        preferences.themeMode()
-                ProviderInstaller.installIfNeeded(applicationContext)
+            .asImmediateFlow {
-            } catch (e: GooglePlayServicesRepairableException) {
+                AppCompatDelegate.setDefaultNightMode(
-                XLog.tag("Init").e("Could not install Android 7 broken SSL workaround!", e)
+                    when (it) {
-            } catch (e: GooglePlayServicesNotAvailableException) {
+                        PreferenceValues.ThemeMode.light -> AppCompatDelegate.MODE_NIGHT_NO
-                XLog.tag("Init").e("Could not install Android 7 broken SSL workaround!", e)
+                        PreferenceValues.ThemeMode.dark -> AppCompatDelegate.MODE_NIGHT_YES
                        PreferenceValues.ThemeMode.system -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
                    },
                )
            }.launchIn(ProcessLifecycleOwner.get().lifecycleScope)
        /*if (!LogcatLogger.isInstalled && preferences.verboseLogging()) {
            LogcatLogger.install(AndroidLogcatLogger(LogPriority.VERBOSE))
        }*/
    }
    override fun newImageLoader(): ImageLoader {
        return ImageLoader.Builder(this).apply {
            val callFactoryInit = { Injekt.get<NetworkHelper>().client }
            val diskCacheInit = { CoilDiskCache.get(this@App) }
            components {
                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
                    add(ImageDecoderDecoder.Factory())
                } else {
                    add(GifDecoder.Factory())
                }
                add(TachiyomiImageDecoder.Factory())
                add(MangaCoverFetcher.Factory(lazy(callFactoryInit), lazy(diskCacheInit)))
                add(MangaCoverKeyer())
            }
-        }
+            callFactory(callFactoryInit)
            diskCache(diskCacheInit)
            crossfade((300 * this@App.animatorDurationScale).toInt())
            allowRgb565(getSystemService<ActivityManager>()!!.isLowRamDevice)
            if (preferences.verboseLogging()) logger(DebugLogger())
        }.build()
    }
    private fun addAnalytics() {
        firebaseAnalytics = Firebase.analytics
        if (syDebugVersion != "0") {
-            firebaseAnalytics.setUserProperty("preview_version", syDebugVersion)
+            Firebase.analytics.setUserProperty("preview_version", syDebugVersion)
        }
    }
-    @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
+    override fun onStop(owner: LifecycleOwner) {
-    @Suppress("unused")
+        if (!AuthenticatorUtil.isAuthenticating && preferences.lockAppAfter().get() >= 0) {
    fun onAppBackgrounded() {
        val preferences: PreferencesHelper by injectLazy()
        if (preferences.lockAppAfter().get() >= 0) {
            SecureActivityDelegate.locked = true
        }
    }
-    protected open fun setupNotificationChannels() {
+    override fun getPackageName(): String {
-        Notifications.createChannels(this)
+        // 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()
    }
-    // EXH
+    protected open fun setupNotificationChannels() {
-    private fun deleteOldMetadataRealm() {
+        try {
-        val config = RealmConfiguration.Builder()
+            Notifications.createChannels(this)
-            .name("gallery-metadata.realm")
+        } catch (e: Exception) {
-            .schemaVersion(3)
+            logcat(LogPriority.ERROR, e) { "Failed to modify notification channels" }
            .deleteRealmIfMigrationNeeded()
            .build()
        Realm.deleteRealm(config)
        // Delete old paper db files
        listOf(
            File(filesDir, "gallery-ex"),
            File(filesDir, "gallery-perveden"),
            File(filesDir, "gallery-nhentai")
        ).forEach {
            if (it.exists()) {
                thread {
                    it.deleteRecursively()
                }
            }
        }
    }
@@ -176,8 +221,8 @@ open class App : Application(), LifecycleObserver {
        EHLogLevel.init(this)
        val logLevel = when {
-            EHLogLevel.shouldLog(EHLogLevel.EXTRA) -> LogLevel.ALL
+            EHLogLevel.shouldLog(EHLogLevel.EXTREME) -> LogLevel.ALL
-            BuildConfig.DEBUG -> LogLevel.DEBUG
+            EHLogLevel.shouldLog(EHLogLevel.EXTRA) || BuildConfig.DEBUG -> LogLevel.DEBUG
            else -> LogLevel.WARN
        }
@@ -192,30 +237,27 @@ open class App : Application(), LifecycleObserver {
        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)
+            .Builder(logFolder.absolutePath) {
-            .fileNameGenerator(
+                fileNameGenerator = object : DateFileNameGenerator() {
                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 ->
-            .flattener { timeMillis, level, tag, message ->
+                    "${dateFormat.format(timeMillis)} ${LogLevel.getShortLevelName(level)}/$tag: $message"
-                "${dateFormat.format(timeMillis)} ${LogLevel.getShortLevelName(level)}/$tag: $message"
+                }
                cleanStrategy = FileLastModifiedCleanStrategy(7.days.inWholeMilliseconds)
                backupStrategy = NeverBackupStrategy()
            }
            .cleanStrategy(FileLastModifiedCleanStrategy(7.days.toLongMilliseconds()))
            .backupStrategy(NeverBackupStrategy())
            .build()
        // Install Crashlytics in prod
        if (!BuildConfig.DEBUG) {
@@ -224,20 +266,22 @@ open class App : Application(), LifecycleObserver {
        XLog.init(
            logConfig,
-            *printers.toTypedArray()
+            *printers.toTypedArray(),
        )
-        XLog.tag("Init").d("Application booting...")
+        xLogD("Application booting...")
-        XLog.tag("Init").disableStackTrace().d(
+        xLogD(
-            "App version: ${BuildConfig.VERSION_NAME} (${BuildConfig.FLAVOR}, ${BuildConfig.COMMIT_SHA}, ${BuildConfig.VERSION_CODE})\n" +
+            """
-                "Preview build: $syDebugVersion\n" +
+                App version: ${BuildConfig.VERSION_NAME} (${BuildConfig.FLAVOR}, ${BuildConfig.COMMIT_SHA}, ${BuildConfig.VERSION_CODE})
-                "Android version: ${Build.VERSION.RELEASE} (SDK ${Build.VERSION.SDK_INT}) \n" +
+                Preview build: $syDebugVersion
-                "Android build ID: ${Build.DISPLAY}\n" +
+                Android version: ${Build.VERSION.RELEASE} (SDK ${Build.VERSION.SDK_INT}) 
-                "Device brand: ${Build.BRAND}\n" +
+                Android build ID: ${Build.DISPLAY}
-                "Device manufacturer: ${Build.MANUFACTURER}\n" +
+                Device brand: ${Build.BRAND}
-                "Device name: ${Build.DEVICE}\n" +
+                Device manufacturer: ${Build.MANUFACTURER}
-                "Device model: ${Build.MODEL}\n" +
+                Device name: ${Build.DEVICE}
-                "Device product name: ${Build.PRODUCT}"
+                Device model: ${Build.MODEL}
                Device product name: ${Build.PRODUCT}
            """.trimIndent(),
        )
    }
@@ -253,7 +297,52 @@ open class App : Application(), LifecycleObserver {
                .install()
        } catch (e: IllegalStateException) {
            // Crashes if app is in background
-            XLog.tag("Init").e("Failed to initialize debug overlay, app in background?", e)
+            xLogE("Failed to initialize debug overlay, app in background?", e)
        }
    }
    private inner class DisableIncognitoReceiver : BroadcastReceiver() {
        private var registered = false
        override fun onReceive(context: Context, intent: Intent) {
            preferences.incognitoMode().set(false)
        }
        fun register() {
            if (!registered) {
                registerReceiver(this, IntentFilter(ACTION_DISABLE_INCOGNITO_MODE))
                registered = true
            }
        }
        fun unregister() {
            if (registered) {
                unregisterReceiver(this)
                registered = false
            }
        }
    }
 }
 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,20 +1,20 @@
 package eu.kanade.tachiyomi
 import android.app.Application
-import com.google.gson.Gson
+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
 import exh.eh.EHentaiUpdateHelper
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.serialization.json.Json
 import uy.kohesive.injekt.api.InjektModule
 import uy.kohesive.injekt.api.InjektRegistrar
@@ -27,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) }
@@ -45,9 +47,9 @@ class AppModule(val app: Application) : InjektModule {
        addSingletonFactory { TrackManager(app) }
-        addSingletonFactory { Gson() }
+        addSingletonFactory { DelayedTrackingStore(app) }
-        addSingletonFactory { Json { ignoreUnknownKeys = true } }
+        addSingletonFactory { ImageSaver(app) }
        // SY -->
        addSingletonFactory { CustomMangaManager(app) }
@@ -56,19 +58,20 @@ class AppModule(val app: Application) : InjektModule {
        // SY <--
        // Asynchronously init expensive components for a faster cold start
        ContextCompat.getMainExecutor(app).execute {
            get<PreferencesHelper>()
-        GlobalScope.launch { get<PreferencesHelper>() }
+            get<NetworkHelper>()
-        GlobalScope.launch { get<NetworkHelper>() }
+            get<SourceManager>()
-        GlobalScope.launch { get<SourceManager>() }
+            get<DatabaseHelper>()
-        GlobalScope.launch { get<DatabaseHelper>() }
+            get<DownloadManager>()
-        GlobalScope.launch { get<DownloadManager>() }
+            // SY -->
-
+            get<CustomMangaManager>()
-        // SY -->
+            // SY <--
-        GlobalScope.launch { get<CustomMangaManager>() }
+        }
        // SY <--
    }
 }
@@ -1,15 +1,26 @@
 package eu.kanade.tachiyomi
 import android.os.Build
 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
 import uy.kohesive.injekt.api.get
@@ -28,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)
            }
@@ -84,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)
@@ -94,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) {
+                if (oldSortingMode == LibrarySort.SOURCE) {
-                    preferences.librarySortingMode().set(LibrarySort.ALPHA)
+                    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
@@ -117,11 +130,145 @@ object Migrations {
                    putInt(PreferenceKeys.filterCompleted, convertBooleanPrefToTriState("pref_filter_completed_key"))
                    remove("pref_filter_completed_key")
                }
                // Force MAL log out due to login flow change
                val trackManager = Injekt.get<TrackManager>()
                trackManager.myAnimeList.logout()
            }
            if (oldVersion < 54) {
                // Force MAL log out due to login flow change
                // v52: switched from scraping to WebView
                // v53: switched from WebView to OAuth
                val trackManager = Injekt.get<TrackManager>()
                if (trackManager.myAnimeList.isLogged) {
                    trackManager.myAnimeList.logout()
                    context.toast(R.string.myanimelist_relogin)
                }
            }
            if (oldVersion < 57) {
                // Migrate DNS over HTTPS setting
                val wasDohEnabled = prefs.getBoolean("enable_doh", false)
                if (wasDohEnabled) {
                    prefs.edit {
                        putInt(PreferenceKeys.dohProvider, PREF_DOH_CLOUDFLARE)
                        remove("enable_doh")
                    }
                }
            }
            if (oldVersion < 59) {
                // Reset rotation to Free after replacing Lock
                if (prefs.contains("pref_rotation_type_key")) {
                    prefs.edit {
                        putInt("pref_rotation_type_key", 1)
                    }
                }
                // Disable update check for Android 5.x users
                if (BuildConfig.INCLUDE_UPDATER && Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
                    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 newOrientation = when (prefs.getInt("pref_rotation_type_key", 1)) {
                    1 -> OrientationType.FREE.flagValue
                    2 -> OrientationType.PORTRAIT.flagValue
                    3 -> OrientationType.LANDSCAPE.flagValue
                    4 -> OrientationType.LOCKED_PORTRAIT.flagValue
                    5 -> OrientationType.LOCKED_LANDSCAPE.flagValue
                    else -> OrientationType.FREE.flagValue
                }
                // Reading mode flag and prefValue is the same value
                val newReadingMode = prefs.getInt("pref_default_viewer_key", 1)
                prefs.edit {
                    putInt("pref_default_orientation_type_key", newOrientation)
                    remove("pref_rotation_type_key")
                    putInt("pref_default_reading_mode_key", newReadingMode)
                    remove("pref_default_viewer_key")
                }
            }
            if (oldVersion < 61) {
                // Handle removed every 1 or 2 hour library updates
                val updateInterval = preferences.libraryUpdateInterval().get()
                if (updateInterval == 1 || updateInterval == 2) {
                    preferences.libraryUpdateInterval().set(3)
                    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
@@ -5,14 +5,16 @@ import android.net.Uri
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.database.models.toMangaInfo
 import eu.kanade.tachiyomi.data.library.CustomMangaManager
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.model.toSChapter
 import eu.kanade.tachiyomi.source.online.all.EHentai
 import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource
 import exh.eh.EHentaiThrottleManager
 import rx.Observable
 import uy.kohesive.injekt.injectLazy
 abstract class AbstractBackupManager(protected val context: Context) {
@@ -22,7 +24,11 @@ abstract class AbstractBackupManager(protected val context: Context) {
    internal val trackManager: TrackManager by injectLazy()
    protected val preferences: PreferencesHelper by injectLazy()
-    abstract fun createBackup(uri: Uri, flags: Int, isJob: Boolean): String?
+    // SY -->
    protected val customMangaManager: CustomMangaManager by injectLazy()
    // SY <--
    abstract fun createBackup(uri: Uri, flags: Int, isAutoBackup: Boolean): String
    /**
     * Returns manga
@@ -33,29 +39,29 @@ abstract class AbstractBackupManager(protected val context: Context) {
        databaseHelper.getManga(manga.url, manga.source).executeAsBlocking()
    /**
-     * [Observable] that fetches chapter information
+     * Fetches chapter information.
     *
     * @param source source of manga
     * @param manga manga that needs updating
     * @param chapters list of chapters in the backup
-     * @return [Observable] that contains manga
+     * @return Updated manga chapters.
     */
-    internal open fun restoreChapterFetchObservable(source: Source, manga: Manga, chapters: List<Chapter>, throttleManager: EHentaiThrottleManager): Observable<Pair<List<Chapter>, List<Chapter>>> {
+    internal open suspend fun restoreChapters(source: Source, manga: Manga, chapters: List<Chapter> /* SY --> */, throttleManager: EHentaiThrottleManager /* SY <-- */): Pair<List<Chapter>, List<Chapter>> {
-        return (
+        // SY -->
-            if (source is EHentai) {
+        val fetchedChapters = if (source is EHentai) {
-                source.fetchChapterList(manga, throttleManager::throttle)
+            source.getChapterList(manga.toMangaInfo(), throttleManager::throttle)
-            } else {
+                .map { it.toSChapter() }
-                source.fetchChapterList(manga)
+        } else {
-            }
+            source.getChapterList(manga.toMangaInfo())
-            ).map {
+                .map { it.toSChapter() }
            syncChaptersWithSource(databaseHelper, it, manga, source)
        }
-            .doOnNext { (first) ->
+        // SY <--
-                if (first.isNotEmpty()) {
+        val syncedChapters = syncChaptersWithSource(databaseHelper, fetchedChapters, manga, source)
-                    chapters.forEach { it.manga_id = manga.id }
+        if (syncedChapters.first.isNotEmpty()) {
-                    updateChapters(chapters)
+            chapters.forEach { it.manga_id = manga.id }
-                }
+            updateChapters(chapters)
-            }
+        }
        return syncedChapters
    }
    /**
@@ -67,6 +73,9 @@ abstract class AbstractBackupManager(protected val context: Context) {
        databaseHelper.getFavoriteMangas().executeAsBlocking()
    // SY -->
    protected fun getReadManga(): List<Manga> =
        databaseHelper.getReadNotInLibraryMangas().executeAsBlocking()
    /**
     * Returns list containing merged manga that are possibly not in the library
     *
@@ -98,6 +107,13 @@ abstract class AbstractBackupManager(protected val context: Context) {
        databaseHelper.updateChaptersBackup(chapters).executeAsBlocking()
    }
    /**
     * Updates a list of chapters with known database ids
     */
    protected fun updateKnownChapters(chapters: List<Chapter>) {
        databaseHelper.updateKnownChaptersBackup(chapters).executeAsBlocking()
    }
    /**
     * Return number of backups.
     *
@@ -7,12 +7,13 @@ import eu.kanade.tachiyomi.data.database.DatabaseHelper
 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 eu.kanade.tachiyomi.data.library.CustomMangaManager
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.util.chapter.NoChaptersException
 import eu.kanade.tachiyomi.util.system.createFileInCacheDir
 import exh.eh.EHentaiThrottleManager
 import kotlinx.coroutines.Job
 import rx.Observable
 import uy.kohesive.injekt.injectLazy
 import java.io.File
 import java.text.SimpleDateFormat
@@ -24,6 +25,10 @@ abstract class AbstractBackupRestore<T : AbstractBackupManager>(protected val co
    protected val db: DatabaseHelper by injectLazy()
    protected val trackManager: TrackManager by injectLazy()
    // SY -->
    protected val customMangaManager: CustomMangaManager by injectLazy()
    // SY <--
    var job: Job? = null
    protected lateinit var backupManager: T
@@ -42,9 +47,9 @@ abstract class AbstractBackupRestore<T : AbstractBackupManager>(protected val co
    protected val errors = mutableListOf<Pair<Date, String>>()
-    abstract fun performRestore(uri: Uri): Boolean
+    abstract suspend fun performRestore(uri: Uri): Boolean
-    fun restoreBackup(uri: Uri): Boolean {
+    suspend fun restoreBackup(uri: Uri): Boolean {
        val startTime = System.currentTimeMillis()
        restoreProgress = 0
        errors.clear()
@@ -63,48 +68,48 @@ abstract class AbstractBackupRestore<T : AbstractBackupManager>(protected val co
    }
    /**
-     * [Observable] that fetches chapter information
+     * Fetches chapter information.
     *
     * @param source source of manga
     * @param manga manga that needs updating
-     * @return [Observable] that contains manga
+     * @return Updated manga chapters.
     */
-    internal fun chapterFetchObservable(source: Source, manga: Manga, chapters: List<Chapter>): Observable<Pair<List<Chapter>, List<Chapter>>> {
+    internal suspend fun updateChapters(source: Source, manga: Manga, chapters: List<Chapter>): Pair<List<Chapter>, List<Chapter>> {
-        return backupManager.restoreChapterFetchObservable(source, manga, chapters /* SY --> */, throttleManager /* SY <-- */)
+        return try {
            backupManager.restoreChapters(source, manga, chapters /* SY --> */, throttleManager /* SY <-- */)
        } catch (e: Exception) {
            // If there's any error, return empty update and continue.
-            .onErrorReturn {
+            val errorMessage = if (e is NoChaptersException) {
-                val errorMessage = if (it is NoChaptersException) {
+                context.getString(R.string.no_chapters_error)
-                    context.getString(R.string.no_chapters_error)
+            } else {
-                } else {
+                e.message
                    it.message
                }
                errors.add(Date() to "${manga.title} - $errorMessage")
                Pair(emptyList(), emptyList())
            }
            errors.add(Date() to "${manga.title} - $errorMessage")
            Pair(emptyList(), emptyList())
        }
    }
    /**
-     * [Observable] that refreshes tracking information
+     * Refreshes tracking information.
     *
     * @param manga manga that needs updating.
     * @param tracks list containing tracks from restore file.
     * @return [Observable] that contains updated track item
     */
-    internal fun trackingFetchObservable(manga: Manga, tracks: List<Track>): Observable<Track> {
+    internal suspend fun updateTracking(manga: Manga, tracks: List<Track>) {
-        return Observable.from(tracks)
+        tracks.forEach { track ->
-            .flatMap { track ->
+            val service = trackManager.getService(track.sync_id)
-                val service = trackManager.getService(track.sync_id)
+            if (service != null && service.isLogged) {
-                if (service != null && service.isLogged) {
+                try {
-                    service.refresh(track)
+                    val updatedTrack = service.refresh(track)
-                        .doOnNext { db.insertTrack(it).executeAsBlocking() }
+                    db.insertTrack(updatedTrack).executeAsBlocking()
-                        .onErrorReturn {
+                } catch (e: Exception) {
-                            errors.add(Date() to "${manga.title} - ${it.message}")
+                    errors.add(Date() to "${manga.title} - ${e.message}")
                            track
                        }
                } else {
                    errors.add(Date() to "${manga.title} - ${context.getString(R.string.tracker_not_logged_in, service?.name)}")
                    Observable.empty()
                }
            } else {
                val serviceName = service?.nameRes()?.let { context.getString(it) }
                errors.add(Date() to "${manga.title} - ${context.getString(R.string.tracker_not_logged_in, serviceName)}")
            }
        }
    }
    /**
@@ -117,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)
    }
@@ -125,15 +130,15 @@ abstract class AbstractBackupRestore<T : AbstractBackupManager>(protected val co
    internal fun writeErrorLog(): File {
        try {
            if (errors.isNotEmpty()) {
-                val destFile = File(context.externalCacheDir, "tachiyomi_restore.txt")
+                val file = context.createFileInCacheDir("tachiyomi_restore.txt")
                val sdf = SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.getDefault())
-                destFile.bufferedWriter().use { out ->
+                file.bufferedWriter().use { out ->
                    errors.forEach { (date, message) ->
                        out.write("[${sdf.format(date)}] $message\n")
                    }
                }
-                return destFile
+                return file
            }
        } catch (e: Exception) {
            // Empty
@@ -14,3 +14,5 @@ abstract class AbstractBackupRestoreValidator {
    data class Results(val missingSources: List<String>, val missingTrackers: List<String>)
 }
 class ValidatorParseException(e: Exception) : RuntimeException(e)
@@ -8,8 +8,25 @@ object BackupConst {
    const val EXTRA_URI = "$ID.$NAME.EXTRA_URI"
    const val EXTRA_FLAGS = "$ID.$NAME.EXTRA_FLAGS"
    const val EXTRA_MODE = "$ID.$NAME.EXTRA_MODE"
    const val EXTRA_TYPE = "$ID.$NAME.EXTRA_TYPE"
    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,122 +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.backup.legacy.LegacyBackupManager
 import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.util.system.acquireWakeLock
 import eu.kanade.tachiyomi.util.system.isServiceRunning
 /**
 * Service for backing up library information to a JSON file.
 */
 class BackupCreateService : Service() {
    companion object {
        // Filter options
        internal const val BACKUP_CATEGORY = 0x1
        internal const val BACKUP_CATEGORY_MASK = 0x1
        internal const val BACKUP_CHAPTER = 0x2
        internal const val BACKUP_CHAPTER_MASK = 0x2
        internal const val BACKUP_HISTORY = 0x4
        internal const val BACKUP_HISTORY_MASK = 0x4
        internal const val BACKUP_TRACK = 0x8
        internal const val BACKUP_TRACK_MASK = 0x8
        internal const val BACKUP_ALL = 0xF
        /**
         * Returns the status of the service.
         *
         * @param context the application context.
         * @return true if the service is running, false otherwise.
         */
        fun isRunning(context: Context): Boolean =
            context.isServiceRunning(BackupCreateService::class.java)
        /**
         * Make a backup from library
         *
         * @param context context of application
         * @param uri path of Uri
         * @param flags determines what to backup
         */
        fun start(context: Context, uri: Uri, flags: Int, type: Int) {
            if (!isRunning(context)) {
                val intent = Intent(context, BackupCreateService::class.java).apply {
                    putExtra(BackupConst.EXTRA_URI, uri)
                    putExtra(BackupConst.EXTRA_FLAGS, flags)
                    putExtra(BackupConst.EXTRA_TYPE, type)
                }
                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 backupType = intent.getIntExtra(BackupConst.EXTRA_TYPE, BackupConst.BACKUP_TYPE_LEGACY)
            val backupManager = when (backupType) {
                BackupConst.BACKUP_TYPE_FULL -> FullBackupManager(this)
                else -> LegacyBackupManager(this)
            }
            val backupFileUri = backupManager.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,15 +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.backup.legacy.LegacyBackupManager
+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
@@ -19,39 +28,71 @@ class BackupCreatorJob(private val context: Context, workerParams: WorkerParamet
    override fun doWork(): Result {
        val preferences = Injekt.get<PreferencesHelper>()
-        val uri = preferences.backupsDirectory().get().toUri()
+        val notifier = BackupNotifier(context)
-        val flags = BackupCreateService.BACKUP_ALL
+        val uri = inputData.getString(LOCATION_URI_KEY)?.let { Uri.parse(it) }
            ?: preferences.backupsDirectory().get().toUri()
        val flags = inputData.getInt(BACKUP_FLAGS_KEY, BackupConst.BACKUP_ALL)
        val isAutoBackup = inputData.getBoolean(IS_AUTO_BACKUP_KEY, true)
        context.notificationManager.notify(Notifications.ID_BACKUP_PROGRESS, notifier.showBackupProgress().build())
        return try {
-            FullBackupManager(context).createBackup(uri, flags, true)
+            val location = FullBackupManager(context).createBackup(uri, flags, isAutoBackup)
-            if (preferences.createLegacyBackup().get()) {
+            if (!isAutoBackup) notifier.showBackupComplete(UniFile.fromUri(context, location.toUri()))
                LegacyBackupManager(context).createBackup(uri, flags, true)
            }
            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
@@ -24,6 +24,7 @@ class BackupNotifier(private val context: Context) {
        setSmallIcon(R.drawable.ic_tachi)
        setAutoCancel(false)
        setOngoing(true)
        setOnlyAlertOnce(true)
    }
    private val completeNotificationBuilder = context.notificationBuilder(Notifications.CHANNEL_BACKUP_RESTORE_COMPLETE) {
@@ -41,7 +42,6 @@ class BackupNotifier(private val context: Context) {
            setContentTitle(context.getString(R.string.creating_backup))
            setProgress(0, 0, true)
            setOnlyAlertOnce(true)
        }
        builder.show(Notifications.ID_BACKUP_PROGRESS)
@@ -68,14 +68,12 @@ class BackupNotifier(private val context: Context) {
            setContentText(unifile.filePath ?: unifile.name)
            // Clear old actions if they exist
-            if (mActions.isNotEmpty()) {
+            clearActions()
                mActions.clear()
            }
            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)
@@ -94,14 +92,12 @@ class BackupNotifier(private val context: Context) {
            setOnlyAlertOnce(true)
            // Clear old actions if they exist
-            if (mActions.isNotEmpty()) {
+            clearActions()
                mActions.clear()
            }
            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),
            )
        }
@@ -128,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) {
@@ -137,18 +133,18 @@ class BackupNotifier(private val context: Context) {
            setContentText(context.resources.getQuantityString(R.plurals.restore_completed_message, errorCount, timeString, errorCount))
            // Clear old actions if they exist
-            if (mActions.isNotEmpty()) {
+            clearActions()
                mActions.clear()
            }
            if (errorCount > 0 && !path.isNullOrEmpty() && !file.isNullOrEmpty()) {
                val destFile = File(path, file)
                val uri = destFile.getUriCompat(context)
                val errorLogIntent = NotificationReceiver.openErrorLogPendingActivity(context, uri)
                setContentIntent(errorLogIntent)
                addAction(
-                    R.drawable.nnf_ic_file_folder,
+                    R.drawable.ic_folder_24dp,
-                    context.getString(R.string.action_open_log),
+                    context.getString(R.string.action_show_errors),
-                    NotificationReceiver.openErrorLogPendingActivity(context, uri)
+                    errorLogIntent,
                )
            }
@@ -13,10 +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.GlobalScope
+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.
@@ -40,12 +44,11 @@ class BackupRestoreService : Service() {
         * @param context context of application
         * @param uri path of Uri
         */
-        fun start(context: Context, uri: Uri, mode: Int, online: Boolean?) {
+        fun start(context: Context, uri: Uri, mode: Int) {
            if (!isRunning(context)) {
                val intent = Intent(context, BackupRestoreService::class.java).apply {
                    putExtra(BackupConst.EXTRA_URI, uri)
                    putExtra(BackupConst.EXTRA_MODE, mode)
                    online?.let { putExtra(BackupConst.EXTRA_TYPE, it) }
                }
                ContextCompat.startForegroundService(context, intent)
            }
@@ -68,12 +71,14 @@ class BackupRestoreService : Service() {
     */
    private lateinit var wakeLock: PowerManager.WakeLock
    private lateinit var ioScope: CoroutineScope
    private var backupRestore: AbstractBackupRestore<*>? = null
    private lateinit var notifier: BackupNotifier
    override fun onCreate() {
        super.onCreate()
        ioScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
        notifier = BackupNotifier(this)
        wakeLock = acquireWakeLock(javaClass.name)
@@ -92,6 +97,7 @@ class BackupRestoreService : Service() {
    private fun destroyJob() {
        backupRestore?.job?.cancel()
        ioScope.cancel()
        if (wakeLock.isHeld) {
            wakeLock.release()
        }
@@ -113,30 +119,31 @@ class BackupRestoreService : Service() {
    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
        val uri = intent?.getParcelableExtra<Uri>(BackupConst.EXTRA_URI) ?: return START_NOT_STICKY
        val mode = intent.getIntExtra(BackupConst.EXTRA_MODE, BackupConst.BACKUP_TYPE_FULL)
        val online = intent.getBooleanExtra(BackupConst.EXTRA_TYPE, true)
        // Cancel any previous job if needed.
        backupRestore?.job?.cancel()
        backupRestore = when (mode) {
-            BackupConst.BACKUP_TYPE_FULL -> FullBackupRestore(this, notifier, online)
+            BackupConst.BACKUP_TYPE_FULL -> FullBackupRestore(this, notifier)
            else -> LegacyBackupRestore(this, notifier)
        }
        val handler = CoroutineExceptionHandler { _, exception ->
-            Timber.e(exception)
+            logcat(LogPriority.ERROR, exception)
            backupRestore?.writeErrorLog()
            notifier.showRestoreError(exception.message)
            stopSelf(startId)
        }
-        backupRestore?.job = GlobalScope.launch(handler) {
+        val job = ioScope.launch(handler) {
            if (backupRestore?.restoreBackup(uri) == false) {
                notifier.showRestoreError(getString(R.string.restoring_backup_canceled))
            }
        }
-        backupRestore?.job?.invokeOnCompletion {
+        job.invokeOnCompletion {
            stopSelf(startId)
        }
        backupRestore?.job = job
        return START_NOT_STICKY
    }
@@ -3,15 +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.BackupConst.BACKUP_CATEGORY
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CATEGORY_MASK
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_CATEGORY_MASK
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CHAPTER
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_CHAPTER
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CHAPTER_MASK
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_CHAPTER_MASK
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_HISTORY
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_CUSTOM_INFO
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_HISTORY_MASK
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_CUSTOM_INFO_MASK
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_TRACK
+import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_HISTORY
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_TRACK_MASK
+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
@@ -29,27 +34,24 @@ import eu.kanade.tachiyomi.data.database.models.History
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.database.models.MangaCategory
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.online.MetadataSource
-import eu.kanade.tachiyomi.source.online.all.MergedSource
+import eu.kanade.tachiyomi.util.lang.launchIO
-import exh.MERGED_SOURCE_ID
+import eu.kanade.tachiyomi.util.system.logcat
 import exh.metadata.metadata.base.getFlatMetadataForManga
-import exh.metadata.metadata.base.insertFlatMetadata
+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 kotlinx.serialization.ExperimentalSerializationApi
+import exh.util.executeOnIO
-import kotlinx.serialization.decodeFromString
+import exh.util.nullIfBlank
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.protobuf.ProtoBuf
 import logcat.LogPriority
 import okio.buffer
 import okio.gzip
 import okio.sink
-import rx.Observable
+import java.io.FileOutputStream
 import timber.log.Timber
 import kotlin.math.max
@OptIn(ExperimentalSerializationApi::class)
 class FullBackupManager(context: Context) : AbstractBackupManager(context) {
    val parser = ProtoBuf
@@ -58,26 +60,32 @@ 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
        databaseHelper.inTransaction {
-            val databaseManga = getFavoriteManga() /* SY --> */ + getMergedManga().filterNot { it.source == MERGED_SOURCE_ID } /* SY <-- */
+            val databaseManga = getFavoriteManga() /* SY --> */ + if (flags and BACKUP_READ_MANGA_MASK == BACKUP_READ_MANGA) {
                getReadManga()
            } else {
                emptyList()
            } + getMergedManga() // SY <--
            backup = Backup(
                backupManga(databaseManga, flags),
                backupCategories(),
                emptyList(),
                backupExtensionInfo(databaseManga),
-                backupSavedSearches()
+                backupSavedSearches(),
            )
        }
        var file: UniFile? = null
        try {
-            val file: UniFile = (
+            file = (
-                if (isJob) {
+                if (isAutoBackup) {
                    // Get dir of file and create
                    var dir = UniFile.fromUri(context, uri)
                    dir = dir.createDirectory("automatic")
@@ -99,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) }
+            if (byteArray.isEmpty()) {
-            return file.uri.toString()
+                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
        }
    }
@@ -142,14 +167,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 {
+        return databaseHelper.getSavedSearches().executeAsBlocking().map {
            val sourceId = it.substringBefore(':').toLong()
            val content = Json.decodeFromString<JsonSavedSearch>(it.substringAfter(':'))
            BackupSavedSearch(
-                content.name,
+                it.name,
-                content.query,
+                it.query.orEmpty(),
-                content.filters.toString(),
+                it.filtersJson ?: "[]",
-                sourceId
+                it.source,
            )
        }
    }
@@ -164,7 +187,7 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
     */
    private fun backupMangaObject(manga: Manga, options: Int): BackupManga {
        // Entry for this manga
-        val mangaObject = BackupManga.copyFrom(manga)
+        val mangaObject = BackupManga.copyFrom(manga /* SY --> */, if (options and BACKUP_CUSTOM_INFO_MASK == BACKUP_CUSTOM_INFO) customMangaManager else null /* SY <-- */)
        // SY -->
        if (manga.source == MERGED_SOURCE_ID) {
@@ -175,8 +198,8 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
            }
        }
-        val source = sourceManager.get(manga.source)?.getMainSource()
+        val source = sourceManager.get(manga.source)?.getMainSource<MetadataSource<*, *>>()
-        if (source is MetadataSource<*, *>) {
+        if (source != null) {
            manga.id?.let { mangaId ->
                databaseHelper.getFlatMetadataForManga(mangaId).executeAsBlocking()?.let { flatMetadata ->
                    mangaObject.flatMetadata = BackupFlatMetadata.copyFrom(flatMetadata)
@@ -235,29 +258,15 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
    }
    /**
-     * [Observable] that fetches manga information
+     * Fetches manga information
     *
     * @param source source of manga
     * @param manga manga that needs updating
-     * @return [Observable] that contains manga
+     * @return Updated manga info.
     */
-    fun restoreMangaFetchObservable(source: Source?, manga: Manga, online: Boolean): Observable<Manga> {
+    fun restoreManga(manga: Manga): Manga {
-        return if (online && source != null /* SY --> */ && source !is MergedSource /* SY <-- */) {
+        return manga.also {
-            source.fetchMangaDetails(manga)
+            it.initialized = it.description != null
-                .map { networkManga ->
+            it.id = insertManga(it)
                    manga.copyFrom(networkManga)
                    manga.favorite = manga.favorite
                    manga.initialized = true
                    manga.id = insertManga(manga)
                    manga
                }
        } else {
            Observable.just(manga)
                .map {
                    it.initialized = it.description != null
                    it.id = insertManga(it)
                    it
                }
        }
    }
@@ -302,7 +311,7 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
     */
    internal fun restoreCategoriesForManga(manga: Manga, categories: List<Int>, backupCategories: List<BackupCategory>) {
        val dbCategories = databaseHelper.getCategories().executeAsBlocking()
-        val mangaCategoriesToUpdate = mutableListOf<MangaCategory>()
+        val mangaCategoriesToUpdate = ArrayList<MangaCategory>(categories.size)
        categories.forEach { backupCategoryOrder ->
            backupCategories.firstOrNull {
                it.order == backupCategoryOrder
@@ -329,7 +338,7 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
     */
    internal fun restoreHistoryForManga(history: List<BackupHistory>) {
        // List containing history to be updated
-        val historyToBeUpdated = mutableListOf<History>()
+        val historyToBeUpdated = ArrayList<History>(history.size)
        for ((url, lastRead) in history) {
            val dbHistory = databaseHelper.getHistoryByChapterUrl(url).executeAsBlocking()
            // Check if history already in database and update
@@ -366,29 +375,26 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
        val trackToUpdate = mutableListOf<Track>()
        tracks.forEach { track ->
-            val service = trackManager.getService(track.sync_id)
+            var isInDatabase = false
-            if (service != null && service.isLogged) {
+            for (dbTrack in dbTracks) {
-                var isInDatabase = false
+                if (track.sync_id == dbTrack.sync_id) {
-                for (dbTrack in dbTracks) {
+                    // The sync is already in the db, only update its fields
-                    if (track.sync_id == dbTrack.sync_id) {
+                    if (track.media_id != dbTrack.media_id) {
-                        // The sync is already in the db, only update its fields
+                        dbTrack.media_id = track.media_id
                        if (track.media_id != dbTrack.media_id) {
                            dbTrack.media_id = track.media_id
                        }
                        if (track.library_id != dbTrack.library_id) {
                            dbTrack.library_id = track.library_id
                        }
                        dbTrack.last_chapter_read = max(dbTrack.last_chapter_read, track.last_chapter_read)
                        isInDatabase = true
                        trackToUpdate.add(dbTrack)
                        break
                    }
                    if (track.library_id != dbTrack.library_id) {
                        dbTrack.library_id = track.library_id
                    }
                    dbTrack.last_chapter_read = max(dbTrack.last_chapter_read, track.last_chapter_read)
                    isInDatabase = true
                    trackToUpdate.add(dbTrack)
                    break
                }
-                if (!isInDatabase) {
+            }
-                    // Insert new sync. Let the db assign the id
+            if (!isInDatabase) {
-                    track.id = null
+                // Insert new sync. Let the db assign the id
-                    trackToUpdate.add(track)
+                track.id = null
-                }
+                trackToUpdate.add(track)
            }
        }
        // Update database
@@ -397,25 +403,12 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
        }
    }
-    /**
+    internal fun restoreChaptersForManga(manga: Manga, chapters: List<Chapter>) {
     * Restore the chapters for manga if chapters already in database
     *
     * @param manga manga of chapters
     * @param chapters list containing chapters that get restored
     * @return boolean answering if chapter fetch is not needed
     */
    internal fun restoreChaptersForManga(manga: Manga, chapters: List<Chapter>): Boolean {
        val dbChapters = databaseHelper.getChapters(manga).executeAsBlocking()
        // Return if fetch is needed
        if (dbChapters.isEmpty() || dbChapters.size < chapters.size) {
            return false
        }
        chapters.forEach { chapter ->
-            val pos = dbChapters.indexOfFirst { it.url == chapter.url }
+            val dbChapter = dbChapters.find { it.url == chapter.url }
-            if (pos != -1) {
+            if (dbChapter != null) {
                val dbChapter = dbChapters[pos]
                chapter.id = dbChapter.id
                chapter.copyFrom(dbChapter)
                if (dbChapter.read && !chapter.read) {
@@ -428,70 +421,36 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
                    chapter.bookmark = dbChapter.bookmark
                }
            }
            chapter.manga_id = manga.id
        }
        // Filter the chapters that couldn't be found.
        chapters.filter { it.id != null }
        chapters.map { it.manga_id = manga.id }
-        updateChapters(chapters)
+        val newChapters = chapters.groupBy { it.id != null }
-        return true
+        newChapters[true]?.let { updateKnownChapters(it) }
-    }
+        newChapters[false]?.let { insertChapters(it) }
    internal fun restoreChaptersForMangaOffline(manga: Manga, chapters: List<Chapter>) {
        val dbChapters = databaseHelper.getChapters(manga).executeAsBlocking()
        chapters.forEach { chapter ->
            val pos = dbChapters.indexOfFirst { it.url == chapter.url }
            if (pos != -1) {
                val dbChapter = dbChapters[pos]
                chapter.id = dbChapter.id
                chapter.copyFrom(dbChapter)
                if (dbChapter.read && !chapter.read) {
                    chapter.read = dbChapter.read
                    chapter.last_page_read = dbChapter.last_page_read
                } else if (chapter.last_page_read == 0 && dbChapter.last_page_read != 0) {
                    chapter.last_page_read = dbChapter.last_page_read
                }
                if (!chapter.bookmark && dbChapter.bookmark) {
                    chapter.bookmark = dbChapter.bookmark
                }
            }
        }
        chapters.map { it.manga_id = manga.id }
        updateChapters(chapters.filter { it.id != null })
        insertChapters(chapters.filter { it.id == null })
    }
    // SY -->
    internal fun restoreSavedSearches(backupSavedSearches: List<BackupSavedSearch>) {
-        val currentSavedSearches = preferences.savedSearches().get().map {
+        val currentSavedSearches = databaseHelper.getSavedSearches()
-            val sourceId = it.substringBefore(':').toLong()
+            .executeAsBlocking()
            val content = Json.decodeFromString<JsonSavedSearch>(it.substringAfter(':'))
            BackupSavedSearch(
                content.name,
                content.query,
                content.filters.toString(),
                sourceId
            )
        }
-        preferences.savedSearches()
+        val newSavedSearches = backupSavedSearches.filter { backupSavedSearch ->
-            .set(
+            currentSavedSearches.none { it.name == backupSavedSearch.name && it.source == backupSavedSearch.source }
-                (
+        }.map {
-                    backupSavedSearches.filter { backupSavedSearch -> currentSavedSearches.none { it.name == backupSavedSearch.name && it.source == backupSavedSearch.source } }
+            SavedSearch(
-                        .map {
+                id = null,
-                            "${it.source}:" + Json.encodeToString(
+                it.source,
-                                JsonSavedSearch(
+                it.name,
-                                    it.name,
+                it.query.nullIfBlank(),
-                                    it.query,
+                filtersJson = it.filterList.nullIfBlank()
-                                    Json.decodeFromString(it.filterList)
+                    ?.takeUnless { it == "[]" },
                                )
                            )
                        } + preferences.savedSearches().get()
                    )
                    .toSet()
            )
        }.ifEmpty { null }
        if (newSavedSearches != null) {
            databaseHelper.insertSavedSearches(newSavedSearches)
        }
    }
    /**
@@ -530,11 +489,12 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
    }
    internal fun restoreFlatMetadata(manga: Manga, backupFlatMetadata: BackupFlatMetadata) {
-        manga.id?.let { mangaId ->
+        val mangaId = manga.id ?: return
-            databaseHelper.getFlatMetadataForManga(mangaId).executeAsBlocking().let {
+        launchIO {
            databaseHelper.getFlatMetadataForManga(mangaId).executeOnIO().let {
                if (it == null) {
                    val flatMetadata = backupFlatMetadata.getFlatMetadata(mangaId)
-                    databaseHelper.insertFlatMetadata(flatMetadata).await()
+                    databaseHelper.insertFlatMetadataAsync(flatMetadata).await()
                }
            }
        }
@@ -12,24 +12,21 @@ 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
-import eu.kanade.tachiyomi.source.Source
+import eu.kanade.tachiyomi.data.library.CustomMangaManager
 import eu.kanade.tachiyomi.source.online.all.MergedSource
 import exh.EXHMigrations
-import exh.MERGED_SOURCE_ID
+import exh.source.MERGED_SOURCE_ID
 import kotlinx.serialization.ExperimentalSerializationApi
 import okio.buffer
 import okio.gzip
 import okio.source
 import rx.Observable
 import java.util.Date
-@OptIn(ExperimentalSerializationApi::class)
+class FullBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBackupRestore<FullBackupManager>(context, notifier) {
 class FullBackupRestore(context: Context, notifier: BackupNotifier, private val online: Boolean) : AbstractBackupRestore<FullBackupManager>(context, notifier) {
-    override fun performRestore(uri: Uri): Boolean {
+    override suspend fun performRestore(uri: Uri): Boolean {
        // SY -->
        throttleManager.resetThrottle()
        // SY <--
@@ -52,7 +49,8 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier, private val
        // 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 {
@@ -60,9 +58,11 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier, private val
                return false
            }
-            restoreManga(it, backup.backupCategories, online)
+            restoreManga(it, backup.backupCategories)
        }
        // TODO: optionally trigger online library + tracker update
        return true
    }
@@ -84,31 +84,27 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier, private val
    }
    // SY <--
-    private fun restoreManga(backupManga: BackupManga, backupCategories: List<BackupCategory>, online: Boolean) {
+    private fun restoreManga(backupManga: BackupManga, backupCategories: List<BackupCategory>) {
-        var manga = backupManga.getMangaImpl()
+        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
        val flatMetadata = backupManga.flatMetadata
        val customManga = backupManga.getCustomMangaInfo()
        // SY <--
        // SY -->
-        manga = EXHMigrations.migrateBackupEntry(manga)
+        EXHMigrations.migrateBackupEntry(manga)
        // SY <--
        try {
-            val source = backupManager.sourceManager.get(manga.source)
+            restoreMangaData(manga, chapters, categories, history, tracks, backupCategories/* SY --> */, mergedMangaReferences, flatMetadata, customManga/* SY <-- */)
            if (source != null || !online) {
                restoreMangaData(manga, source, chapters, categories, history, tracks, backupCategories, mergedMangaReferences, flatMetadata, online)
            } else {
                val sourceName = sourceMapping[manga.source] ?: manga.source.toString()
                errors.add(Date() to "${manga.title} - ${context.getString(R.string.source_not_found_name, sourceName)}")
            }
        } catch (e: Exception) {
-            errors.add(Date() to "${manga.title} - ${e.message}")
+            val sourceName = sourceMapping[manga.source] ?: manga.source.toString()
            errors.add(Date() to "${manga.title} [$sourceName]: ${e.message}")
        }
        restoreProgress += 1
@@ -119,7 +115,6 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier, private val
     * Returns a manga restore observable
     *
     * @param manga manga data from json
     * @param source source to get manga data from
     * @param chapters chapters data from json
     * @param categories categories data from json
     * @param history history data from json
@@ -127,116 +122,93 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier, private val
     */
    private fun restoreMangaData(
        manga: Manga,
        source: Source?,
        chapters: List<Chapter>,
        categories: List<Int>,
        history: List<BackupHistory>,
        tracks: List<Track>,
        backupCategories: List<BackupCategory>,
        // SY -->
        mergedMangaReferences: List<BackupMergedMangaReference>,
        flatMetadata: BackupFlatMetadata?,
-        online: Boolean
+        customManga: CustomMangaManager.MangaJson?,
        // SY -->
    ) {
        val dbManga = backupManager.getMangaFromDatabase(manga)
        db.inTransaction {
            val dbManga = backupManager.getMangaFromDatabase(manga)
            if (dbManga == null) {
                // Manga not in database
-                restoreMangaFetch(source, manga, chapters, categories, history, tracks, backupCategories, mergedMangaReferences, flatMetadata, online)
+                restoreMangaFetch(manga, chapters, categories, history, tracks, backupCategories/* SY --> */, mergedMangaReferences, flatMetadata, customManga/* SY <-- */)
-            } else { // Manga in database
+            } else {
                // Manga in database
                // Copy information from manga already in database
                backupManager.restoreMangaNoFetch(manga, dbManga)
                // Fetch rest of manga information
-                restoreMangaNoFetch(source, manga, chapters, categories, history, tracks, backupCategories, mergedMangaReferences, flatMetadata, online)
+                restoreMangaNoFetch(manga, chapters, categories, history, tracks, backupCategories/* SY --> */, mergedMangaReferences, flatMetadata, customManga/* SY <-- */)
            }
        }
    }
    /**
-     * [Observable] that fetches manga information
+     * Fetches manga information
     *
     * @param manga manga that needs updating
     * @param chapters chapters of manga that needs updating
     * @param categories categories that need updating
     */
    private fun restoreMangaFetch(
        source: Source?,
        manga: Manga,
        chapters: List<Chapter>,
        categories: List<Int>,
        history: List<BackupHistory>,
        tracks: List<Track>,
        backupCategories: List<BackupCategory>,
        // SY -->
        mergedMangaReferences: List<BackupMergedMangaReference>,
        flatMetadata: BackupFlatMetadata?,
-        online: Boolean
+        customManga: CustomMangaManager.MangaJson?,
        // SY <--
    ) {
-        backupManager.restoreMangaFetchObservable(source, manga, online)
+        try {
-            .doOnError {
+            val fetchedManga = backupManager.restoreManga(manga)
-                errors.add(Date() to "${manga.title} - ${it.message}")
+            fetchedManga.id ?: return
-            }
+            backupManager.restoreChaptersForManga(fetchedManga, chapters)
-            .filter { it.id != null }
+
-            .flatMap {
+            restoreExtraForManga(fetchedManga, categories, history, tracks, backupCategories /* SY --> */, mergedMangaReferences, flatMetadata, customManga/* SY <-- */)
-                if (online && source != null) {
+        } catch (e: Exception) {
-                    // SY -->
+            errors.add(Date() to "${manga.title} - ${e.message}")
-                    if (source !is MergedSource) {
+        }
                        chapterFetchObservable(source, it, chapters)
                            // Convert to the manga that contains new chapters.
                            .map { manga }
                    } else {
                        Observable.just(manga)
                    }
                    // SY <--
                } else {
                    backupManager.restoreChaptersForMangaOffline(it, chapters)
                    Observable.just(manga)
                }
            }
            .doOnNext {
                restoreExtraForManga(it, categories, history, tracks, backupCategories, mergedMangaReferences, flatMetadata)
            }
            .flatMap {
                trackingFetchObservable(it, tracks)
            }
            .subscribe()
    }
    private fun restoreMangaNoFetch(
        source: Source?,
        backupManga: Manga,
        chapters: List<Chapter>,
        categories: List<Int>,
        history: List<BackupHistory>,
        tracks: List<Track>,
        backupCategories: List<BackupCategory>,
        // SY -->
        mergedMangaReferences: List<BackupMergedMangaReference>,
        flatMetadata: BackupFlatMetadata?,
-        online: Boolean
+        customManga: CustomMangaManager.MangaJson?,
        // SY <--
    ) {
-        Observable.just(backupManga)
+        backupManager.restoreChaptersForManga(backupManga, chapters)
-            .flatMap { manga ->
+
-                if (online && source != null) {
+        restoreExtraForManga(backupManga, categories, history, tracks, backupCategories/* SY --> */, mergedMangaReferences, flatMetadata, customManga/* SY <-- */)
                    if (/* SY --> */ source !is MergedSource && /* SY <-- */ !backupManager.restoreChaptersForManga(manga, chapters)) {
                        chapterFetchObservable(source, manga, chapters)
                            .map { manga }
                    } else {
                        Observable.just(manga)
                    }
                } else {
                    backupManager.restoreChaptersForMangaOffline(manga, chapters)
                    Observable.just(manga)
                }
            }
            .doOnNext {
                restoreExtraForManga(it, categories, history, tracks, backupCategories, mergedMangaReferences, flatMetadata)
            }
            .flatMap { manga ->
                trackingFetchObservable(manga, tracks)
            }
            .subscribe()
    }
-    private fun restoreExtraForManga(manga: Manga, categories: List<Int>, history: List<BackupHistory>, tracks: List<Track>, backupCategories: List<BackupCategory>, mergedMangaReferences: List<BackupMergedMangaReference>, flatMetadata: BackupFlatMetadata?) {
+    private fun restoreExtraForManga(
        manga: Manga,
        categories: List<Int>,
        history: List<BackupHistory>,
        tracks: List<Track>,
        backupCategories: List<BackupCategory>,
        // SY -->
        mergedMangaReferences: List<BackupMergedMangaReference>,
        flatMetadata: BackupFlatMetadata?,
        customManga: CustomMangaManager.MangaJson?,
        // SY <--
    ) {
        // Restore categories
        backupManager.restoreCategoriesForManga(manga, categories, backupCategories)
@@ -252,6 +224,10 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier, private val
        // Restore flat metadata for metadata sources
        flatMetadata?.let { backupManager.restoreFlatMetadata(manga, it) }
        // Restore Custom Info
        customManga?.id = manga.id!!
        customManga?.let { customMangaManager.saveMangaInfo(it) }
        // SY <--
    }
 }
@@ -4,14 +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 kotlinx.serialization.ExperimentalSerializationApi
 import okio.buffer
 import okio.gzip
 import okio.source
@OptIn(ExperimentalSerializationApi::class)
 class FullBackupRestoreValidator : AbstractBackupRestoreValidator() {
    /**
     * Checks for critical backup file data.
     *
@@ -21,14 +21,20 @@ class FullBackupRestoreValidator : AbstractBackupRestoreValidator() {
    override fun validate(context: Context, uri: Uri): Results {
        val backupManager = FullBackupManager(context)
-        val backupString = context.contentResolver.openInputStream(uri)!!.source().gzip().buffer().use { it.readByteArray() }
+        val backup = try {
-        val backup = backupManager.parser.decodeFromByteArray(BackupSerializer, backupString)
+            val backupString =
                context.contentResolver.openInputStream(uri)!!.source().gzip().buffer()
                    .use { it.readByteArray() }
            backupManager.parser.decodeFromByteArray(BackupSerializer, backupString)
        } catch (e: Exception) {
            throw ValidatorParseException(e)
        }
        if (backup.backupManga.isEmpty()) {
            throw Exception(context.getString(R.string.invalid_backup_file_missing_manga))
        }
-        val sources = backup.backupSources.map { it.sourceId to it.name }.toMap()
+        val sources = backup.backupSources.associate { it.sourceId to it.name }
        val missingSources = sources
            .filter { sourceManager.get(it.key) == null }
            .values
@@ -41,7 +47,7 @@ class FullBackupRestoreValidator : AbstractBackupRestoreValidator() {
        val missingTrackers = trackers
            .mapNotNull { trackManager.getService(it) }
            .filter { !it.isLogged }
-            .map { it.name }
+            .map { context.getString(it.nameRes()) }
            .sorted()
        return Results(missingSources, missingTrackers)
@@ -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,
 )
@@ -4,6 +4,7 @@ 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.TrackImpl
 import eu.kanade.tachiyomi.data.library.CustomMangaManager
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoNumber
@@ -25,7 +26,7 @@ data class BackupManga(
    // @ProtoNumber(11) val lastUpdate: Long = 0, 1.x value, not used in 0.x
    // @ProtoNumber(12) val lastInit: Long = 0, 1.x value, not used in 0.x
    @ProtoNumber(13) var dateAdded: Long = 0,
-    @ProtoNumber(14) var viewer: Int = 0,
+    @ProtoNumber(14) var viewer: Int = 0, // Replaced by viewer_flags
    // @ProtoNumber(15) val flags: Int = 0, 1.x value, not used in 0.x
    @ProtoNumber(16) var chapters: List<BackupChapter> = emptyList(),
    @ProtoNumber(17) var categories: List<Int> = emptyList(),
@@ -33,10 +34,25 @@ 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(),
-    @ProtoNumber(601) var flatMetadata: BackupFlatMetadata? = null
+    @ProtoNumber(601) var flatMetadata: BackupFlatMetadata? = null,
    @ProtoNumber(602) var customStatus: Int = 0,
    // J2K specific values
    @ProtoNumber(800) var customTitle: String? = null,
    @ProtoNumber(801) var customArtist: String? = null,
    @ProtoNumber(802) var customAuthor: 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,
 ) {
    fun getMangaImpl(): MangaImpl {
        return MangaImpl().apply {
@@ -51,8 +67,9 @@ data class BackupManga(
            favorite = this@BackupManga.favorite
            source = this@BackupManga.source
            date_added = this@BackupManga.dateAdded
-            viewer = this@BackupManga.viewer
+            viewer_flags = this@BackupManga.viewer_flags ?: this@BackupManga.viewer
            chapter_flags = this@BackupManga.chapterFlags
            filtered_scanlators = this@BackupManga.filtered_scanlators
        }
    }
@@ -62,6 +79,29 @@ data class BackupManga(
        }
    }
    // SY -->
    fun getCustomMangaInfo(): CustomMangaManager.MangaJson? {
        if (customTitle != null ||
            customArtist != null ||
            customAuthor != null ||
            customDescription != null ||
            customGenre != null ||
            customStatus != 0
        ) {
            return CustomMangaManager.MangaJson(
                id = 0L,
                title = customTitle,
                author = customAuthor,
                artist = customArtist,
                description = customDescription,
                genre = customGenre,
                status = customStatus.takeUnless { it == 0 },
            )
        }
        return null
    }
    // SY <--
    fun getTrackingImpl(): List<TrackImpl> {
        return tracking.map {
            it.getTrackingImpl()
@@ -69,22 +109,37 @@ data class BackupManga(
    }
    companion object {
-        fun copyFrom(manga: Manga): BackupManga {
+        fun copyFrom(manga: Manga /* SY --> */, customMangaManager: CustomMangaManager?/* SY <-- */): BackupManga {
            return BackupManga(
                url = manga.url,
-                title = manga.title,
+                // SY -->
-                artist = manga.artist,
+                title = manga.originalTitle,
-                author = manga.author,
+                artist = manga.originalArtist,
-                description = manga.description,
+                author = manga.originalAuthor,
-                genre = manga.getGenres() ?: emptyList(),
+                description = manga.originalDescription,
-                status = manga.status,
+                genre = manga.getOriginalGenres() ?: emptyList(),
                status = manga.originalStatus,
                // SY <--
                thumbnailUrl = manga.thumbnail_url,
                favorite = manga.favorite,
                source = manga.source,
                dateAdded = manga.date_added,
-                viewer = manga.viewer,
+                viewer = manga.readingModeType,
-                chapterFlags = manga.chapter_flags
+                viewer_flags = manga.viewer_flags,
-            )
+                chapterFlags = manga.chapter_flags,
                filtered_scanlators = manga.filtered_scanlators,
                // SY -->
            ).also { backupManga ->
                customMangaManager?.getManga(manga)?.let {
                    backupManga.customTitle = it.title
                    backupManga.customArtist = it.artist
                    backupManga.customAuthor = it.author
                    backupManga.customDescription = it.description
                    backupManga.customGenre = it.getGenres()
                    backupManga.customStatus = it.status
                }
            }
            // SY <--
        }
    }
 }
@@ -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,
            )
        }
    }
@@ -25,7 +25,6 @@ data class BackupTracking(
    @ProtoNumber(10) var startedReadingDate: Long = 0,
    // finishedReadingDate is called endReadTime in 1.x
    @ProtoNumber(11) var finishedReadingDate: Long = 0,
 ) {
    fun getTrackingImpl(): TrackImpl {
        return TrackImpl().apply {
@@ -33,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
            last_chapter_read = this@BackupTracking.lastChapterRead.toInt()
            total_chapters = this@BackupTracking.totalChapters
            score = this@BackupTracking.score
            status = this@BackupTracking.status
@@ -52,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,
                lastChapterRead = track.last_chapter_read.toFloat(),
                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,102 +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.github.salomonbrys.kotson.set
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonArray
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
 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.legacy.models.Backup.Companion.CURRENT_VERSION
 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_HISTORY
 import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_HISTORY_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.legacy.models.Backup
 import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.CATEGORIES
 import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.CHAPTERS
 import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.CURRENT_VERSION
 import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.EXTENSIONS
 import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.HISTORY
 import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.MANGA
 import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.MERGEDMANGAREFERENCES
 import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.SAVEDSEARCHES
 import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.TRACK
 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.CategoryImplTypeSerializer
-import eu.kanade.tachiyomi.data.backup.legacy.serializer.ChapterTypeAdapter
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.CategoryTypeSerializer
-import eu.kanade.tachiyomi.data.backup.legacy.serializer.HistoryTypeAdapter
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.ChapterImplTypeSerializer
-import eu.kanade.tachiyomi.data.backup.legacy.serializer.MangaTypeAdapter
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.ChapterTypeSerializer
-import eu.kanade.tachiyomi.data.backup.legacy.serializer.MergedMangaReferenceTypeAdapter
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.HistoryTypeSerializer
-import eu.kanade.tachiyomi.data.backup.legacy.serializer.TrackTypeAdapter
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.MangaImplTypeSerializer
-import eu.kanade.tachiyomi.data.database.models.CategoryImpl
+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.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.source.LocalSource
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.model.toSManga
 import eu.kanade.tachiyomi.source.online.all.MergedSource
 import eu.kanade.tachiyomi.util.lang.asObservable
 import exh.MERGED_SOURCE_ID
 import exh.eh.EHentaiThrottleManager
 import exh.merged.sql.models.MergedMangaReference
-import exh.savedsearches.JsonSavedSearch
+import exh.savedsearches.models.SavedSearch
-import kotlinx.coroutines.flow.onEach
+import exh.source.MERGED_SOURCE_ID
-import kotlinx.coroutines.runBlocking
+import exh.util.nullIfBlank
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import rx.Observable
+import kotlinx.serialization.json.JsonObject
-import timber.log.Timber
+import kotlinx.serialization.json.contentOrNull
-import uy.kohesive.injekt.Injekt
+import kotlinx.serialization.json.jsonArray
-import uy.kohesive.injekt.api.get
+import kotlinx.serialization.json.jsonPrimitive
-import java.lang.RuntimeException
+import kotlinx.serialization.modules.SerializersModule
 import kotlinx.serialization.modules.contextual
 import kotlin.math.max
 class LegacyBackupManager(context: Context, version: Int = CURRENT_VERSION) : AbstractBackupManager(context) {
-    var parserVersion: Int = version
+    val parser: Json = when (version) {
-        private set
+        2 -> Json {
            // Forks may have added items to backup
            ignoreUnknownKeys = true
-    var parser: Gson = initParser()
+            // Register custom serializers
-
+            serializersModule = SerializersModule {
-    /**
+                contextual(MangaTypeSerializer)
-     * Set version of parser
+                contextual(MangaImplTypeSerializer)
-     *
+                contextual(ChapterTypeSerializer)
-     * @param version version of parser
+                contextual(ChapterImplTypeSerializer)
-     */
+                contextual(CategoryTypeSerializer)
-    internal fun setVersion(version: Int) {
+                contextual(CategoryImplTypeSerializer)
-        this.parserVersion = version
+                contextual(TrackTypeSerializer)
-        parser = initParser()
+                contextual(TrackImplTypeSerializer)
-    }
+                contextual(HistoryTypeSerializer)
    private fun initParser(): Gson = when (parserVersion) {
        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())
+                contextual(MergedMangaTypeSerializer)
                // SY <--
-                .create()
+            }
        }
        else -> throw Exception("Unknown backup version")
    }
@@ -105,182 +72,10 @@ 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): String? {
+    override fun createBackup(uri: Uri, flags: Int, isAutoBackup: Boolean) =
-        // Create root object
+        throw IllegalStateException("Legacy backup creation is not supported")
        val root = JsonObject()
        // Create manga array
        val mangaEntries = JsonArray()
        // Create category array
        val categoryEntries = JsonArray()
        // Create extension ID/name mapping
        val extensionEntries = JsonArray()
        // Merged Manga References
        val mergedMangaReferenceEntries = JsonArray()
        // Add value's to root
        root[Backup.VERSION] = CURRENT_VERSION
        root[Backup.MANGAS] = mangaEntries
        root[CATEGORIES] = categoryEntries
        root[EXTENSIONS] = extensionEntries
        // SY -->
        root[MERGEDMANGAREFERENCES] = mergedMangaReferenceEntries
        // SY <--
        databaseHelper.inTransaction {
            val mangas = getFavoriteManga()/* SY --> */.filterNot { it.source == MERGED_SOURCE_ID } + getMergedManga().filterNot { it.source == MERGED_SOURCE_ID } /* SY <-- */
            val extensions: MutableSet<String> = mutableSetOf()
            // Backup library manga and its dependencies
            mangas.forEach { manga ->
                mangaEntries.add(backupMangaObject(manga, flags))
                // Maintain set of extensions/sources used (excludes local source)
                if (manga.source != LocalSource.ID) {
                    sourceManager.get(manga.source)?.let {
                        extensions.add("${manga.source}:${it.name}")
                    }
                }
            }
            // Backup categories
            if ((flags and BACKUP_CATEGORY_MASK) == BACKUP_CATEGORY) {
                backupCategories(categoryEntries)
            }
            // Backup extension ID/name mapping
            backupExtensionInfo(extensionEntries, extensions)
            // SY -->
            root[SAVEDSEARCHES] =
                Injekt.get<PreferencesHelper>().savedSearches().get().joinToString(separator = "***")
            backupMergedMangaReferences(mergedMangaReferenceEntries)
            // SY <--
        }
        try {
            val file: UniFile = (
                if (isJob) {
                    // Get dir of file and create
                    var dir = UniFile.fromUri(context, uri)
                    dir = dir.createDirectory("automatic")
                    // Delete older backups
                    val numberOfBackups = numberOfBackups()
                    val backupRegex = Regex("""tachiyomi_\d+-\d+-\d+_\d+-\d+.json""")
                    dir.listFiles { _, filename -> backupRegex.matches(filename) }
                        .orEmpty()
                        .sortedByDescending { it.name }
                        .drop(numberOfBackups - 1)
                        .forEach { it.delete() }
                    // Create new file to place backup
                    dir.createFile(Backup.getDefaultFilename())
                } else {
                    UniFile.fromUri(context, uri)
                }
                )
                ?: throw Exception("Couldn't create backup file")
            file.openOutputStream().bufferedWriter().use {
                parser.toJson(root, it)
            }
            return file.uri.toString()
        } catch (e: Exception) {
            Timber.e(e)
            throw e
        }
    }
    private fun backupExtensionInfo(root: JsonArray, extensions: Set<String>) {
        extensions.sorted().forEach {
            root.add(it)
        }
    }
    // SY -->
    private fun backupMergedMangaReferences(root: JsonArray) {
        val mergedMangaReferences = databaseHelper.getMergedMangaReferences().executeAsBlocking()
        mergedMangaReferences.forEach { root.add(parser.toJsonTree(it)) }
    }
    // SY <--
    /**
     * Backup the categories of library
     *
     * @param root root of categories json
     */
    internal fun backupCategories(root: JsonArray) {
        val categories = databaseHelper.getCategories().executeAsBlocking()
        categories.forEach { root.add(parser.toJsonTree(it)) }
    }
    /**
     * Convert a manga to Json
     *
     * @param manga manga that gets converted
     * @return [JsonElement] containing manga information
     */
    internal fun backupMangaObject(manga: Manga, options: Int): JsonElement {
        // Entry for this manga
        val entry = JsonObject()
        // Backup manga fields
        entry[MANGA] = parser.toJsonTree(manga)
        // Check if user wants chapter information in backup
        if (options and BACKUP_CHAPTER_MASK == BACKUP_CHAPTER) {
            // Backup all the chapters
            val chapters = databaseHelper.getChapters(manga).executeAsBlocking()
            if (chapters.isNotEmpty()) {
                val chaptersJson = parser.toJsonTree(chapters)
                if (chaptersJson.asJsonArray.size() > 0) {
                    entry[CHAPTERS] = chaptersJson
                }
            }
        }
        // Check if user wants category information in backup
        if (options and BACKUP_CATEGORY_MASK == BACKUP_CATEGORY) {
            // Backup categories for this manga
            val categoriesForManga = databaseHelper.getCategoriesForManga(manga).executeAsBlocking()
            if (categoriesForManga.isNotEmpty()) {
                val categoriesNames = categoriesForManga.map { it.name }
                entry[CATEGORIES] = parser.toJsonTree(categoriesNames)
            }
        }
        // Check if user wants track information in backup
        if (options and BACKUP_TRACK_MASK == BACKUP_TRACK) {
            val tracks = databaseHelper.getTracks(manga).executeAsBlocking()
            if (tracks.isNotEmpty()) {
                entry[TRACK] = parser.toJsonTree(tracks)
            }
        }
        // Check if user wants history information in backup
        if (options and BACKUP_HISTORY_MASK == BACKUP_HISTORY) {
            val historyForManga = databaseHelper.getHistoryByMangaId(manga.id!!).executeAsBlocking()
            if (historyForManga.isNotEmpty()) {
                val historyData = historyForManga.mapNotNull { history ->
                    val url = databaseHelper.getChapter(history.chapter_id).executeAsBlocking()?.url
                    url?.let { DHistory(url, history.last_read) }
                }
                val historyJson = parser.toJsonTree(historyData)
                if (historyJson.asJsonArray.size() > 0) {
                    entry[HISTORY] = historyJson
                }
            }
        }
        return entry
    }
    fun restoreMangaNoFetch(manga: Manga, dbManga: Manga) {
        manga.id = dbManga.id
@@ -290,21 +85,20 @@ class LegacyBackupManager(context: Context, version: Int = CURRENT_VERSION) : Ab
    }
    /**
-     * [Observable] that fetches manga information
+     * Fetches manga information
     *
     * @param source source of manga
     * @param manga manga that needs updating
-     * @return [Observable] that contains manga
+     * @return Updated manga.
     */
-    fun restoreMangaFetchObservable(source: Source, manga: Manga): Observable<Manga> {
+    suspend fun fetchManga(source: Source, manga: Manga): Manga {
-        return source.fetchMangaDetails(manga)
+        val networkManga = source.getMangaDetails(manga.toMangaInfo())
-            .map { networkManga ->
+        return manga.also {
-                manga.copyFrom(networkManga)
+            it.copyFrom(networkManga.toSManga())
-                manga.favorite = true
+            it.favorite = true
-                manga.initialized = true
+            it.initialized = true
-                manga.id = insertManga(manga)
+            it.id = insertManga(manga)
-                manga
+        }
            }
    }
    /**
@@ -314,30 +108,28 @@ class LegacyBackupManager(context: Context, version: Int = CURRENT_VERSION) : Ab
     * @param manga manga that needs updating
     * @return [Observable] that contains manga
     */
-    override fun restoreChapterFetchObservable(source: Source, manga: Manga, chapters: List<Chapter>, throttleManager: EHentaiThrottleManager): Observable<Pair<List<Chapter>, List<Chapter>>> {
+    override suspend fun restoreChapters(source: Source, manga: Manga, chapters: List<Chapter>, throttleManager: EHentaiThrottleManager): Pair<List<Chapter>, List<Chapter>> {
        // SY -->
        return if (source is MergedSource) {
-            val syncedChapters = runBlocking { source.fetchChaptersAndSync(manga, false) }
+            val syncedChapters = source.fetchChaptersAndSync(manga, false)
-            syncedChapters.onEach { pair ->
+            syncedChapters.first.onEach {
-                if (pair.first.isNotEmpty()) {
+                it.manga_id = manga.id
-                    chapters.forEach { it.manga_id = manga.id }
+            }
-                    updateChapters(chapters)
+            updateChapters(syncedChapters.first)
-                }
+            syncedChapters
            }.asObservable()
        } else {
-            super.restoreChapterFetchObservable(source, manga, chapters, throttleManager)
+            super.restoreChapters(source, manga, chapters, throttleManager)
        }
    }
    /**
     * 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 ->
@@ -371,7 +163,7 @@ class LegacyBackupManager(context: Context, version: Int = CURRENT_VERSION) : Ab
     */
    internal fun restoreCategoriesForManga(manga: Manga, categories: List<String>) {
        val dbCategories = databaseHelper.getCategories().executeAsBlocking()
-        val mangaCategoriesToUpdate = mutableListOf<MangaCategory>()
+        val mangaCategoriesToUpdate = ArrayList<MangaCategory>(categories.size)
        for (backupCategoryStr in categories) {
            for (dbCategory in dbCategories) {
                if (backupCategoryStr == dbCategory.name) {
@@ -395,7 +187,7 @@ class LegacyBackupManager(context: Context, version: Int = CURRENT_VERSION) : Ab
     */
    internal fun restoreHistoryForManga(history: List<DHistory>) {
        // List containing history to be updated
-        val historyToBeUpdated = mutableListOf<History>()
+        val historyToBeUpdated = ArrayList<History>(history.size)
        for ((url, lastRead) in history) {
            val dbHistory = databaseHelper.getHistoryByChapterUrl(url).executeAsBlocking()
            // Check if history already in database and update
@@ -424,14 +216,14 @@ class LegacyBackupManager(context: Context, version: Int = CURRENT_VERSION) : Ab
     * @param tracks the track list to restore.
     */
    internal fun restoreTrackForManga(manga: Manga, tracks: List<Track>) {
        // Fix foreign keys with the current manga id
        tracks.map { it.manga_id = manga.id!! }
        // Get tracks from database
        val dbTracks = databaseHelper.getTracks(manga).executeAsBlocking()
-        val trackToUpdate = mutableListOf<Track>()
+        val trackToUpdate = ArrayList<Track>(tracks.size)
        tracks.forEach { track ->
            // Fix foreign keys with the current manga id
            track.manga_id = manga.id!!
            val service = trackManager.getService(track.sync_id)
            if (service != null && service.isLogged) {
                var isInDatabase = false
@@ -486,68 +278,50 @@ class LegacyBackupManager(context: Context, version: Int = CURRENT_VERSION) : Ab
                chapter.copyFrom(dbChapter)
                break
            }
        }
        // Filter the chapters that couldn't be found.
        chapters.filter { it.id != null }
        chapters.map { it.manga_id = manga.id }
-        updateChapters(chapters)
+            chapter.manga_id = manga.id
        }
        // Filter the chapters that couldn't be found.
        updateChapters(chapters.filter { it.id != null })
        return true
    }
    // SY -->
-    internal fun restoreSavedSearches(jsonSavedSearches: JsonElement) {
+    internal fun restoreSavedSearches(jsonSavedSearches: String) {
-        val backupSavedSearches = jsonSavedSearches.asString.split("***").toSet()
+        val backupSavedSearches = jsonSavedSearches.split("***").toSet()
        val currentSavedSearches = databaseHelper.getSavedSearches().executeAsBlocking()
        val newSavedSearches = backupSavedSearches.mapNotNull {
-            try {
+            runCatching {
-                val id = it.substringBefore(':').toLong()
+                val content = parser.decodeFromString<JsonObject>(it.substringAfter(':'))
-                val content = Json.decodeFromString<JsonSavedSearch>(it.substringAfter(':'))
+                SavedSearch(
-                id to content
+                    id = null,
-            } catch (t: RuntimeException) {
+                    source = it.substringBefore(':').toLongOrNull() ?: return@mapNotNull null,
-                // Load failed
+                    content["name"]!!.jsonPrimitive.content,
-                Timber.e(t, "Failed to load saved search!")
+                    content["query"]!!.jsonPrimitive.contentOrNull?.nullIfBlank(),
-                t.printStackTrace()
+                    Json.encodeToString(content["filters"]!!.jsonArray),
-                null
+                )
-            }
+            }.getOrNull()
-        }.toMutableList()
+        }.filter { backupSavedSearch ->
            currentSavedSearches.none { it.name == backupSavedSearch.name && it.source == backupSavedSearch.source }
        }.ifEmpty { null }
-        val currentSources = newSavedSearches.map { it.first }.toSet()
+        if (newSavedSearches != null) {
-
+            databaseHelper.insertSavedSearches(newSavedSearches)
        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
        }
        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,88 +2,87 @@ 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 rx.Observable
+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) {
-    override fun performRestore(uri: Uri): Boolean {
+    override suspend fun performRestore(uri: Uri): Boolean {
        // 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
+        // Decode the json object to a Backup object
-        restoreAmount = mangasJson.size() + 3 // +1 for categories, +1 for saved searches, +1 for merged manga references
+        val backup = backupManager.parser.decodeFromJsonElement<Backup>(backupObject)
-        // Restore categories
+        restoreAmount = backup.mangas.size + 3 // +1 for categories, +1 for saved searches, +1 for merged manga references
        json.get(Backup.CATEGORIES)?.let { restoreCategories(it) }
        // 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) {
+    private fun restoreSavedSearches(savedSearches: String) {
-        backupManager.restoreSavedSearches(savedSearchesJson)
+        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
@@ -91,43 +90,37 @@ class LegacyBackupRestore(context: Context, notifier: BackupNotifier) : Abstract
    }
    // SY <--
-    private fun restoreManga(mangaJson: JsonObject) {
+    private fun restoreCategories(categoriesJson: List<Category>) {
-        /* SY --> */ var /* SY <-- */ manga = backupManager.parser.fromJson<MangaImpl>(
+        db.inTransaction {
-            mangaJson.get(
+            backupManager.restoreCategories(categoriesJson)
-                Backup.MANGA
+        }
-            )
+
-        )
+        restoreProgress += 1
-        val chapters = backupManager.parser.fromJson<List<ChapterImpl>>(
+        showRestoreProgress(restoreProgress, restoreAmount, context.getString(R.string.categories))
-            mangaJson.get(Backup.CHAPTERS)
+    }
-                ?: JsonArray()
+
-        )
+    private suspend fun restoreManga(mangaJson: MangaObject) {
-        val categories = backupManager.parser.fromJson<List<String>>(
+        val manga = mangaJson.manga
-            mangaJson.get(Backup.CATEGORIES)
+        val chapters = mangaJson.chapters ?: emptyList()
-                ?: JsonArray()
+        val categories = mangaJson.categories ?: emptyList()
-        )
+        val history = mangaJson.history ?: emptyList()
-        val history = backupManager.parser.fromJson<List<DHistory>>(
+        val tracks = mangaJson.track ?: emptyList()
            mangaJson.get(Backup.HISTORY)
                ?: JsonArray()
        )
        val tracks = backupManager.parser.fromJson<List<TrackImpl>>(
            mangaJson.get(Backup.TRACK)
                ?: JsonArray()
        )
        // EXH -->
-        manga = EXHMigrations.migrateBackupEntry(manga)
+        EXHMigrations.migrateBackupEntry(manga)
        // <-- EXH
        val source = backupManager.sourceManager.get(manga.source)
        val sourceName = sourceMapping[manga.source] ?: manga.source.toString()
        try {
            val source = backupManager.sourceManager.get(manga.source)
            if (source != null) {
                restoreMangaData(manga, source, chapters, categories, history, tracks)
            } else {
-                val sourceName = sourceMapping[manga.source] ?: manga.source.toString()
+                errors.add(Date() to "${manga.title} [$sourceName]: ${context.getString(R.string.source_not_found_name, sourceName)}")
                errors.add(Date() to "${manga.title} - ${context.getString(R.string.source_not_found_name, sourceName)}")
            }
        } catch (e: Exception) {
-            errors.add(Date() to "${manga.title} - ${e.message}")
+            errors.add(Date() to "${manga.title} [$sourceName]: ${e.message}")
        }
        restoreProgress += 1
@@ -144,13 +137,13 @@ class LegacyBackupRestore(context: Context, notifier: BackupNotifier) : Abstract
     * @param history history data from json
     * @param tracks tracking data from json
     */
-    private fun restoreMangaData(
+    private suspend fun restoreMangaData(
        manga: Manga,
        source: Source,
        chapters: List<Chapter>,
        categories: List<String>,
        history: List<DHistory>,
-        tracks: List<Track>
+        tracks: List<Track>,
    ) {
        val dbManga = backupManager.getMangaFromDatabase(manga)
@@ -168,64 +161,49 @@ class LegacyBackupRestore(context: Context, notifier: BackupNotifier) : Abstract
    }
    /**
-     * [Observable] that fetches manga information
+     * Fetches manga information.
     *
     * @param manga manga that needs updating
     * @param chapters chapters of manga that needs updating
     * @param categories categories that need updating
     */
-    private fun restoreMangaFetch(
+    private suspend fun restoreMangaFetch(
        source: Source,
        manga: Manga,
        chapters: List<Chapter>,
        categories: List<String>,
        history: List<DHistory>,
-        tracks: List<Track>
+        tracks: List<Track>,
    ) {
-        backupManager.restoreMangaFetchObservable(source, manga)
+        try {
-            .onErrorReturn {
+            val fetchedManga = backupManager.fetchManga(source, manga)
-                errors.add(Date() to "${manga.title} - ${it.message}")
+            fetchedManga.id ?: return
-                manga
+
-            }
+            updateChapters(source, fetchedManga, chapters)
-            .filter { it.id != null }
+
-            .flatMap {
+            restoreExtraForManga(fetchedManga, categories, history, tracks)
-                chapterFetchObservable(source, it, chapters)
+
-                    // Convert to the manga that contains new chapters.
+            updateTracking(fetchedManga, tracks)
-                    .map { manga }
+        } catch (e: Exception) {
-            }
+            errors.add(Date() to "${manga.title} - ${e.message}")
-            .doOnNext {
+        }
                restoreExtraForManga(it, categories, history, tracks)
            }
            .flatMap {
                trackingFetchObservable(it, tracks)
            }
            .subscribe()
    }
-    private fun restoreMangaNoFetch(
+    private suspend fun restoreMangaNoFetch(
        source: Source,
        backupManga: Manga,
        chapters: List<Chapter>,
        categories: List<String>,
        history: List<DHistory>,
-        tracks: List<Track>
+        tracks: List<Track>,
    ) {
-        Observable.just(backupManga)
+        if (!backupManager.restoreChaptersForManga(backupManga, chapters)) {
-            .flatMap { manga ->
+            updateChapters(source, backupManga, chapters)
-                if (!backupManager.restoreChaptersForManga(manga, chapters)) {
+        }
-                    chapterFetchObservable(source, manga, chapters)
+
-                        .map { manga }
+        restoreExtraForManga(backupManga, categories, history, tracks)
-                } else {
+
-                    Observable.just(manga)
+        updateTracking(backupManga, tracks)
                }
            }
            .doOnNext {
                restoreExtraForManga(it, categories, history, tracks)
            }
            .flatMap { manga ->
                trackingFetchObservable(manga, tracks)
            }
            .subscribe()
    }
    private fun restoreExtraForManga(manga: Manga, categories: List<String>, history: List<DHistory>, tracks: List<Track>) {
@@ -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,50 +17,50 @@ 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 backupManager = LegacyBackupManager(context)
        val json = JsonParser.parseReader(reader).asJsonObject
-        val version = json.get(Backup.VERSION)
+        val backup = try {
-        val mangasJson = json.get(Backup.MANGAS)
+            backupManager.parser.decodeFromStream<Backup>(
-        if (version == null || mangasJson == null) {
+                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 (backup.mangas.isEmpty()) {
        if (mangas.size() == 0) {
            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
+        val trackers = backup.mangas
-            .filter { it.asJsonObject.has("track") }
+            .filterNot { it.track.isNullOrEmpty() }
-            .flatMap { it.asJsonObject["track"].asJsonArray }
+            .flatMap { it.track ?: emptyList() }
-            .map { it.asJsonObject["s"].asInt }
+            .map { it.sync_id }
            .distinct()
        val missingTrackers = trackers
            .mapNotNull { trackManager.getService(it) }
            .filter { !it.isLogged }
-            .map { it.name }
+            .map { context.getString(it.nameRes()) }
            .sorted()
        return Results(missingSources, missingTrackers)
    }
    companion object {
-        fun getSourceMapping(json: JsonObject): Map<Long, String> {
+        fun getSourceMapping(extensionsMapping: List<String>): Map<Long, String> {
-            val extensionsMapping = json.get(Backup.EXTENSIONS) ?: return emptyMap()
+            return extensionsMapping.associate {
-
+                val items = it.split(":")
-            return extensionsMapping.asJsonArray
+                items[0].toLong() to items[1]
-                .map {
+            }
                    val items = it.asString.split(":")
                    items[0].toLong() to items[1]
                }
                .toMap()
        }
    }
 }
@@ -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
-/**
+@Serializable
- * Json values
+data class Backup(
- */
+    val version: Int? = null,
-object Backup {
+    var mangas: MutableList<MangaObject> = mutableListOf(),
-    const val CURRENT_VERSION = 2
+    var categories: List<@Contextual Category>? = null,
-    const val MANGA = "manga"
+    var extensions: List<String>? = null,
-    const val MANGAS = "mangas"
+    // SY Specific values
-    const val TRACK = "track"
+    @SerialName("mergedmangareferences")
-    const val CHAPTERS = "chapters"
+    var mergedMangaReferences: List<@Contextual MergedMangaReference>? = null,
-    const val CATEGORIES = "categories"
+    var savedSearches: String? = null,
-    const val EXTENSIONS = "extensions"
+) {
-    const val HISTORY = "history"
+    companion object {
-    const val VERSION = "version"
+        const val CURRENT_VERSION = 2
-    // SY -->
+        fun getDefaultFilename(): String {
-    const val SAVEDSEARCHES = "savedsearches"
+            val date = SimpleDateFormat("yyyy-MM-dd_HH-mm", Locale.getDefault()).format(Date())
-    const val MERGEDMANGAREFERENCES = "mergedmangareferences"
+            return "tachiyomi_$date.json"
-    // SY <--
+        }
    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)
                value(it.chapter_flags)
                endArray()
            }
            read {
                beginArray()
                val manga = MangaImpl()
                manga.url = nextString()
                manga.title = nextString()
                manga.source = nextLong()
                manga.viewer = 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>()
@@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.data.cache
 import android.content.Context
 import android.text.format.Formatter
 import com.github.salomonbrys.kotson.fromJson
 import com.google.gson.Gson
 import com.jakewharton.disklrucache.DiskLruCache
 import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
@@ -15,10 +13,12 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import okhttp3.Response
 import okio.buffer
 import okio.sink
 import rx.Observable
 import uy.kohesive.injekt.injectLazy
 import java.io.File
 import java.io.IOException
@@ -48,14 +48,12 @@ class ChapterCache(private val context: Context) {
    private val scope = CoroutineScope(Job() + Dispatchers.Main)
    /** Google Json class used for parsing JSON files.  */
-    private val gson: Gson by injectLazy()
+    private val json: Json by injectLazy()
    // --> EH
    private val prefs: PreferencesHelper by injectLazy()
    // <-- EH
    /** Cache class used for cache management.  */
    // --> EH
    private var diskCache = setupDiskCache(prefs.cacheSize().get().toLong())
    init {
@@ -73,7 +71,7 @@ class ChapterCache(private val context: Context) {
    /**
     * Returns directory of cache.
     */
-    val cacheDir: File
+    private val cacheDir: File
        get() = diskCache.directory
    /**
@@ -95,48 +93,24 @@ 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
    /**
     * Remove file from cache.
     *
     * @param file name of file "md5.0".
     * @return status of deletion for the file.
     */
    fun removeFileFromCache(file: String): Boolean {
        // Make sure we don't delete the journal file (keeps track of cache).
        if (file == "journal" || file.startsWith("journal.")) {
            return false
        }
        return try {
            // Remove the extension from the file to get the key of the cache
            val key = file.substringBeforeLast(".")
            // Remove file from cache.
            diskCache.remove(key)
        } catch (e: Exception) {
            false
        }
    }
    /**
     * Get page list from cache.
     *
     * @param chapter the chapter.
-     * @return an observable of the list of pages.
+     * @return the list of pages.
     */
-    fun getPageListFromCache(chapter: Chapter): Observable<List<Page>> {
+    fun getPageListFromCache(chapter: Chapter): List<Page> {
-        return Observable.fromCallable {
+        // Get the key for the chapter.
-            // Get the key for the chapter.
+        val key = DiskUtil.hashKeyForDisk(getKey(chapter))
            val key = DiskUtil.hashKeyForDisk(getKey(chapter))
-            // Convert JSON string to list of objects. Throws an exception if snapshot is null
+        // Convert JSON string to list of objects. Throws an exception if snapshot is null
-            diskCache.get(key).use {
+        return diskCache.get(key).use {
-                gson.fromJson<List<Page>>(it.getString(0))
+            json.decodeFromString(it.getString(0))
            }
        }
    }
@@ -148,7 +122,7 @@ class ChapterCache(private val context: Context) {
     */
    fun putPageListToCache(chapter: Chapter, pages: List<Page>) {
        // Convert list of pages to json string.
-        val cachedValue = gson.toJson(pages)
+        val cachedValue = json.encodeToString(pages)
        // Initialize the editor (edits the values for an entry).
        var editor: DiskLruCache.Editor? = null
@@ -228,6 +202,38 @@ class ChapterCache(private val context: Context) {
        }
    }
    fun clear(): Int {
        var deletedFiles = 0
        cacheDir.listFiles()?.forEach {
            if (removeFileFromCache(it.name)) {
                deletedFiles++
            }
        }
        return deletedFiles
    }
    /**
     * Remove file from cache.
     *
     * @param file name of file "md5.0".
     * @return status of deletion for the file.
     */
    private fun removeFileFromCache(file: String): Boolean {
        // Make sure we don't delete the journal file (keeps track of cache).
        if (file == "journal" || file.startsWith("journal.")) {
            return false
        }
        return try {
            // Remove the extension from the file to get the key of the cache
            val key = file.substringBeforeLast(".")
            // Remove file from cache.
            diskCache.remove(key)
        } catch (e: Exception) {
            false
        }
    }
    private fun getKey(chapter: Chapter): String {
        return "${chapter.manga_id}${chapter.url}"
    }
@@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi.data.cache
 import android.content.Context
 import coil.imageLoader
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.util.storage.DiskUtil
 import java.io.File
@@ -99,6 +100,13 @@ class CoverCache(private val context: Context) {
        }
    }
    /**
     * Clear coil's memory cache.
     */
    fun clearMemoryCache() {
        context.imageLoader.memoryCache?.clear()
    }
    private fun getCacheDir(dir: String): File {
        return context.getExternalFilesDir(dir)
            ?: File(context.filesDir, dir).also { it.mkdirs() }
@@ -0,0 +1,294 @@
 package eu.kanade.tachiyomi.data.coil
 import coil.ImageLoader
 import coil.decode.DataSource
 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.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.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.internal.closeQuietly
 import okio.Path.Companion.toOkioPath
 import okio.Source
 import okio.buffer
 import okio.sink
 import uy.kohesive.injekt.injectLazy
 import java.io.File
 import java.net.HttpURLConnection
 /**
 * 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(
    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 {
    // For non-custom cover
    private val diskCacheKey: String? by lazy { MangaCoverKeyer().key(manga, options) }
    private lateinit var url: String
    override suspend fun fetch(): FetchResult {
        // Use custom cover if exists
        val useCustomCover = options.parameters.value(USE_CUSTOM_COVER) ?: true
        val customCoverFile = coverCache.getCustomCoverFile(manga)
        if (useCustomCover && customCoverFile.exists()) {
            return fileLoader(customCoverFile)
        }
        // 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 fun fileLoader(file: File): FetchResult {
        return SourceResult(
            source = ImageSource(file = file.toOkioPath(), diskCacheKey = diskCacheKey),
            mimeType = "image/*",
            dataSource = DataSource.DISK,
        )
    }
    private suspend fun httpLoader(): FetchResult {
        // Only cache separately if it's a library item
        val 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", true) || cover.startsWith("Custom-", true) -> Type.URL
            cover.startsWith("/") || cover.startsWith("file://") -> Type.File
            else -> null
        }
    }
    private enum class Type {
        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"
        private val CACHE_CONTROL_FORCE_NETWORK_NO_CACHE = CacheControl.Builder().noCache().noStore().build()
        private val CACHE_CONTROL_NO_NETWORK_NO_CACHE = CacheControl.Builder().noCache().onlyIfCached().build()
    }
 }
@@ -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,9 +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.md.similar.sql.mappers.SimilarTypeMapping
+import exh.favorites.sql.mappers.FavoriteEntryTypeMapping
-import exh.md.similar.sql.models.MangaSimilar
+import exh.favorites.sql.models.FavoriteEntry
-import exh.md.similar.sql.queries.SimilarQueries
+import exh.favorites.sql.queries.FavoriteEntryQueries
 import exh.merged.sql.mappers.MergedMangaTypeMapping
 import exh.merged.sql.models.MergedMangaReference
 import exh.merged.sql.queries.MergedQueries
@@ -36,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, SimilarQueries /* 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)
@@ -62,7 +82,9 @@ open class DatabaseHelper(context: Context) :
        .addTypeMapping(SearchTag::class.java, SearchTagTypeMapping())
        .addTypeMapping(SearchTitle::class.java, SearchTitleTypeMapping())
        .addTypeMapping(MergedMangaReference::class.java, MergedMangaTypeMapping())
-        .addTypeMapping(MangaSimilar::class.java, SimilarTypeMapping())
+        .addTypeMapping(FavoriteEntry::class.java, FavoriteEntryTypeMapping())
        .addTypeMapping(SavedSearch::class.java, SavedSearchTypeMapping())
        .addTypeMapping(FeedSavedSearch::class.java, FeedSavedSearchTypeMapping())
        // SY <--
        .build()
@@ -8,11 +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.md.similar.sql.tables.SimilarTable
+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) {
@@ -25,7 +27,7 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
        /**
         * Version of the database.
         */
-        const val DATABASE_VERSION = /* SY --> */ 5 /* SY <-- */
+        const val DATABASE_VERSION = /* SY --> */ 13 // SY <--
    }
    override fun onCreate(db: SupportSQLiteDatabase) = with(db) {
@@ -40,7 +42,9 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
        execSQL(SearchTagTable.createTableQuery)
        execSQL(SearchTitleTable.createTableQuery)
        execSQL(MergedTable.createTableQuery)
-        execSQL(SimilarTable.createTableQuery)
+        execSQL(FavoriteEntryTable.createTableQuery)
        execSQL(SavedSearchTable.createTableQuery)
        execSQL(FeedSavedSearchTable.createTableQuery)
        // SY <--
        // DB indexes
@@ -57,7 +61,7 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
        execSQL(SearchTitleTable.createMangaIdIndexQuery)
        execSQL(SearchTitleTable.createTitleIndexQuery)
        execSQL(MergedTable.createIndexQuery)
-        execSQL(SimilarTable.createMangaIdIndexQuery)
+        execSQL(FeedSavedSearchTable.createSavedSearchIdIndexQuery)
        // SY <--
    }
@@ -74,9 +78,38 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
            db.execSQL(MergedTable.createTableQuery)
            db.execSQL(MergedTable.createIndexQuery)
        }
-        if (oldVersion < 5) {
+        /*if (oldVersion < 5) {
            db.execSQL(SimilarTable.createTableQuery)
            db.execSQL(SimilarTable.createMangaIdIndexQuery)
        }*/
        if (oldVersion < 6) {
            db.execSQL(MangaTable.addFilteredScanlators)
        }
        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)
        }
    }
@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.data.database.mappers
 import android.content.ContentValues
 import android.database.Cursor
 import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
 import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
 import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
@@ -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>() {
@@ -36,28 +36,26 @@ class CategoryPutResolver : DefaultPutResolver<Category>() {
        .whereArgs(obj.id)
        .build()
-    override fun mapToContentValues(obj: Category) = ContentValues(4).apply {
+    override fun mapToContentValues(obj: Category) =
-        put(COL_ID, obj.id)
+        contentValuesOf(
-        put(COL_NAME, obj.name)
+            COL_ID to obj.id,
-        put(COL_ORDER, obj.order)
+            COL_NAME to obj.name,
-        put(COL_FLAGS, obj.flags)
+            COL_ORDER to obj.order,
-        // SY -->
+            COL_FLAGS to obj.flags,
-        val orderString = obj.mangaOrder.joinToString("/")
+            COL_MANGA_ORDER to obj.mangaOrder.joinToString("/"),
-        put(COL_MANGA_ORDER, orderString)
+        )
        // SY <--
    }
 }
 class CategoryGetResolver : DefaultGetResolver<Category>() {
    override fun mapFromCursor(cursor: Cursor): Category = CategoryImpl().apply {
-        id = cursor.getInt(cursor.getColumnIndex(COL_ID))
+        id = cursor.getInt(cursor.getColumnIndexOrThrow(COL_ID))
-        name = cursor.getString(cursor.getColumnIndex(COL_NAME))
+        name = cursor.getString(cursor.getColumnIndexOrThrow(COL_NAME))
-        order = cursor.getInt(cursor.getColumnIndex(COL_ORDER))
+        order = cursor.getInt(cursor.getColumnIndexOrThrow(COL_ORDER))
-        flags = cursor.getInt(cursor.getColumnIndex(COL_FLAGS))
+        flags = cursor.getInt(cursor.getColumnIndexOrThrow(COL_FLAGS))
        // 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 <--
    }
@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.data.database.mappers
 import android.content.ContentValues
 import android.database.Cursor
 import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
 import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
 import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
@@ -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>() {
@@ -43,37 +43,38 @@ class ChapterPutResolver : DefaultPutResolver<Chapter>() {
        .whereArgs(obj.id)
        .build()
-    override fun mapToContentValues(obj: Chapter) = ContentValues(11).apply {
+    override fun mapToContentValues(obj: Chapter) =
-        put(COL_ID, obj.id)
+        contentValuesOf(
-        put(COL_MANGA_ID, obj.manga_id)
+            COL_ID to obj.id,
-        put(COL_URL, obj.url)
+            COL_MANGA_ID to obj.manga_id,
-        put(COL_NAME, obj.name)
+            COL_URL to obj.url,
-        put(COL_READ, obj.read)
+            COL_NAME to obj.name,
-        put(COL_SCANLATOR, obj.scanlator)
+            COL_READ to obj.read,
-        put(COL_BOOKMARK, obj.bookmark)
+            COL_SCANLATOR to obj.scanlator,
-        put(COL_DATE_FETCH, obj.date_fetch)
+            COL_BOOKMARK to obj.bookmark,
-        put(COL_DATE_UPLOAD, obj.date_upload)
+            COL_DATE_FETCH to obj.date_fetch,
-        put(COL_LAST_PAGE_READ, obj.last_page_read)
+            COL_DATE_UPLOAD to obj.date_upload,
-        put(COL_CHAPTER_NUMBER, obj.chapter_number)
+            COL_LAST_PAGE_READ to obj.last_page_read,
-        put(COL_SOURCE_ORDER, obj.source_order)
+            COL_CHAPTER_NUMBER to obj.chapter_number,
-    }
+            COL_SOURCE_ORDER to obj.source_order,
        )
 }
 class ChapterGetResolver : DefaultGetResolver<Chapter>() {
    override fun mapFromCursor(cursor: Cursor): Chapter = ChapterImpl().apply {
-        id = cursor.getLong(cursor.getColumnIndex(COL_ID))
+        id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_ID))
-        manga_id = cursor.getLong(cursor.getColumnIndex(COL_MANGA_ID))
+        manga_id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_MANGA_ID))
-        url = cursor.getString(cursor.getColumnIndex(COL_URL))
+        url = cursor.getString(cursor.getColumnIndexOrThrow(COL_URL))
-        name = cursor.getString(cursor.getColumnIndex(COL_NAME))
+        name = cursor.getString(cursor.getColumnIndexOrThrow(COL_NAME))
-        scanlator = cursor.getString(cursor.getColumnIndex(COL_SCANLATOR))
+        scanlator = cursor.getString(cursor.getColumnIndexOrThrow(COL_SCANLATOR))
-        read = cursor.getInt(cursor.getColumnIndex(COL_READ)) == 1
+        read = cursor.getInt(cursor.getColumnIndexOrThrow(COL_READ)) == 1
-        bookmark = cursor.getInt(cursor.getColumnIndex(COL_BOOKMARK)) == 1
+        bookmark = cursor.getInt(cursor.getColumnIndexOrThrow(COL_BOOKMARK)) == 1
-        date_fetch = cursor.getLong(cursor.getColumnIndex(COL_DATE_FETCH))
+        date_fetch = cursor.getLong(cursor.getColumnIndexOrThrow(COL_DATE_FETCH))
-        date_upload = cursor.getLong(cursor.getColumnIndex(COL_DATE_UPLOAD))
+        date_upload = cursor.getLong(cursor.getColumnIndexOrThrow(COL_DATE_UPLOAD))
-        last_page_read = cursor.getInt(cursor.getColumnIndex(COL_LAST_PAGE_READ))
+        last_page_read = cursor.getInt(cursor.getColumnIndexOrThrow(COL_LAST_PAGE_READ))
-        chapter_number = cursor.getFloat(cursor.getColumnIndex(COL_CHAPTER_NUMBER))
+        chapter_number = cursor.getFloat(cursor.getColumnIndexOrThrow(COL_CHAPTER_NUMBER))
-        source_order = cursor.getInt(cursor.getColumnIndex(COL_SOURCE_ORDER))
+        source_order = cursor.getInt(cursor.getColumnIndexOrThrow(COL_SOURCE_ORDER))
    }
 }
@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.data.database.mappers
 import android.content.ContentValues
 import android.database.Cursor
 import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
 import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
 import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
@@ -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>() {
@@ -35,21 +35,22 @@ open class HistoryPutResolver : DefaultPutResolver<History>() {
        .whereArgs(obj.id)
        .build()
-    override fun mapToContentValues(obj: History) = ContentValues(4).apply {
+    override fun mapToContentValues(obj: History) =
-        put(COL_ID, obj.id)
+        contentValuesOf(
-        put(COL_CHAPTER_ID, obj.chapter_id)
+            COL_ID to obj.id,
-        put(COL_LAST_READ, obj.last_read)
+            COL_CHAPTER_ID to obj.chapter_id,
-        put(COL_TIME_READ, obj.time_read)
+            COL_LAST_READ to obj.last_read,
-    }
+            COL_TIME_READ to obj.time_read,
        )
 }
 class HistoryGetResolver : DefaultGetResolver<History>() {
    override fun mapFromCursor(cursor: Cursor): History = HistoryImpl().apply {
-        id = cursor.getLong(cursor.getColumnIndex(COL_ID))
+        id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_ID))
-        chapter_id = cursor.getLong(cursor.getColumnIndex(COL_CHAPTER_ID))
+        chapter_id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_CHAPTER_ID))
-        last_read = cursor.getLong(cursor.getColumnIndex(COL_LAST_READ))
+        last_read = cursor.getLong(cursor.getColumnIndexOrThrow(COL_LAST_READ))
-        time_read = cursor.getLong(cursor.getColumnIndex(COL_TIME_READ))
+        time_read = cursor.getLong(cursor.getColumnIndexOrThrow(COL_TIME_READ))
    }
 }
@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.data.database.mappers
 import android.content.ContentValues
 import android.database.Cursor
 import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
 import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
 import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
@@ -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>() {
@@ -33,19 +33,20 @@ class MangaCategoryPutResolver : DefaultPutResolver<MangaCategory>() {
        .whereArgs(obj.id)
        .build()
-    override fun mapToContentValues(obj: MangaCategory) = ContentValues(3).apply {
+    override fun mapToContentValues(obj: MangaCategory) =
-        put(COL_ID, obj.id)
+        contentValuesOf(
-        put(COL_MANGA_ID, obj.manga_id)
+            COL_ID to obj.id,
-        put(COL_CATEGORY_ID, obj.category_id)
+            COL_MANGA_ID to obj.manga_id,
-    }
+            COL_CATEGORY_ID to obj.category_id,
        )
 }
 class MangaCategoryGetResolver : DefaultGetResolver<MangaCategory>() {
    override fun mapFromCursor(cursor: Cursor): MangaCategory = MangaCategory().apply {
-        id = cursor.getLong(cursor.getColumnIndex(COL_ID))
+        id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_ID))
-        manga_id = cursor.getLong(cursor.getColumnIndex(COL_MANGA_ID))
+        manga_id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_MANGA_ID))
-        category_id = cursor.getInt(cursor.getColumnIndex(COL_CATEGORY_ID))
+        category_id = cursor.getInt(cursor.getColumnIndexOrThrow(COL_CATEGORY_ID))
    }
 }
@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.data.database.mappers
 import android.content.ContentValues
 import android.database.Cursor
 import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
 import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
 import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
@@ -18,6 +18,7 @@ import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_COVER_LAST_MODIFI
 import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_DATE_ADDED
 import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_DESCRIPTION
 import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_FAVORITE
 import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_FILTERED_SCANLATORS
 import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_GENRE
 import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_ID
 import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_INITIALIZED
@@ -33,7 +34,7 @@ import eu.kanade.tachiyomi.data.database.tables.MangaTable.TABLE
 class MangaTypeMapping : SQLiteTypeMapping<Manga>(
    MangaPutResolver(),
    MangaGetResolver(),
-    MangaDeleteResolver()
+    MangaDeleteResolver(),
 )
 class MangaPutResolver : DefaultPutResolver<Manga>() {
@@ -48,48 +49,51 @@ class MangaPutResolver : DefaultPutResolver<Manga>() {
        .whereArgs(obj.id)
        .build()
-    override fun mapToContentValues(obj: Manga) = ContentValues(17).apply {
+    override fun mapToContentValues(obj: Manga) =
-        put(COL_ID, obj.id)
+        contentValuesOf(
-        put(COL_SOURCE, obj.source)
+            COL_ID to obj.id,
-        put(COL_URL, obj.url)
+            COL_SOURCE to obj.source,
-        // SY -->
+            COL_URL to obj.url,
-        put(COL_ARTIST, obj.originalArtist)
+            // SY -->
-        put(COL_AUTHOR, obj.originalAuthor)
+            COL_ARTIST to obj.originalArtist,
-        put(COL_DESCRIPTION, obj.originalDescription)
+            COL_AUTHOR to obj.originalAuthor,
-        put(COL_GENRE, obj.originalGenre)
+            COL_DESCRIPTION to obj.originalDescription,
-        put(COL_TITLE, obj.originalTitle)
+            COL_GENRE to obj.originalGenre,
-        // SY <--
+            COL_TITLE to obj.originalTitle,
-        put(COL_STATUS, obj.status)
+            COL_STATUS to obj.originalStatus,
-        put(COL_THUMBNAIL_URL, obj.thumbnail_url)
+            // SY <--
-        put(COL_FAVORITE, obj.favorite)
+            COL_THUMBNAIL_URL to obj.thumbnail_url,
-        put(COL_LAST_UPDATE, obj.last_update)
+            COL_FAVORITE to obj.favorite,
-        put(COL_INITIALIZED, obj.initialized)
+            COL_LAST_UPDATE to obj.last_update,
-        put(COL_VIEWER, obj.viewer)
+            COL_INITIALIZED to obj.initialized,
-        put(COL_CHAPTER_FLAGS, obj.chapter_flags)
+            COL_VIEWER to obj.viewer_flags,
-        put(COL_COVER_LAST_MODIFIED, obj.cover_last_modified)
+            COL_CHAPTER_FLAGS to obj.chapter_flags,
-        put(COL_DATE_ADDED, obj.date_added)
+            COL_COVER_LAST_MODIFIED to obj.cover_last_modified,
-    }
+            COL_DATE_ADDED to obj.date_added,
            COL_FILTERED_SCANLATORS to obj.filtered_scanlators,
        )
 }
 interface BaseMangaGetResolver {
    fun mapBaseFromCursor(manga: Manga, cursor: Cursor) = manga.apply {
-        id = cursor.getLong(cursor.getColumnIndex(COL_ID))
+        id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_ID))
-        source = cursor.getLong(cursor.getColumnIndex(COL_SOURCE))
+        source = cursor.getLong(cursor.getColumnIndexOrThrow(COL_SOURCE))
-        url = cursor.getString(cursor.getColumnIndex(COL_URL))
+        url = cursor.getString(cursor.getColumnIndexOrThrow(COL_URL))
-        artist = cursor.getString(cursor.getColumnIndex(COL_ARTIST))
+        artist = cursor.getString(cursor.getColumnIndexOrThrow(COL_ARTIST))
-        author = cursor.getString(cursor.getColumnIndex(COL_AUTHOR))
+        author = cursor.getString(cursor.getColumnIndexOrThrow(COL_AUTHOR))
-        description = cursor.getString(cursor.getColumnIndex(COL_DESCRIPTION))
+        description = cursor.getString(cursor.getColumnIndexOrThrow(COL_DESCRIPTION))
-        genre = cursor.getString(cursor.getColumnIndex(COL_GENRE))
+        genre = cursor.getString(cursor.getColumnIndexOrThrow(COL_GENRE))
-        title = cursor.getString(cursor.getColumnIndex(COL_TITLE))
+        title = cursor.getString(cursor.getColumnIndexOrThrow(COL_TITLE))
-        status = cursor.getInt(cursor.getColumnIndex(COL_STATUS))
+        status = cursor.getInt(cursor.getColumnIndexOrThrow(COL_STATUS))
-        thumbnail_url = cursor.getString(cursor.getColumnIndex(COL_THUMBNAIL_URL))
+        thumbnail_url = cursor.getString(cursor.getColumnIndexOrThrow(COL_THUMBNAIL_URL))
-        favorite = cursor.getInt(cursor.getColumnIndex(COL_FAVORITE)) == 1
+        favorite = cursor.getInt(cursor.getColumnIndexOrThrow(COL_FAVORITE)) == 1
-        last_update = cursor.getLong(cursor.getColumnIndex(COL_LAST_UPDATE))
+        last_update = cursor.getLong(cursor.getColumnIndexOrThrow(COL_LAST_UPDATE))
-        initialized = cursor.getInt(cursor.getColumnIndex(COL_INITIALIZED)) == 1
+        initialized = cursor.getInt(cursor.getColumnIndexOrThrow(COL_INITIALIZED)) == 1
-        viewer = cursor.getInt(cursor.getColumnIndex(COL_VIEWER))
+        viewer_flags = cursor.getInt(cursor.getColumnIndexOrThrow(COL_VIEWER))
-        chapter_flags = cursor.getInt(cursor.getColumnIndex(COL_CHAPTER_FLAGS))
+        chapter_flags = cursor.getInt(cursor.getColumnIndexOrThrow(COL_CHAPTER_FLAGS))
-        cover_last_modified = cursor.getLong(cursor.getColumnIndex(COL_COVER_LAST_MODIFIED))
+        cover_last_modified = cursor.getLong(cursor.getColumnIndexOrThrow(COL_COVER_LAST_MODIFIED))
-        date_added = cursor.getLong(cursor.getColumnIndex(COL_DATE_ADDED))
+        date_added = cursor.getLong(cursor.getColumnIndexOrThrow(COL_DATE_ADDED))
        filtered_scanlators = cursor.getString(cursor.getColumnIndexOrThrow(COL_FILTERED_SCANLATORS))
    }
 }
@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.data.database.mappers
 import android.content.ContentValues
 import android.database.Cursor
 import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
 import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
 import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
@@ -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>() {
@@ -44,39 +44,40 @@ class TrackPutResolver : DefaultPutResolver<Track>() {
        .whereArgs(obj.id)
        .build()
-    override fun mapToContentValues(obj: Track) = ContentValues(10).apply {
+    override fun mapToContentValues(obj: Track) =
-        put(COL_ID, obj.id)
+        contentValuesOf(
-        put(COL_MANGA_ID, obj.manga_id)
+            COL_ID to obj.id,
-        put(COL_SYNC_ID, obj.sync_id)
+            COL_MANGA_ID to obj.manga_id,
-        put(COL_MEDIA_ID, obj.media_id)
+            COL_SYNC_ID to obj.sync_id,
-        put(COL_LIBRARY_ID, obj.library_id)
+            COL_MEDIA_ID to obj.media_id,
-        put(COL_TITLE, obj.title)
+            COL_LIBRARY_ID to obj.library_id,
-        put(COL_LAST_CHAPTER_READ, obj.last_chapter_read)
+            COL_TITLE to obj.title,
-        put(COL_TOTAL_CHAPTERS, obj.total_chapters)
+            COL_LAST_CHAPTER_READ to obj.last_chapter_read,
-        put(COL_STATUS, obj.status)
+            COL_TOTAL_CHAPTERS to obj.total_chapters,
-        put(COL_TRACKING_URL, obj.tracking_url)
+            COL_STATUS to obj.status,
-        put(COL_SCORE, obj.score)
+            COL_TRACKING_URL to obj.tracking_url,
-        put(COL_START_DATE, obj.started_reading_date)
+            COL_SCORE to obj.score,
-        put(COL_FINISH_DATE, obj.finished_reading_date)
+            COL_START_DATE to obj.started_reading_date,
-    }
+            COL_FINISH_DATE to obj.finished_reading_date,
        )
 }
 class TrackGetResolver : DefaultGetResolver<Track>() {
    override fun mapFromCursor(cursor: Cursor): Track = TrackImpl().apply {
-        id = cursor.getLong(cursor.getColumnIndex(COL_ID))
+        id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_ID))
-        manga_id = cursor.getLong(cursor.getColumnIndex(COL_MANGA_ID))
+        manga_id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_MANGA_ID))
-        sync_id = cursor.getInt(cursor.getColumnIndex(COL_SYNC_ID))
+        sync_id = cursor.getInt(cursor.getColumnIndexOrThrow(COL_SYNC_ID))
-        media_id = cursor.getInt(cursor.getColumnIndex(COL_MEDIA_ID))
+        media_id = cursor.getInt(cursor.getColumnIndexOrThrow(COL_MEDIA_ID))
-        library_id = cursor.getLong(cursor.getColumnIndex(COL_LIBRARY_ID))
+        library_id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_LIBRARY_ID))
-        title = cursor.getString(cursor.getColumnIndex(COL_TITLE))
+        title = cursor.getString(cursor.getColumnIndexOrThrow(COL_TITLE))
-        last_chapter_read = cursor.getInt(cursor.getColumnIndex(COL_LAST_CHAPTER_READ))
+        last_chapter_read = cursor.getFloat(cursor.getColumnIndexOrThrow(COL_LAST_CHAPTER_READ))
-        total_chapters = cursor.getInt(cursor.getColumnIndex(COL_TOTAL_CHAPTERS))
+        total_chapters = cursor.getInt(cursor.getColumnIndexOrThrow(COL_TOTAL_CHAPTERS))
-        status = cursor.getInt(cursor.getColumnIndex(COL_STATUS))
+        status = cursor.getInt(cursor.getColumnIndexOrThrow(COL_STATUS))
-        score = cursor.getFloat(cursor.getColumnIndex(COL_SCORE))
+        score = cursor.getFloat(cursor.getColumnIndexOrThrow(COL_SCORE))
-        tracking_url = cursor.getString(cursor.getColumnIndex(COL_TRACKING_URL))
+        tracking_url = cursor.getString(cursor.getColumnIndexOrThrow(COL_TRACKING_URL))
-        started_reading_date = cursor.getLong(cursor.getColumnIndex(COL_START_DATE))
+        started_reading_date = cursor.getLong(cursor.getColumnIndexOrThrow(COL_START_DATE))
-        finished_reading_date = cursor.getLong(cursor.getColumnIndex(COL_FINISH_DATE))
+        finished_reading_date = cursor.getLong(cursor.getColumnIndexOrThrow(COL_FINISH_DATE))
    }
 }
@@ -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
@@ -1,6 +1,8 @@
 package eu.kanade.tachiyomi.data.database.models
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
 import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType
 import tachiyomi.source.model.MangaInfo
 interface Manga : SManga {
@@ -11,26 +13,30 @@ interface Manga : SManga {
    var favorite: Boolean
    // last time the chapter list changed in any way
    var last_update: Long
    var date_added: Long
-    var viewer: Int
+    var viewer_flags: Int
    var chapter_flags: Int
    var cover_last_modified: Long
    var filtered_scanlators: String?
    fun setChapterOrder(order: Int) {
-        setFlags(order, SORT_MASK)
+        setChapterFlags(order, CHAPTER_SORT_MASK)
    }
    fun sortDescending(): Boolean {
-        return chapter_flags and SORT_MASK == SORT_DESC
+        return chapter_flags and CHAPTER_SORT_MASK == CHAPTER_SORT_DESC
    }
    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 -->
@@ -39,60 +45,72 @@ interface Manga : SManga {
    }
    // SY <--
-    private fun setFlags(flag: Int, mask: Int) {
+    private fun setChapterFlags(flag: Int, mask: Int) {
        chapter_flags = chapter_flags and mask.inv() or (flag and mask)
    }
    private fun setViewerFlags(flag: Int, mask: Int) {
        viewer_flags = viewer_flags and mask.inv() or (flag and mask)
    }
    // Used to display the chapter's title one way or another
    var displayMode: Int
-        get() = chapter_flags and DISPLAY_MASK
+        get() = chapter_flags and CHAPTER_DISPLAY_MASK
-        set(mode) = setFlags(mode, DISPLAY_MASK)
+        set(mode) = setChapterFlags(mode, CHAPTER_DISPLAY_MASK)
    var readFilter: Int
-        get() = chapter_flags and READ_MASK
+        get() = chapter_flags and CHAPTER_READ_MASK
-        set(filter) = setFlags(filter, READ_MASK)
+        set(filter) = setChapterFlags(filter, CHAPTER_READ_MASK)
    var downloadedFilter: Int
-        get() = chapter_flags and DOWNLOADED_MASK
+        get() = chapter_flags and CHAPTER_DOWNLOADED_MASK
-        set(filter) = setFlags(filter, DOWNLOADED_MASK)
+        set(filter) = setChapterFlags(filter, CHAPTER_DOWNLOADED_MASK)
    var bookmarkedFilter: Int
-        get() = chapter_flags and BOOKMARKED_MASK
+        get() = chapter_flags and CHAPTER_BOOKMARKED_MASK
-        set(filter) = setFlags(filter, BOOKMARKED_MASK)
+        set(filter) = setChapterFlags(filter, CHAPTER_BOOKMARKED_MASK)
    var sorting: Int
-        get() = chapter_flags and SORTING_MASK
+        get() = chapter_flags and CHAPTER_SORTING_MASK
-        set(sort) = setFlags(sort, SORTING_MASK)
+        set(sort) = setChapterFlags(sort, CHAPTER_SORTING_MASK)
    var readingModeType: Int
        get() = viewer_flags and ReadingModeType.MASK
        set(readingMode) = setViewerFlags(readingMode, ReadingModeType.MASK)
    var orientationType: Int
        get() = viewer_flags and OrientationType.MASK
        set(rotationType) = setViewerFlags(rotationType, OrientationType.MASK)
    companion object {
        const val SORT_DESC = 0x00000000
        const val SORT_ASC = 0x00000001
        const val SORT_MASK = 0x00000001
        // Generic filter that does not filter anything
        const val SHOW_ALL = 0x00000000
-        const val SHOW_UNREAD = 0x00000002
+        const val CHAPTER_SORT_DESC = 0x00000000
-        const val SHOW_READ = 0x00000004
+        const val CHAPTER_SORT_ASC = 0x00000001
-        const val READ_MASK = 0x00000006
+        const val CHAPTER_SORT_MASK = 0x00000001
-        const val SHOW_DOWNLOADED = 0x00000008
+        const val CHAPTER_SHOW_UNREAD = 0x00000002
-        const val SHOW_NOT_DOWNLOADED = 0x00000010
+        const val CHAPTER_SHOW_READ = 0x00000004
-        const val DOWNLOADED_MASK = 0x00000018
+        const val CHAPTER_READ_MASK = 0x00000006
-        const val SHOW_BOOKMARKED = 0x00000020
+        const val CHAPTER_SHOW_DOWNLOADED = 0x00000008
-        const val SHOW_NOT_BOOKMARKED = 0x00000040
+        const val CHAPTER_SHOW_NOT_DOWNLOADED = 0x00000010
-        const val BOOKMARKED_MASK = 0x00000060
+        const val CHAPTER_DOWNLOADED_MASK = 0x00000018
-        const val SORTING_SOURCE = 0x00000000
+        const val CHAPTER_SHOW_BOOKMARKED = 0x00000020
-        const val SORTING_NUMBER = 0x00000100
+        const val CHAPTER_SHOW_NOT_BOOKMARKED = 0x00000040
-        const val SORTING_UPLOAD_DATE = 0x00000200
+        const val CHAPTER_BOOKMARKED_MASK = 0x00000060
        const val SORTING_MASK = 0x00000300
-        const val DISPLAY_NAME = 0x00000000
+        const val CHAPTER_SORTING_SOURCE = 0x00000000
-        const val DISPLAY_NUMBER = 0x00100000
+        const val CHAPTER_SORTING_NUMBER = 0x00000100
-        const val DISPLAY_MASK = 0x00100000
+        const val CHAPTER_SORTING_UPLOAD_DATE = 0x00000200
        const val CHAPTER_SORTING_MASK = 0x00000300
        const val CHAPTER_DISPLAY_NAME = 0x00000000
        const val CHAPTER_DISPLAY_NUMBER = 0x00100000
        const val CHAPTER_DISPLAY_MASK = 0x00100000
        fun create(source: Long): Manga = MangaImpl().apply {
            this.source = source
@@ -115,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
@@ -40,9 +38,11 @@ open class MangaImpl : Manga {
    override var genre: String?
        get() = if (favorite) customMangaManager.getManga(this)?.genre ?: ogGenre else ogGenre
        set(value) { ogGenre = value }
    // SY <--
-    override var status: Int = 0
+    override var status: Int
        get() = if (favorite) customMangaManager.getManga(this)?.status?.takeUnless { it == 0 } ?: ogStatus else ogStatus
        set(value) { ogStatus = value }
    // SY <--
    override var thumbnail_url: String? = null
@@ -54,12 +54,14 @@ open class MangaImpl : Manga {
    override var initialized: Boolean = false
-    override var viewer: Int = 0
+    override var viewer_flags: Int = 0
    override var chapter_flags: Int = 0
    override var cover_last_modified: Long = 0
    override var filtered_scanlators: String? = null
    // SY -->
    lateinit var ogTitle: String
        private set
@@ -71,6 +73,8 @@ open class MangaImpl : Manga {
        private set
    var ogGenre: String? = null
        private set
    var ogStatus: Int = 0
        private set
    // SY <--
    override fun equals(other: Any?): Boolean {
@@ -85,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()
@@ -7,6 +7,7 @@ import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.database.models.MangaChapter
 import eu.kanade.tachiyomi.data.database.resolvers.ChapterBackupPutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.ChapterKnownBackupPutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.ChapterProgressPutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.ChapterSourceOrderPutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.MangaChapterGetResolver
@@ -24,7 +25,7 @@ interface ChapterQueries : DbProvider {
                .table(ChapterTable.TABLE)
                .where("${ChapterTable.COL_MANGA_ID} = ?")
                .whereArgs(mangaId)
-                .build()
+                .build(),
        )
        .prepare()
    // SY <--
@@ -36,7 +37,7 @@ interface ChapterQueries : DbProvider {
                .query(getRecentsQuery())
                .args(date.time)
                .observesTables(ChapterTable.TABLE)
-                .build()
+                .build(),
        )
        .withGetResolver(MangaChapterGetResolver.INSTANCE)
        .prepare()
@@ -48,7 +49,7 @@ interface ChapterQueries : DbProvider {
                .table(ChapterTable.TABLE)
                .where("${ChapterTable.COL_ID} = ?")
                .whereArgs(id)
-                .build()
+                .build(),
        )
        .prepare()
@@ -59,7 +60,7 @@ interface ChapterQueries : DbProvider {
                .table(ChapterTable.TABLE)
                .where("${ChapterTable.COL_URL} = ?")
                .whereArgs(url)
-                .build()
+                .build(),
        )
        .prepare()
@@ -70,7 +71,7 @@ interface ChapterQueries : DbProvider {
                .table(ChapterTable.TABLE)
                .where("${ChapterTable.COL_URL} = ? AND ${ChapterTable.COL_MANGA_ID} = ?")
                .whereArgs(url, mangaId)
-                .build()
+                .build(),
        )
        .prepare()
@@ -82,7 +83,7 @@ interface ChapterQueries : DbProvider {
                .table(ChapterTable.TABLE)
                .where("${ChapterTable.COL_URL} = ?")
                .whereArgs(url)
-                .build()
+                .build(),
        )
        .prepare()
@@ -93,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 <--
@@ -111,6 +112,11 @@ interface ChapterQueries : DbProvider {
        .withPutResolver(ChapterBackupPutResolver())
        .prepare()
    fun updateKnownChaptersBackup(chapters: List<Chapter>) = db.put()
        .objects(chapters)
        .withPutResolver(ChapterKnownBackupPutResolver())
        .prepare()
    fun updateChapterProgress(chapter: Chapter) = db.put()
        .`object`(chapter)
        .withPutResolver(ChapterProgressPutResolver())
@@ -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,20 +1,25 @@
 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
 import eu.kanade.tachiyomi.data.database.resolvers.MangaFilteredScanlatorsPutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.MangaFlagsPutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.MangaInfoPutResolver
 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.MangaViewerPutResolver
+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
@@ -24,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()
+    fun getDuplicateLibraryManga(manga: Manga) = db.get()
-        .listOfObjects(Manga::class.java)
+        .`object`(Manga::class.java)
        .withQuery(
            Query.builder()
                .table(MangaTable.TABLE)
-                .where("${MangaTable.COL_FAVORITE} = ?")
+                .where("${MangaTable.COL_FAVORITE} = 1 AND LOWER(${MangaTable.COL_TITLE}) = ? AND ${MangaTable.COL_SOURCE} != ?")
-                .whereArgs(1)
+                .whereArgs(
-                .orderBy(MangaTable.COL_TITLE)
+                    manga.title.lowercase(),
-                .build()
+                    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(
@@ -63,7 +78,7 @@ interface MangaQueries : DbProvider {
                .table(MangaTable.TABLE)
                .where("${MangaTable.COL_URL} = ? AND ${MangaTable.COL_SOURCE} = ?")
                .whereArgs(url, sourceId)
-                .build()
+                .build(),
        )
        .prepare()
@@ -74,11 +89,40 @@ 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(),
        )
        .prepare()
    fun updateMangaInfo(manga: Manga) = db.put()
        .`object`(manga)
        .withPutResolver(MangaInfoPutResolver())
@@ -93,20 +137,35 @@ interface MangaQueries : DbProvider {
        .`object`(manga)
        .withPutResolver(MangaMigrationPutResolver())
        .prepare()
    fun updateMangaThumbnail(manga: Manga) = db.put()
        .`object`(manga)
        .withPutResolver(MangaThumbnailPutResolver())
        .prepare()
    // SY <--
    fun insertManga(manga: Manga) = db.put().`object`(manga).prepare()
    fun insertMangas(mangas: List<Manga>) = db.put().objects(mangas).prepare()
-    fun updateFlags(manga: Manga) = db.put()
+    fun updateChapterFlags(manga: Manga) = db.put()
        .`object`(manga)
-        .withPutResolver(MangaFlagsPutResolver())
+        .withPutResolver(MangaFlagsPutResolver(MangaTable.COL_CHAPTER_FLAGS, Manga::chapter_flags))
        .prepare()
-    fun updateFlags(mangas: List<Manga>) = db.put()
+    fun updateChapterFlags(manga: List<Manga>) = db.put()
-        .objects(mangas)
+        .objects(manga)
-        .withPutResolver(MangaFlagsPutResolver(true))
+        .withPutResolver(MangaFlagsPutResolver(MangaTable.COL_CHAPTER_FLAGS, Manga::chapter_flags))
        .prepare()
    fun updateViewerFlags(manga: Manga) = db.put()
        .`object`(manga)
        .withPutResolver(MangaFlagsPutResolver(MangaTable.COL_VIEWER, Manga::viewer_flags))
        .prepare()
    fun updateViewerFlags(manga: List<Manga>) = db.put()
        .objects(manga)
        .withPutResolver(MangaFlagsPutResolver(MangaTable.COL_VIEWER, Manga::viewer_flags))
        .prepare()
    fun updateLastUpdated(manga: Manga) = db.put()
@@ -119,11 +178,6 @@ interface MangaQueries : DbProvider {
        .withPutResolver(MangaFavoritePutResolver())
        .prepare()
    fun updateMangaViewer(manga: Manga) = db.put()
        .`object`(manga)
        .withPutResolver(MangaViewerPutResolver())
        .prepare()
    fun updateMangaTitle(manga: Manga) = db.put()
        .`object`(manga)
        .withPutResolver(MangaTitlePutResolver())
@@ -134,25 +188,60 @@ interface MangaQueries : DbProvider {
        .withPutResolver(MangaCoverLastModifiedPutResolver())
        .prepare()
    // SY -->
    fun updateMangaFilteredScanlators(manga: Manga) = db.put()
        .`object`(manga)
        .withPutResolver(MangaFilteredScanlatorsPutResolver())
        .prepare()
    // SY <--
    fun deleteManga(manga: Manga) = db.delete().`object`(manga).prepare()
    fun deleteMangas(mangas: List<Manga>) = db.delete().objects(mangas).prepare()
-    fun deleteMangasNotInLibrary() = db.delete()
+    fun deleteMangasNotInLibraryBySourceIds(sourceIds: List<Long>) = db.delete()
        .byQuery(
            DeleteQuery.builder()
                .table(MangaTable.TABLE)
-                .where("${MangaTable.COL_FAVORITE} = ? AND ${MangaTable.COL_ID} NOT IN (SELECT ${MergedTable.COL_MANGA_ID} FROM ${MergedTable.TABLE})")
+                // SY -->
-                .whereArgs(0)
+                .where(
-                .build()
+                    """
                    ${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(),
                )
                // SY <--
                .whereArgs(0, *sourceIds.toTypedArray())
                .build(),
        )
        .prepare()
    // SY -->
    fun deleteMangasNotInLibraryAndNotReadBySourceIds(sourceIds: List<Long>) = db.delete()
        .byQuery(
            DeleteQuery.builder()
                .table(MangaTable.TABLE)
                .where(
                    """
                    ${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(),
                )
                .whereArgs(0, *sourceIds.toTypedArray())
                .build(),
        )
        .prepare()
    // SY <--
    fun deleteMangas() = db.delete()
        .byQuery(
            DeleteQuery.builder()
                .table(MangaTable.TABLE)
-                .build()
+                .build(),
        )
        .prepare()
@@ -162,7 +251,7 @@ interface MangaQueries : DbProvider {
            RawQuery.builder()
                .query(getLastReadMangaQuery())
                .observesTables(MangaTable.TABLE)
-                .build()
+                .build(),
        )
        .prepare()
@@ -172,7 +261,7 @@ interface MangaQueries : DbProvider {
            RawQuery.builder()
                .query(getTotalChapterMangaQuery())
                .observesTables(MangaTable.TABLE)
-                .build()
+                .build(),
        )
        .prepare()
@@ -182,7 +271,17 @@ interface MangaQueries : DbProvider {
            RawQuery.builder()
                .query(getLatestChapterMangaQuery())
                .observesTables(MangaTable.TABLE)
-                .build()
+                .build(),
        )
        .prepare()
    fun getChapterFetchDateManga() = db.get()
        .listOfObjects(Manga::class.java)
        .withQuery(
            RawQuery.builder()
                .query(getChapterFetchDateMangaQuery())
                .observesTables(MangaTable.TABLE)
                .build(),
        )
        .prepare()
@@ -197,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()
@@ -214,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()
@@ -231,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 <--
--- a/Show More
+++ b/Show More
`@@ -1,2 +1 @@`
	`github: inorichi`
	`ko_fi: inorichi`	`ko_fi: inorichi`
		`@@ -0,0 +1,3 @@`
							`package eu.kanade.tachiyomi.data.database.models`

							`data class SourceIdMangaCount(val source: Long, val count: Int)`