Release 1.3.0

Cleanup
Fix autofill exclusion
2020-09-14 20:24:48 -04:00 · 2020-09-14 14:36:56 -04:00 · 2020-09-14 14:06:48 -04:00 · 2020-09-14 12:47:54 -04:00 · 2020-09-14 12:42:39 -04:00 · 2020-09-14 12:40:58 -04:00
665 changed files with 27817 additions and 15235 deletions
@@ -14,9 +14,9 @@
 * Catalogue requests should be created at https://github.com/inorichi/tachiyomi-extensions#readme, not here

 # Bugs
-* Include version (Setting > About > Version)
+* Include version (More > About > Version)
 * If not latest, try updating, it may have already been solved
- * Dev version is equal to the number of commits as seen in the main page
+ * 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)
@@ -2,7 +2,7 @@

 I acknowledge that:

- I have updated to the latest version of the app (stable is v0.9.2)
+- I have updated to the latest version of the app (stable is v1.3.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

@@ -10,7 +10,7 @@ I acknowledge that:

 ---

-### Device information
+## Device information
 * Tachiyomi version: ?
 * Android version: ?
 * Device: ?
@@ -9,7 +9,7 @@ labels: "bug"

 I acknowledge that:

- I have updated to the latest version of the app (stable is v0.9.2)
+- I have updated to the latest version of the app (stable is v1.3.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

@@ -17,7 +17,7 @@ I acknowledge that:

 ---

-### Device information
+## Device information
 * Tachiyomi version: ?
 * Android version: ?
 * Device: ?
@@ -32,5 +32,5 @@ This should happen.
 ### Actual behavior
 This happened instead.

-### Other details
+## Other details
 Additional details and attachments.
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Tachiyomi help website
+    url: https://tachiyomi.org/help/
+    about: Common questions are answered here.
+  - name: Tachiyomi extensions GitHub repository
+    url: https://github.com/inorichi/tachiyomi-extensions
+    about: Issues about an extension/source/catalogue should be opened here instead.
@@ -9,7 +9,7 @@ labels: "feature"

 I acknowledge that:

- I have updated to the latest version of the app (stable is v0.9.2)
+- I have updated to the latest version of the app (stable is v1.3.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

@@ -17,8 +17,8 @@ I acknowledge that:

 ---

-### Why/User Benefit/User Problem
+## Why/User Benefit/User Problem
 (explain why this feature should be added)

-### What/Requirements
+## What/Requirements
 (explain how this feature would behave)
@@ -2,7 +2,7 @@
 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"
+labels: "catalog, invalid"
 ---

-DO NOT OPEN AN ISSUE IN THIS REPO. SEE https://github.com/inorichi/tachiyomi-extensions
+DO NOT OPEN AN ISSUE IN THIS REPO. SEE https://github.com/inorichi/tachiyomi-extensions
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="svg8" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 172 172" style="enable-background:new 0 0 172 172;" xml:space="preserve">
+<style type="text/css">
+	.st0{stroke:#CE2828;stroke-width:14;stroke-linecap:round;stroke-linejoin:round;}
+	.st1{fill:#F7D009;}
+	.st2{fill:#E40F85;}
+</style>
+<title>sy_hobo_stds_mine</title>
+<g id="layer1">
+	<path id="path4535" class="st0" d="M85.3,7C129,6.6,164.6,41.7,165,85.3c0.4,43.6-34.7,79.3-78.3,79.7C43.1,165.4,7.4,130.3,7,86.7
+		c0-0.5,0-0.9,0-1.4C7.4,42.2,42.2,7.4,85.3,7z"/>
+	<g id="text4543">
+		<path id="path4545" class="st1" d="M76,64.2c2.9,0,8.4-9.4,8.4-12.5S73.5,40.7,58.2,40.7c-21.4,0-27.4,15-27.4,23.8
+			c0,9.1,2.5,19.6,25.6,26.6c6.1,2,15.6,5.1,15.6,12.8c0,6.5-6.9,9.9-15,9.9c-22.6,0-20.9-21.3-22.6-21.3c-1.1,0-6.4,5.1-6.4,14.2
+			c0,16.7,15.2,24.7,30.1,24.7c22.3,0,31-15,31-27.2c0-9.9-4.5-20.7-26.7-28.1c-5.8-2-16.2-4.8-16.2-12.5c0-6.2,6.8-8.8,12-8.8
+			C69.2,54.8,73.3,64.2,76,64.2L76,64.2z"/>
+		<path id="path4547" class="st2" d="M95.4,128.7c0,1.4,1.1,2.6,2.6,2.6c23.2,0,47-29.8,46-60.7c0-4.5,0.3-7.9-1.7-8.2h-9.4
+			c-1.2,0-3.8-0.3-3.8,1.4s1.2,6.2,1.2,11.3c0,8.2-2.8,21-7.1,21c-2.1,0-12.4-11.6-12.4-24.1c0-3.1,1-6.2,1-7.9c0-2-2.3-1.7-3.7-1.7
+			h-8.6c-4.1,0-4,0-4,4.8c0,29.5,18.3,36.8,18.3,41.4c0,1.1-3.1,5.1-15.3,5.1c-2.8,0-3.1,3.1-3.1,4.3L95.4,128.7z"/>
+	</g>
+</g>
+</svg>
@@ -2,6 +2,8 @@ name: Remote Dispatch Action Initiator
 
 on:
  push:
+   branches: 
+    - 'master'
  repository_dispatch:
 
 jobs:
@@ -0,0 +1,67 @@
+name: Release Builder
+ 
+on:
+  push:
+   branches: 
+    - 'release'
+ 
+jobs:
+  apk:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Get NDK 
+        run: sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.0.6113669"
+      - name: Cache Gradle packages
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: ${{ runner.os }}-gradle
+      - name: Write google-services.json
+        uses: DamianReeves/write-file-action@v1.0
+        with:
+          # The path to the file to write
+          path: app/google-services.json
+          # The contents of the file
+          contents: ${{ secrets.GOOGLE_SERVICES_TEXT }}
+          # The mode of writing to use: `overwrite`, `append`, or `preserve`.
+          write-mode: overwrite # optional, default is preserve
+      - name: Build Release APK
+        run: bash ./gradlew assembleRelease --stacktrace
+      - name: Sign Android Release
+        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
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.run_number }}
+          release_name: TachiyomiSY
+          draft: true
+          prerelease: false
+      - name: Upload Release APK
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ${{ env.SIGNED_RELEASE_FILE }}
+          asset_name: TachiyomiSY.apk
+          asset_content_type: application/vnd.android.package-archive
@@ -0,0 +1,11 @@
+name: Validate Gradle Wrapper
+on: [push, pull_request]
+
+jobs:
+  validation:
+    name: Validation
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1
@@ -1,5 +1,6 @@
 name: Issue closer
 on: [issues]
+
 jobs:
  autoclose:
    runs-on: ubuntu-latest
@@ -31,4 +32,4 @@ jobs:
        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."
+        message: "@${issue.user.login} this issue was automatically closed because the requested information was not filled out."
@@ -1,25 +1,23 @@
-name: Pull Request Checker
-
-on:
-  pull_request:
+name: Pull request build check
+on: [pull_request]

 jobs:
-  apk:
-    name: Generate APK
-    runs-on: ubuntu-18.04
+  build:
+    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v2
-      - name: set up JDK 1.8
+      - name: Clone repo
+        uses: actions/checkout@v2
+      - name: Set up JDK 1.8
        uses: actions/setup-java@v1
        with:
          java-version: 1.8
-      - name: Get NDK 
+      - name: Install NDK
        run: sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.0.6113669"
-      - name: Build Release APK
-        run: bash ./gradlew assembleDebug --stacktrace
+      - name: Build project
+        run: ./gradlew assembleDebug
      - name: Upload APK
        uses: actions/upload-artifact@v2
        with:
          name: TachiyomiSY-${{ github.sha }}.apk
-          path: app/build/outputs/apk/dev/debug/app-dev-debug.apk
+          path: app/build/outputs/apk/dev/debug/app-dev-debug.apk
@@ -1,6 +1,6 @@
 | 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) | [![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)](https://discord.gg/tachiyomi) |


 # ![app icon](./.github/readme-images/app-icon.png)TachiyomiSY
@@ -22,7 +22,6 @@ Features of Tachiyomi(original) include:

 Features of TachiyomiSY include:
 * Uses the new Tachiyomi Stable UI
-* Custom manga page, all your needs, such as info and chapters, in front of your face
 * Latest tab, store up to 5 sources where you can easily view the latest manga by viewing the tab
 * Hentai features enable/disable, in advanced settings
 * Automatic webtoon detection, allowing the reader to switch to webtoon mode automatically when viewing one
@@ -34,20 +33,28 @@ Features of TachiyomiSY include:
 * New E-Hentai/ExHentai features, such as language settings and watched list settings
 * Comfortable grid view
 * Custom categories for sources, liked the pinned sources, but you can make your own versions and put any sources in them
+* Manga info edit
+* Enhanced views for internal and integrated sources
+* Enhanced usability for internal and delegated sources
+* Dynamic Categories, view the library in multiple ways
+* Smart background for reading modes like LTR or Vertical, changes the backgorund based on the page color
+* Force disable webtoon zoom
+* Continue reading button in library
+* Quick clean titles

 Inherited from TachiyomiAZ or TachiyomiEH and are included and possibly modified in TachiyomiSY
 * Source migration, migrate all your manga from one source to another
 * Custom hentai sources:
 * * E-Hentai/ExHentai
-* * nHentai
-* * Hitomi.la
-* * 8Muses
-* * HBrowse
-* * Perv Eden
 * Additional features for some extensions, features include custom description, opening in app, batch add to library:
+* * 8Muses (EroMuse)
+* * HBrowse
+* * HentaiCafe (Foolside)
+* * Hitomi.la
+* * NHentai
+* * PervEden (EN and IT)
 * * Puruin
 * * Tsumino
-* * HentaiCafe (Foolside)
 * Saving searches
 * Autoscroll
 * Page preload customization
@@ -61,10 +68,11 @@ Inherited from TachiyomiAZ or TachiyomiEH and are included and possibly modified
 * Click tag for local search, long click tag for global search
 * Merge multiple of the same manga from different sources
 * Drag and drop library sorting
+* Library search engine, includes exclude, quotes as absolute, and a bunch of other ways to search


 ## Download
-Get the app from our [releases page](https://github.com/jobobby04/tachiyomisy/releases).
+Get the app from our [releases page](https://github.com/jobobby04/tachiyomisy/releases/latest).

 If you want to try new features before they get to the stable release, you can download the preview version [here](https://github.com/jobobby04/tachiyomisypreview/releases).

@@ -81,7 +89,7 @@ Please make sure to read the full guidelines. Your issue may be closed without w

 <details><summary>Bugs</summary>

-* Include version (Setting > 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)
@@ -7,6 +7,7 @@ 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'
@@ -36,15 +37,14 @@ ext {
 android {
    compileSdkVersion AndroidConfig.compileSdk
    buildToolsVersion AndroidConfig.buildTools
-    publishNonDefault true

    defaultConfig {
        applicationId "eu.kanade.tachiyomi.sy"
        minSdkVersion AndroidConfig.minSdk
        targetSdkVersion AndroidConfig.targetSdk
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        versionCode 2
-        versionName "1.0.0"
+        versionCode 8
+        versionName "1.3.0"

        buildConfigField "String", "COMMIT_COUNT", "\"${getCommitCount()}\""
        buildConfigField "String", "COMMIT_SHA", "\"${getGitSha()}\""
@@ -66,7 +66,6 @@ android {
        debug {
            versionNameSuffix "-${getCommitCount()}"
            applicationIdSuffix ".debug"
-            ext.enableCrashlytics = false
        }
        releaseTest {
            applicationIdSuffix ".rt"
@@ -129,7 +128,7 @@ android {
    }

    kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
    }
 }

@@ -139,38 +138,34 @@ androidExtensions {

 dependencies {

-    // Modified dependencies
-    implementation 'com.github.inorichi:subsampling-scale-image-view:ac0dae7'
-    implementation 'com.github.inorichi:junrar-android:634c1f5'
-
    // AndroidX libraries
    implementation 'androidx.annotation:annotation:1.1.0'
-    implementation 'androidx.appcompat:appcompat:1.3.0-alpha01'
-    implementation 'androidx.biometric:biometric:1.1.0-alpha01'
+    implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
+    implementation 'androidx.biometric:biometric:1.1.0-alpha02'
    implementation 'androidx.browser:browser:1.2.0'
    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta7'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
    implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
+    implementation 'androidx.core:core-ktx:1.4.0-alpha01'
    implementation 'androidx.multidex:multidex:2.0.1'
    implementation 'androidx.preference:preference:1.1.1'
-    implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha04'
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-    implementation 'androidx.webkit:webkit:1.3.0-rc01'
+    implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha05'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01'

-    final lifecycle_version = '2.3.0-alpha05'
+    final lifecycle_version = '2.3.0-alpha07'
    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
-    final work_version = '2.4.0-rc01'
+    final work_version = '2.5.0-alpha01'
    implementation "androidx.work:work-runtime:$work_version"
    implementation "androidx.work:work-runtime-ktx:$work_version"

    // UI library
-    implementation 'com.google.android.material:material:1.3.0-alpha01'
+    implementation 'com.google.android.material:material:1.3.0-alpha02'

-    standardImplementation 'com.google.firebase:firebase-core:17.4.3'
+    standardImplementation 'com.google.firebase:firebase-core:17.5.0'

    // ReactiveX
    implementation 'io.reactivex:rxandroid:1.2.1'
@@ -179,14 +174,14 @@ dependencies {
    implementation 'com.github.pwittchen:reactivenetwork:0.13.0'

    // Network client
-    final okhttp_version = '4.7.2'
+    final okhttp_version = '4.9.0'
    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.6.0'
+    implementation 'com.squareup.okio:okio:2.8.0'

    // TLS 1.3 support for Android < 10
-    implementation 'org.conscrypt:conscrypt-android:2.4.0'
+    implementation 'org.conscrypt:conscrypt-android:2.5.1'

    // REST
    final retrofit_version = '2.9.0'
@@ -204,6 +199,7 @@ dependencies {
    // Disk
    implementation 'com.jakewharton:disklrucache:2.0.2'
    implementation 'com.github.inorichi:unifile:e9ee588'
+    implementation 'com.github.inorichi:junrar-android:634c1f5'

    // HTML parser
    implementation 'org.jsoup:jsoup:1.13.1'
@@ -218,10 +214,10 @@ dependencies {
    implementation 'androidx.sqlite:sqlite: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.31.0'
+    implementation 'io.requery:sqlite-android:3.32.2'

    // Preferences
-    implementation 'com.github.tfcporciuncula:flow-preferences:1.1.1'
+    implementation 'com.github.tfcporciuncula:flow-preferences:1.3.1'

    // Model View Presenter
    final nucleus_version = '3.0.0'
@@ -237,12 +233,13 @@ dependencies {
    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:bff2806'
+
    // Logging
    implementation 'com.jakewharton.timber:timber:4.7.1'

    // Crash reports
-    final acra_version = '5.5.0'
-    implementation "ch.acra:acra-http:$acra_version"
+    //implementation 'ch.acra:acra-http:5.7.0'

    // Sort
    implementation 'com.github.gpanther:java-nat-sort:natural-comparator-1.1'
@@ -272,7 +269,7 @@ dependencies {
    implementation 'com.github.tachiyomiorg:conductor-support-preference:1.1.1'

    // FlowBinding
-    final flowbinding_version = '0.11.1'
+    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"
@@ -280,13 +277,12 @@ dependencies {
    implementation "io.github.reactivecircus.flowbinding:flowbinding-viewpager:$flowbinding_version"

    // Licenses
-    final aboutlibraries_version = '8.2.0'
-    implementation "com.mikepenz:aboutlibraries-core:$aboutlibraries_version"
-    implementation "com.mikepenz:aboutlibraries:$aboutlibraries_version"
+    // NOTE: REMEMBER TO UPDATE GRADLE PLUGIN
+    implementation 'com.mikepenz:aboutlibraries:8.3.0'

    // Tests
    testImplementation 'junit:junit:4.13'
-    testImplementation 'org.assertj:assertj-core:3.12.2'
+    testImplementation 'org.assertj:assertj-core:3.16.1'
    testImplementation 'org.mockito:mockito-core:1.10.19'

    final robolectric_version = '3.1.4'
@@ -294,53 +290,46 @@ dependencies {
    testImplementation "org.robolectric:shadows-multidex:$robolectric_version"
    testImplementation "org.robolectric:shadows-play-services:$robolectric_version"

-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$BuildPluginsVersion.KOTLIN"

-    final coroutines_version = '1.3.7'
+    // SY for mangadex utils
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.0-RC"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-protobuf:1.0.0-RC"
+
+
+    final coroutines_version = '1.3.9'
    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-reactive:$coroutines_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$coroutines_version"

-    implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
+    // For detecting memory leaks; see https://square.github.io/leakcanary/
+//    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.4'

    // Text distance (EH)
    implementation 'info.debatty:java-string-similarity:1.2.1'

-    // Reprint (EH)
-    implementation 'com.github.ajalt.reprint:core:3.2.1@aar'
-    implementation 'com.github.ajalt.reprint:rxjava:3.2.1@aar' // optional: the RxJava 1 interface
-
-    // Swirl (EH)
-    implementation 'com.mattprecious.swirl:swirl:1.2.0'
-
-    // RxJava 2 interop for Realm (EH)
-    implementation 'com.github.akarnokd:rxjava2-interop:0.13.7'
-
    // Firebase (EH)
-    implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
+    implementation 'com.google.firebase:firebase-analytics-ktx:17.5.0'
+    implementation 'com.google.firebase:firebase-crashlytics-ktx:17.2.1'

    // Better logging (EH)
    implementation 'com.elvishew:xlog:1.6.1'

-    // Time utils (EH)
-    def typed_time_version = '1.0.2'
-    implementation "com.github.kizitonwose.time:time:$typed_time_version"
-    implementation "com.github.kizitonwose.time:time-android:$typed_time_version"
-
    // Debug utils (EH)
-    debugImplementation 'com.ms-square:debugoverlay:1.1.3'
-    releaseTestImplementation 'com.ms-square:debugoverlay:1.1.3'
-    releaseImplementation 'com.ms-square:debugoverlay-no-op:1.1.3'
-    testImplementation 'com.ms-square:debugoverlay-no-op:1.1.3'
+    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"

-    // Humanize (EH)
+    // Humanize (EH) used for E-Hentai updater statistics
    implementation 'com.github.mfornos:humanize-slim:1.2.2'

+    // RatingBar (SY)
+    implementation 'me.zhanghai.android.materialratingbar:library:1.3.1'
+
    implementation 'androidx.gridlayout:gridlayout:1.0.0'

-    final def markwon_version = '4.1.0'
+    final def markwon_version = '4.5.1'

    implementation "io.noties.markwon:core:$markwon_version"
    implementation "io.noties.markwon:ext-strikethrough:$markwon_version"
@@ -349,16 +338,15 @@ dependencies {
    implementation "io.noties.markwon:image:$markwon_version"
    implementation "io.noties.markwon:linkify:$markwon_version"

-    implementation 'com.google.guava:guava:27.0.1-android'
+    implementation 'com.google.guava:guava:29.0-android'
 }

 buildscript {
-    ext.kotlin_version = '1.3.72'
    repositories {
        mavenCentral()
    }
    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$BuildPluginsVersion.KOTLIN"
    }
 }

@@ -368,7 +356,7 @@ repositories {

 // See https://kotlinlang.org/docs/reference/experimental.html#experimental-status-of-experimental-api-markers
 tasks.withType(AbstractKotlinCompile).all {
-    kotlinOptions.freeCompilerArgs += ["-Xuse-experimental=kotlin.Experimental"]
+    kotlinOptions.freeCompilerArgs += ["-Xopt-in=kotlin.Experimental"]
 }

 // Duplicating Hebrew string assets due to some locale code issues on different devices
@@ -378,10 +366,10 @@ task copyResources(type: Copy) {
    include '**/*'
 }

-preBuild.dependsOn(ktlintFormat, copyResources)
+preBuild.dependsOn(formatKotlin, copyResources)

-if (getGradle().getStartParameter().getTaskRequests().toString().contains("Standard")) {
+if (!getGradle().getStartParameter().getTaskRequests().toString().contains("Debug")) {
    apply plugin: 'com.google.gms.google-services'
-    // Firebase (EH)
-    apply plugin: 'io.fabric'
-}
+    // Firebase Crashlytics
+    apply plugin: 'com.google.firebase.crashlytics'
+}
@@ -37,6 +37,14 @@
      public *;
 }

+# Hitomi extension crash fix
+-keepclassmembers class rx.Single {
+      *** onSubscribe;
+      final *;
+      protected *;
+      public *;
+}
+
 # RxJava 1.1.0
 -dontwarn sun.misc.**

@@ -39,11 +39,6 @@
                android:name="android.app.shortcuts"
                android:resource="@xml/shortcuts" />
        </activity>
-        <activity
-            android:name=".ui.main.ForceCloseActivity"
-            android:clearTaskOnLaunch="true"
-            android:noHistory="true"
-            android:theme="@android:style/Theme.NoDisplay" />
        <activity
            android:name=".ui.main.DeepLinkActivity"
            android:launchMode="singleTask"
@@ -287,7 +282,7 @@
                    android:scheme="https" />

                <!-- MangaDex -->
-<!--                <data
+                <data
                    android:host="mangadex.org"
                    android:pathPattern="\/(title|manga)\/"
                    android:scheme="http" />
@@ -302,7 +297,7 @@
                <data
                    android:host="www.mangadex.org"
                    android:pathPattern="\/(title|manga)\/"
-                    android:scheme="https" />-->
+                    android:scheme="https" />
            </intent-filter>
        </activity>
        <activity
@@ -6,7 +6,6 @@ import android.content.res.Configuration
 import android.graphics.Color
 import android.os.Build
 import android.os.Environment
-import android.widget.Toast
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
@@ -24,27 +23,22 @@ 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.kizitonwose.time.days
+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.notification.Notifications
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.ui.main.ForceCloseActivity
 import eu.kanade.tachiyomi.ui.security.SecureActivityDelegate
 import eu.kanade.tachiyomi.util.system.LocaleHelper
-import eu.kanade.tachiyomi.util.system.WebViewUtil
-import eu.kanade.tachiyomi.util.system.toast
 import exh.debug.DebugToggles
 import exh.log.CrashlyticsPrinter
 import exh.log.EHDebugModeOverlay
 import exh.log.EHLogLevel
+import exh.syDebugVersion
 import io.realm.Realm
 import io.realm.RealmConfiguration
-import java.io.File
-import java.security.NoSuchAlgorithmException
-import java.security.Security
-import javax.net.ssl.SSLContext
-import kotlin.concurrent.thread
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import org.conscrypt.Conscrypt
@@ -53,21 +47,34 @@ import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.InjektScope
 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 javax.net.ssl.SSLContext
+import kotlin.concurrent.thread
+import kotlin.time.ExperimentalTime
+import kotlin.time.days

 open class App : Application(), LifecycleObserver {

+    private lateinit var firebaseAnalytics: FirebaseAnalytics
+
    override fun onCreate() {
        super.onCreate()
        if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree())
        setupExhLogging() // EXH logging
+        if (!BuildConfig.DEBUG) addAnalytics()

        workaroundAndroid7BrokenSSL()

-        // Enforce WebView availability
-        if (!WebViewUtil.supportsWebView(this)) {
-            toast(R.string.information_webview_required, Toast.LENGTH_LONG)
-            ForceCloseActivity.closeApp(this)
-        }
+        // 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) {
@@ -78,8 +85,8 @@ open class App : Application(), LifecycleObserver {
        Injekt.importModule(AppModule(this))

        setupNotificationChannels()
+        Realm.init(this)
        GlobalScope.launch { deleteOldMetadataRealm() } // Delete old metadata DB (EH)
-        // Reprint.initialize(this) //Setup fingerprint (EH)
        if ((BuildConfig.DEBUG || BuildConfig.BUILD_TYPE == "releaseTest") && DebugToggles.ENABLE_DEBUG_OVERLAY.enabled) {
            setupDebugOverlay()
        }
@@ -119,6 +126,13 @@ open class App : Application(), LifecycleObserver {
        }
    }

+    private fun addAnalytics() {
+        firebaseAnalytics = Firebase.analytics
+        if (syDebugVersion != "0") {
+            firebaseAnalytics.setUserProperty("preview_version", syDebugVersion)
+        }
+    }
+
    @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
    @Suppress("unused")
    fun onAppBackgrounded() {
@@ -134,7 +148,6 @@ open class App : Application(), LifecycleObserver {

    // EXH
    private fun deleteOldMetadataRealm() {
-        Realm.init(this)
        val config = RealmConfiguration.Builder()
            .name("gallery-metadata.realm")
            .schemaVersion(3)
@@ -160,15 +173,14 @@ open class App : Application(), LifecycleObserver {
    private fun setupExhLogging() {
        EHLogLevel.init(this)

-        val logLevel = if (EHLogLevel.shouldLog(EHLogLevel.EXTRA)) {
-            LogLevel.ALL
-        } else {
-            LogLevel.WARN
+        val logLevel = when {
+            EHLogLevel.shouldLog(EHLogLevel.EXTRA) -> LogLevel.ALL
+            BuildConfig.DEBUG -> LogLevel.DEBUG
+            else -> LogLevel.WARN
        }

        val logConfig = LogConfiguration.Builder()
            .logLevel(logLevel)
-            .t()
            .st(2)
            .nb()
            .build()
@@ -181,14 +193,17 @@ open class App : Application(), LifecycleObserver {
            "logs"
        )

+        @OptIn(ExperimentalTime::class)
        printers += FilePrinter
            .Builder(logFolder.absolutePath)
-            .fileNameGenerator(object : DateFileNameGenerator() {
-                override fun generateFileName(logLevel: Int, timestamp: Long): String {
-                    return super.generateFileName(logLevel, timestamp) + "-${BuildConfig.BUILD_TYPE}"
+            .fileNameGenerator(
+                object : DateFileNameGenerator() {
+                    override fun generateFileName(logLevel: Int, timestamp: Long): String {
+                        return super.generateFileName(logLevel, timestamp) + "-${BuildConfig.BUILD_TYPE}.log"
+                    }
                }
-            })
-            .cleanStrategy(FileLastModifiedCleanStrategy(7.days.inMilliseconds.longValue))
+            )
+            .cleanStrategy(FileLastModifiedCleanStrategy(7.days.toLongMilliseconds()))
            .backupStrategy(NeverBackupStrategy())
            .build()

@@ -203,6 +218,17 @@ open class App : Application(), LifecycleObserver {
        )

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

    // EXH
@@ -6,6 +6,7 @@ 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.track.TrackManager
 import eu.kanade.tachiyomi.extension.ExtensionManager
@@ -42,6 +43,8 @@ class AppModule(val app: Application) : InjektModule {

        addSingletonFactory { DownloadManager(app) }

+        addSingletonFactory { CustomMangaManager(app) }
+
        addSingletonFactory { TrackManager(app) }

        addSingletonFactory { Gson() }
@@ -63,5 +66,9 @@ class AppModule(val app: Application) : InjektModule {
        GlobalScope.launch { get<DatabaseHelper>() }

        GlobalScope.launch { get<DownloadManager>() }
+
+        // SY -->
+        GlobalScope.launch { get<CustomMangaManager>() }
+        // SY <--
    }
 }
@@ -87,6 +87,7 @@ object Migrations {
            }
            if (oldVersion < 44) {
                // Reset sorting preference if using removed sort by source
+                @Suppress("DEPRECATION")
                if (preferences.librarySortingMode().get() == LibrarySort.SOURCE) {
                    preferences.librarySortingMode().set(LibrarySort.ALPHA)
                }
@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.annoations
+
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.CLASS)
+annotation class Nsfw
@@ -7,6 +7,7 @@ import android.net.Uri
 import android.os.Build
 import android.os.IBinder
 import android.os.PowerManager
+import androidx.core.net.toUri
 import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.util.system.acquireWakeLock
@@ -106,7 +107,7 @@ class BackupCreateService : Service() {
            val backupFlags = intent.getIntExtra(BackupConst.EXTRA_FLAGS, 0)
            backupManager = BackupManager(this)

-            val backupFileUri = Uri.parse(backupManager.createBackup(uri, backupFlags, false))
+            val backupFileUri = backupManager.createBackup(uri, backupFlags, false)?.toUri()
            val unifile = UniFile.fromUri(this, backupFileUri)
            notifier.showBackupComplete(unifile)
        } catch (e: Exception) {
@@ -1,16 +1,16 @@
 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.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.Worker
 import androidx.work.WorkerParameters
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import java.util.concurrent.TimeUnit
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
+import java.util.concurrent.TimeUnit

 class BackupCreatorJob(private val context: Context, workerParams: WorkerParameters) :
    Worker(context, workerParams) {
@@ -18,7 +18,7 @@ class BackupCreatorJob(private val context: Context, workerParams: WorkerParamet
    override fun doWork(): Result {
        val preferences = Injekt.get<PreferencesHelper>()
        val backupManager = BackupManager(context)
-        val uri = Uri.parse(preferences.backupsDirectory().get())
+        val uri = preferences.backupsDirectory().get().toUri()
        val flags = BackupCreateService.BACKUP_ALL
        return try {
            backupManager.createBackup(uri, flags, true)
@@ -36,8 +36,10 @@ class BackupCreatorJob(private val context: Context, workerParams: WorkerParamet
            val interval = prefInterval ?: preferences.backupInterval().get()
            if (interval > 0) {
                val request = PeriodicWorkRequestBuilder<BackupCreatorJob>(
-                    interval.toLong(), TimeUnit.HOURS,
-                    10, TimeUnit.MINUTES
+                    interval.toLong(),
+                    TimeUnit.HOURS,
+                    10,
+                    TimeUnit.MINUTES
                )
                    .addTag(TAG)
                    .build()
@@ -32,6 +32,7 @@ import eu.kanade.tachiyomi.data.backup.models.Backup.CURRENT_VERSION
 import eu.kanade.tachiyomi.data.backup.models.Backup.EXTENSIONS
 import eu.kanade.tachiyomi.data.backup.models.Backup.HISTORY
 import eu.kanade.tachiyomi.data.backup.models.Backup.MANGA
+import eu.kanade.tachiyomi.data.backup.models.Backup.MERGEDMANGAREFERENCES
 import eu.kanade.tachiyomi.data.backup.models.Backup.SAVEDSEARCHES
 import eu.kanade.tachiyomi.data.backup.models.Backup.TRACK
 import eu.kanade.tachiyomi.data.backup.models.DHistory
@@ -39,6 +40,7 @@ import eu.kanade.tachiyomi.data.backup.serializer.CategoryTypeAdapter
 import eu.kanade.tachiyomi.data.backup.serializer.ChapterTypeAdapter
 import eu.kanade.tachiyomi.data.backup.serializer.HistoryTypeAdapter
 import eu.kanade.tachiyomi.data.backup.serializer.MangaTypeAdapter
+import eu.kanade.tachiyomi.data.backup.serializer.MergedMangaReferenceTypeAdapter
 import eu.kanade.tachiyomi.data.backup.serializer.TrackTypeAdapter
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.CategoryImpl
@@ -57,17 +59,23 @@ import eu.kanade.tachiyomi.source.LocalSource
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.online.all.EHentai
+import eu.kanade.tachiyomi.source.online.all.MergedSource
 import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource
 import exh.EXHSavedSearch
+import exh.MERGED_SOURCE_ID
 import exh.eh.EHentaiThrottleManager
-import java.lang.RuntimeException
-import kotlin.math.max
+import exh.merged.sql.models.MergedMangaReference
+import exh.util.asObservable
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.runBlocking
 import rx.Observable
 import timber.log.Timber
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import xyz.nulldev.ts.api.http.serializer.FilterSerializer
+import java.lang.RuntimeException
+import kotlin.math.max

 class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {

@@ -106,6 +114,9 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
                .registerTypeAdapter<CategoryImpl>(CategoryTypeAdapter.build())
                .registerTypeAdapter<DHistory>(HistoryTypeAdapter.build())
                .registerTypeHierarchyAdapter<TrackImpl>(TrackTypeAdapter.build())
+                // SY -->
+                .registerTypeAdapter<MergedMangaReference>(MergedMangaReferenceTypeAdapter.build())
+                // SY <--
                .create()
        else -> throw Exception("Json version unknown")
    }
@@ -129,15 +140,21 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
        // 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 {
            // Get manga from database
-            val mangas = getFavoriteManga()
+            val mangas = getFavoriteManga() /* SY --> */ + getMergedManga() /* SY <-- */

            val extensions: MutableSet<String> = mutableSetOf()

@@ -163,6 +180,8 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
            // SY -->
            root[SAVEDSEARCHES] =
                Injekt.get<PreferencesHelper>().eh_savedSearches().get().joinToString(separator = "***")
+
+            backupMergedMangaReferences(mergedMangaReferenceEntries)
            // SY <--
        }

@@ -212,6 +231,13 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
        }
    }

+    // SY -->
+    private fun backupMergedMangaReferences(root: JsonArray) {
+        val mergedMangaReferences = databaseHelper.getMergedMangaReferences().executeAsBlocking()
+        mergedMangaReferences.forEach { root.add(parser.toJsonTree(it)) }
+    }
+    // SY <--
+
    /**
     * Backup the categories of library
     *
@@ -317,29 +343,40 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
     */
    fun restoreChapterFetchObservable(source: Source, manga: Manga, chapters: List<Chapter>, throttleManager: EHentaiThrottleManager): Observable<Pair<List<Chapter>, List<Chapter>>> {
        // SY -->
-        return (
-            if (source is EHentai) {
-                source.fetchChapterList(manga, throttleManager::throttle)
-            } else {
-                source.fetchChapterList(manga)
-            }
-            ).map {
-            if (it.last().chapter_number == -99F) {
-                chapters.forEach { chapter ->
-                    chapter.name = "Chapter ${chapter.chapter_number} restored by dummy source"
-                }
-                syncChaptersWithSource(databaseHelper, chapters, manga, source)
-            } else {
-                syncChaptersWithSource(databaseHelper, it, manga, source)
-            }
-        }
-            // SY <--
-            .doOnNext { pair ->
+        if (source is MergedSource) {
+            val syncedChapters = runBlocking { source.fetchChaptersAndSync(manga, false) }
+            return syncedChapters.onEach { pair ->
                if (pair.first.isNotEmpty()) {
                    chapters.forEach { it.manga_id = manga.id }
                    insertChapters(chapters)
                }
+            }.asObservable()
+        } else {
+            return (
+                if (source is EHentai) {
+                    source.fetchChapterList(manga, throttleManager::throttle)
+                } else {
+                    source.fetchChapterList(manga)
+                }
+                ).map {
+                if (it.last().chapter_number == -99F) {
+                    chapters.forEach { chapter ->
+                        chapter.name =
+                            "Chapter ${chapter.chapter_number} restored by dummy source"
+                    }
+                    syncChaptersWithSource(databaseHelper, chapters, manga, source)
+                } else {
+                    syncChaptersWithSource(databaseHelper, it, manga, source)
+                }
            }
+                // SY <--
+                .doOnNext { pair ->
+                    if (pair.first.isNotEmpty()) {
+                        chapters.forEach { it.manga_id = manga.id }
+                        insertChapters(chapters)
+                    }
+                }
+        }
    }

    /**
@@ -359,7 +396,7 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
            for (dbCategory in dbCategories) {
                // If the category is already in the db, assign the id to the file's category
                // and do nothing
-                if (category.nameLower == dbCategory.nameLower) {
+                if (category.name == dbCategory.name) {
                    category.id = dbCategory.id
                    found = true
                    break
@@ -387,7 +424,7 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
        val mangaCategoriesToUpdate = mutableListOf<MangaCategory>()
        for (backupCategoryStr in categories) {
            for (dbCategory in dbCategories) {
-                if (backupCategoryStr.toLowerCase() == dbCategory.nameLower) {
+                if (backupCategoryStr == dbCategory.name) {
                    mangaCategoriesToUpdate.add(MangaCategory.create(manga, dbCategory))
                    break
                }
@@ -584,6 +621,49 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
        }
        preferences.eh_savedSearches().set((otherSerialized + newSerialized).toSet())
    }
+
+    /**
+     * Restore the categories from Json
+     *
+     * @param jsonMergedMangaReferences array containing md manga references
+     */
+    internal fun restoreMergedMangaReferences(jsonMergedMangaReferences: JsonArray) {
+        // 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
+        backupMergedMangaReferences.forEach { mergedMangaReference ->
+            // Used to know if the merged manga reference is already in the db
+            var found = false
+            for (dbMergedMangaReference in dbMergedMangaReferences) {
+                // If the mergedMangaReference is already in the db, assign the id to the file's mergedMangaReference
+                // and do nothing
+                if (mergedMangaReference.mergeUrl == dbMergedMangaReference.mergeUrl && mergedMangaReference.mangaUrl == dbMergedMangaReference.mangaUrl) {
+                    mergedMangaReference.id = dbMergedMangaReference.id
+                    mergedMangaReference.mergeId = dbMergedMangaReference.mergeId
+                    mergedMangaReference.mangaId = dbMergedMangaReference.mangaId
+                    found = true
+                    break
+                }
+            }
+            // If the mergedMangaReference isn't in the db, remove the id and insert a new mergedMangaReference
+            // Store the inserted id in the mergedMangaReference
+            if (!found) {
+                // Let the db assign the id
+                val mergedManga = (if (mergedMangaReference.mergeUrl != lastMergeManga?.url) databaseHelper.getManga(mergedMangaReference.mergeUrl, MERGED_SOURCE_ID).executeAsBlocking() else lastMergeManga) ?: return@forEach
+                val manga = databaseHelper.getManga(mergedMangaReference.mangaUrl, mergedMangaReference.mangaSourceId).executeAsBlocking() ?: return@forEach
+                lastMergeManga = mergedManga
+
+                mergedMangaReference.mergeId = mergedManga.id
+                mergedMangaReference.mangaId = manga.id
+                mergedMangaReference.id = null
+                val result = databaseHelper.insertMergedManga(mergedMangaReference).executeAsBlocking()
+                mergedMangaReference.id = result.insertedId()
+            }
+        }
+    }
    // SY <--

    /**
@@ -602,6 +682,9 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
    internal fun getFavoriteManga(): List<Manga> =
        databaseHelper.getFavoriteMangas().executeAsBlocking()

+    internal fun getMergedManga(): List<Manga> =
+        databaseHelper.getMergedMangas().executeAsBlocking()
+
    /**
     * Inserts manga and returns id
     *
@@ -11,9 +11,9 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.util.storage.getUriCompat
 import eu.kanade.tachiyomi.util.system.notificationBuilder
 import eu.kanade.tachiyomi.util.system.notificationManager
+import uy.kohesive.injekt.injectLazy
 import java.io.File
 import java.util.concurrent.TimeUnit
-import uy.kohesive.injekt.injectLazy

 internal class BackupNotifier(private val context: Context) {

@@ -33,14 +33,11 @@ import eu.kanade.tachiyomi.data.database.models.TrackImpl
 import eu.kanade.tachiyomi.data.notification.Notifications
 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.acquireWakeLock
 import eu.kanade.tachiyomi.util.system.isServiceRunning
 import exh.EXHMigrations
 import exh.eh.EHentaiThrottleManager
-import java.io.File
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
@@ -48,6 +45,10 @@ import kotlinx.coroutines.launch
 import rx.Observable
 import timber.log.Timber
 import uy.kohesive.injekt.injectLazy
+import java.io.File
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale

 /**
 * Restores backup from a JSON file.
@@ -105,6 +106,10 @@ class BackupRestoreService : Service() {

    // SY -->
    private val throttleManager = EHentaiThrottleManager()
+
+    private var skippedAmount = 0
+
+    private var totalAmount = 0
    // SY <--

    /**
@@ -117,12 +122,6 @@ class BackupRestoreService : Service() {
     */
    private var restoreAmount = 0

-    // SY -->
-    private var skippedAmount = 0
-
-    private var totalAmount = 0
-    // SY <--
-
    /**
     * Mapping of source ID to source name from backup data
     */
@@ -240,7 +239,7 @@ class BackupRestoreService : Service() {
        }

        totalAmount = mangasJson.size()
-        restoreAmount = validManga.count() + 1 // +1 for categories
+        restoreAmount = validManga.count() + 3 // +1 for categories, +1 for saved searches, +1 for merged manga references
        skippedAmount = mangasJson.size() - validManga.count()
        // SY <--
        restoreProgress = 0
@@ -288,7 +287,16 @@ class BackupRestoreService : Service() {
        backupManager.restoreSavedSearches(savedSearchesJson)

        restoreProgress += 1
-        showRestoreProgress(restoreProgress, restoreAmount, getString(R.string.eh_saved_searches))
+        showRestoreProgress(restoreProgress, restoreAmount, getString(R.string.saved_searches))
+    }
+
+    private fun restoreMergedMangaReferences(mergedMangaReferencesJson: JsonElement) {
+        db.inTransaction {
+            backupManager.restoreMergedMangaReferences(mergedMangaReferencesJson.asJsonArray)
+        }
+
+        restoreProgress += 1
+        showRestoreProgress(restoreProgress, restoreAmount, getString(R.string.categories))
    }
    // SY <--

@@ -320,13 +328,8 @@ class BackupRestoreService : Service() {
            if (source != null) {
                restoreMangaData(manga, source, chapters, categories, history, tracks)
            } else {
-                val message = if (manga.source in sourceMapping) {
-                    getString(R.string.source_not_found_name, sourceMapping[manga.source])
-                } else {
-                    getString(R.string.source_not_found)
-                }
-
-                errors.add(Date() to "${manga.title} - $message")
+                val sourceName = sourceMapping[manga.source] ?: manga.source.toString()
+                errors.add(Date() to "${manga.title} - ${getString(R.string.source_not_found_name, sourceName)}")
            }
        } catch (e: Exception) {
            errors.add(Date() to "${manga.title} - ${e.message}")
@@ -452,7 +455,12 @@ class BackupRestoreService : Service() {
        return backupManager.restoreChapterFetchObservable(source, manga, chapters /* SY --> */, throttleManager /* SY <-- */)
            // If there's any error, return empty update and continue.
            .onErrorReturn {
-                errors.add(Date() to "${manga.title} - ${it.message}")
+                val errorMessage = if (it is NoChaptersException) {
+                    getString(R.string.no_chapters_error)
+                } else {
+                    it.message
+                }
+                errors.add(Date() to "${manga.title} - $errorMessage")
                Pair(emptyList(), emptyList())
            }
    }
@@ -7,16 +7,22 @@ import com.google.gson.JsonParser
 import com.google.gson.stream.JsonReader
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.backup.models.Backup
+import eu.kanade.tachiyomi.data.track.TrackManager
+import eu.kanade.tachiyomi.source.SourceManager
+import uy.kohesive.injekt.injectLazy

 object BackupRestoreValidator {

+    private val sourceManager: SourceManager by injectLazy()
+    private val trackManager: TrackManager by injectLazy()
+
    /**
     * Checks for critical backup file data.
     *
     * @throws Exception if version or manga cannot be found.
-     * @return List of required sources.
+     * @return List of missing sources or missing trackers.
     */
-    fun validate(context: Context, uri: Uri): Map<Long, String> {
+    fun validate(context: Context, uri: Uri): Results {
        val reader = JsonReader(context.contentResolver.openInputStream(uri)!!.bufferedReader())
        val json = JsonParser.parseReader(reader).asJsonObject

@@ -26,11 +32,29 @@ object BackupRestoreValidator {
            throw Exception(context.getString(R.string.invalid_backup_file_missing_data))
        }

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

-        return getSourceMapping(json)
+        val sources = getSourceMapping(json)
+        val missingSources = sources
+            .filter { sourceManager.get(it.key) == null }
+            .values
+            .sorted()
+
+        val trackers = mangas
+            .filter { it.asJsonObject.has("track") }
+            .flatMap { it.asJsonObject["track"].asJsonArray }
+            .map { it.asJsonObject["s"].asInt }
+            .distinct()
+        val missingTrackers = trackers
+            .mapNotNull { trackManager.getService(it) }
+            .filter { !it.isLogged }
+            .map { it.name }
+            .sorted()
+
+        return Results(missingSources, missingTrackers)
    }

    fun getSourceMapping(json: JsonObject): Map<Long, String> {
@@ -43,4 +67,6 @@ object BackupRestoreValidator {
            }
            .toMap()
    }
+
+    data class Results(val missingSources: List<String>, val missingTrackers: List<String>)
 }
@@ -19,6 +19,7 @@ object Backup {
    const val VERSION = "version"
    // SY -->
    const val SAVEDSEARCHES = "savedsearches"
+    const val MERGEDMANGAREFERENCES = "mergedmangareferences"
    // SY <--

    fun getDefaultFilename(): String {
@@ -14,7 +14,9 @@ object MangaTypeAdapter {
            write {
                beginArray()
                value(it.url)
-                value(it.title)
+                // SY -->
+                value(it.originalTitle)
+                // SY <--
                value(it.source)
                value(it.viewer)
                value(it.chapter_flags)
@@ -0,0 +1,45 @@
+package eu.kanade.tachiyomi.data.backup.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
+                )
+            }
+        }
+    }
+}
@@ -10,8 +10,6 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.util.storage.DiskUtil
 import eu.kanade.tachiyomi.util.storage.saveTo
-import java.io.File
-import java.io.IOException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -22,6 +20,8 @@ import okio.buffer
 import okio.sink
 import rx.Observable
 import uy.kohesive.injekt.injectLazy
+import java.io.File
+import java.io.IOException

 /**
 * Class used to create chapter cache
@@ -21,6 +21,9 @@ import eu.kanade.tachiyomi.data.database.queries.HistoryQueries
 import eu.kanade.tachiyomi.data.database.queries.MangaCategoryQueries
 import eu.kanade.tachiyomi.data.database.queries.MangaQueries
 import eu.kanade.tachiyomi.data.database.queries.TrackQueries
+import exh.merged.sql.mappers.MergedMangaTypeMapping
+import exh.merged.sql.models.MergedMangaReference
+import exh.merged.sql.queries.MergedQueries
 import exh.metadata.sql.mappers.SearchMetadataTypeMapping
 import exh.metadata.sql.mappers.SearchTagTypeMapping
 import exh.metadata.sql.mappers.SearchTitleTypeMapping
@@ -36,7 +39,7 @@ 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 /* EXH --> */, SearchMetadataQueries, SearchTagQueries, SearchTitleQueries /* EXH <-- */ {
+    MangaQueries, ChapterQueries, TrackQueries, CategoryQueries, MangaCategoryQueries, HistoryQueries /* SY --> */, SearchMetadataQueries, SearchTagQueries, SearchTitleQueries, MergedQueries /* SY <-- */ {

    private val configuration = SupportSQLiteOpenHelper.Configuration.builder(context)
        .name(DbOpenCallback.DATABASE_NAME)
@@ -51,11 +54,12 @@ open class DatabaseHelper(context: Context) :
        .addTypeMapping(Category::class.java, CategoryTypeMapping())
        .addTypeMapping(MangaCategory::class.java, MangaCategoryTypeMapping())
        .addTypeMapping(History::class.java, HistoryTypeMapping())
-        // EXH -->
+        // SY -->
        .addTypeMapping(SearchMetadata::class.java, SearchMetadataTypeMapping())
        .addTypeMapping(SearchTag::class.java, SearchTagTypeMapping())
        .addTypeMapping(SearchTitle::class.java, SearchTitleTypeMapping())
-        // EXH <--
+        .addTypeMapping(MergedMangaReference::class.java, MergedMangaTypeMapping())
+        // SY <--
        .build()

    inline fun inTransaction(block: () -> Unit) = db.inTransaction(block)
@@ -7,8 +7,8 @@ import eu.kanade.tachiyomi.data.database.tables.ChapterTable
 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.MergedTable
 import eu.kanade.tachiyomi.data.database.tables.TrackTable
+import exh.merged.sql.tables.MergedTable
 import exh.metadata.sql.tables.SearchMetadataTable
 import exh.metadata.sql.tables.SearchTagTable
 import exh.metadata.sql.tables.SearchTitleTable
@@ -24,7 +24,7 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
        /**
         * Version of the database.
         */
-        const val DATABASE_VERSION = /* SY --> */ 2 /* SY <-- */
+        const val DATABASE_VERSION = /* SY --> */ 4 /* SY <-- */
    }

    override fun onCreate(db: SupportSQLiteDatabase) = with(db) {
@@ -34,14 +34,12 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
        execSQL(CategoryTable.createTableQuery)
        execSQL(MangaCategoryTable.createTableQuery)
        execSQL(HistoryTable.createTableQuery)
-        // EXH -->
+        // SY -->
        execSQL(SearchMetadataTable.createTableQuery)
        execSQL(SearchTagTable.createTableQuery)
        execSQL(SearchTitleTable.createTableQuery)
-        // EXH <--
-        // AZ -->
        execSQL(MergedTable.createTableQuery)
-        // AZ <--
+        // SY <--

        // DB indexes
        execSQL(MangaTable.createUrlIndexQuery)
@@ -49,23 +47,30 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
        execSQL(ChapterTable.createMangaIdIndexQuery)
        execSQL(ChapterTable.createUnreadChaptersIndexQuery)
        execSQL(HistoryTable.createChapterIdIndexQuery)
-        // EXH -->
-        db.execSQL(SearchMetadataTable.createUploaderIndexQuery)
-        db.execSQL(SearchMetadataTable.createIndexedExtraIndexQuery)
-        db.execSQL(SearchTagTable.createMangaIdIndexQuery)
-        db.execSQL(SearchTagTable.createNamespaceNameIndexQuery)
-        db.execSQL(SearchTitleTable.createMangaIdIndexQuery)
-        db.execSQL(SearchTitleTable.createTitleIndexQuery)
-        // EXH <--
-        // AZ -->
+        // SY -->
+        execSQL(SearchMetadataTable.createUploaderIndexQuery)
+        execSQL(SearchMetadataTable.createIndexedExtraIndexQuery)
+        execSQL(SearchTagTable.createMangaIdIndexQuery)
+        execSQL(SearchTagTable.createNamespaceNameIndexQuery)
+        execSQL(SearchTitleTable.createMangaIdIndexQuery)
+        execSQL(SearchTitleTable.createTitleIndexQuery)
        execSQL(MergedTable.createIndexQuery)
-        // AZ <--
+        // SY <--
    }

    override fun onUpgrade(db: SupportSQLiteDatabase, oldVersion: Int, newVersion: Int) {
        if (oldVersion < 2) {
            db.execSQL(MangaTable.addCoverLastModified)
        }
+        if (oldVersion < 3) {
+            db.execSQL(MangaTable.addDateAdded)
+            db.execSQL(MangaTable.backfillDateAdded)
+        }
+        if (oldVersion < 12) {
+            db.execSQL(MergedTable.dropTableQuery)
+            db.execSQL(MergedTable.createTableQuery)
+            db.execSQL(MergedTable.createIndexQuery)
+        }
    }

    override fun onConfigure(db: SupportSQLiteDatabase) {
@@ -15,6 +15,7 @@ import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_ARTIST
 import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_AUTHOR
 import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_CHAPTER_FLAGS
 import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_COVER_LAST_MODIFIED
+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_GENRE
@@ -47,15 +48,17 @@ class MangaPutResolver : DefaultPutResolver<Manga>() {
        .whereArgs(obj.id)
        .build()

-    override fun mapToContentValues(obj: Manga) = ContentValues(15).apply {
+    override fun mapToContentValues(obj: Manga) = ContentValues(17).apply {
        put(COL_ID, obj.id)
        put(COL_SOURCE, obj.source)
        put(COL_URL, obj.url)
-        put(COL_ARTIST, obj.artist)
-        put(COL_AUTHOR, obj.author)
-        put(COL_DESCRIPTION, obj.description)
-        put(COL_GENRE, obj.genre)
-        put(COL_TITLE, obj.title)
+        // SY -->
+        put(COL_ARTIST, obj.originalArtist)
+        put(COL_AUTHOR, obj.originalAuthor)
+        put(COL_DESCRIPTION, obj.originalDescription)
+        put(COL_GENRE, obj.originalGenre)
+        put(COL_TITLE, obj.originalTitle)
+        // SY <--
        put(COL_STATUS, obj.status)
        put(COL_THUMBNAIL_URL, obj.thumbnail_url)
        put(COL_FAVORITE, obj.favorite)
@@ -64,6 +67,7 @@ class MangaPutResolver : DefaultPutResolver<Manga>() {
        put(COL_VIEWER, obj.viewer)
        put(COL_CHAPTER_FLAGS, obj.chapter_flags)
        put(COL_COVER_LAST_MODIFIED, obj.cover_last_modified)
+        put(COL_DATE_ADDED, obj.date_added)
    }
 }

@@ -85,6 +89,7 @@ interface BaseMangaGetResolver {
        viewer = cursor.getInt(cursor.getColumnIndex(COL_VIEWER))
        chapter_flags = cursor.getInt(cursor.getColumnIndex(COL_CHAPTER_FLAGS))
        cover_last_modified = cursor.getLong(cursor.getColumnIndex(COL_COVER_LAST_MODIFIED))
+        date_added = cursor.getLong(cursor.getColumnIndex(COL_DATE_ADDED))
    }
 }

@@ -16,9 +16,6 @@ interface Category : Serializable {
    var mangaOrder: List<Long>
    // SY <--

-    val nameLower: String
-        get() = name.toLowerCase()
-
    companion object {

        fun create(name: String): Category = CategoryImpl().apply {
@@ -19,7 +19,6 @@ class CategoryImpl : Category {
        if (other == null || javaClass != other.javaClass) return false

        val category = other as Category
-
        return name == category.name
    }

@@ -31,10 +31,11 @@ class ChapterImpl : Chapter {
        if (other == null || javaClass != other.javaClass) return false

        val chapter = other as Chapter
-        return url == chapter.url
+        if (url != chapter.url) return false
+        return id == chapter.id
    }

    override fun hashCode(): Int {
-        return url.hashCode()
+        return url.hashCode() + id.hashCode()
    }
 }
@@ -5,4 +5,8 @@ class LibraryManga : MangaImpl() {
    var unread: Int = 0

    var category: Int = 0
+
+    // SY -->
+    var read: Int = 0
+    // SY <--
 }
@@ -12,6 +12,8 @@ interface Manga : SManga {

    var last_update: Long

+    var date_added: Long
+
    var viewer: Int

    var chapter_flags: Int
@@ -22,10 +24,6 @@ interface Manga : SManga {
        setFlags(order, SORT_MASK)
    }

-    private fun setFlags(flag: Int, mask: Int) {
-        chapter_flags = chapter_flags and mask.inv() or (flag and mask)
-    }
-
    fun sortDescending(): Boolean {
        return chapter_flags and SORT_MASK == SORT_DESC
    }
@@ -34,6 +32,16 @@ interface Manga : SManga {
        return genre?.split(", ")?.map { it.trim() }
    }

+    // SY -->
+    fun getOriginalGenres(): List<String>? {
+        return originalGenre?.split(", ")?.map { it.trim() }
+    }
+    // SY <--
+
+    private fun setFlags(flag: Int, mask: Int) {
+        chapter_flags = chapter_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
@@ -1,5 +1,8 @@
 package eu.kanade.tachiyomi.data.database.models

+import eu.kanade.tachiyomi.data.library.CustomMangaManager
+import uy.kohesive.injekt.injectLazy
+
 open class MangaImpl : Manga {

    override var id: Long? = null
@@ -9,17 +12,36 @@ open class MangaImpl : Manga {
    override lateinit var url: String

    // SY -->
-    override var title: String = ""
+    private val customMangaManager: CustomMangaManager by injectLazy()
+
+    override var title: String
+        get() = if (favorite) {
+            val customTitle = customMangaManager.getManga(this)?.title
+            if (customTitle.isNullOrBlank()) ogTitle else customTitle
+        } else {
+            ogTitle
+        }
+        set(value) {
+            ogTitle = value
+        }
+
+    override var author: String?
+        get() = if (favorite) customMangaManager.getManga(this)?.author ?: ogAuthor else ogAuthor
+        set(value) { ogAuthor = value }
+
+    override var artist: String?
+        get() = if (favorite) customMangaManager.getManga(this)?.artist ?: ogArtist else ogArtist
+        set(value) { ogArtist = value }
+
+    override var description: String?
+        get() = if (favorite) customMangaManager.getManga(this)?.description ?: ogDesc else ogDesc
+        set(value) { ogDesc = value }
+
+    override var genre: String?
+        get() = if (favorite) customMangaManager.getManga(this)?.genre ?: ogGenre else ogGenre
+        set(value) { ogGenre = value }
    // SY <--

-    override var artist: String? = null
-
-    override var author: String? = null
-
-    override var description: String? = null
-
-    override var genre: String? = null
-
    override var status: Int = 0

    override var thumbnail_url: String? = null
@@ -28,6 +50,8 @@ open class MangaImpl : Manga {

    override var last_update: Long = 0

+    override var date_added: Long = 0
+
    override var initialized: Boolean = false

    override var viewer: Int = 0
@@ -36,16 +60,29 @@ open class MangaImpl : Manga {

    override var cover_last_modified: Long = 0

+    // SY -->
+    lateinit var ogTitle: String
+        private set
+    var ogAuthor: String? = null
+        private set
+    var ogArtist: String? = null
+        private set
+    var ogDesc: String? = null
+        private set
+    var ogGenre: String? = null
+        private set
+    // SY <--
+
    override fun equals(other: Any?): Boolean {
        if (this === other) return true
        if (other == null || javaClass != other.javaClass) return false

        val manga = other as Manga
-
-        return url == manga.url
+        if (url != manga.url) return false
+        return id == manga.id
    }

    override fun hashCode(): Int {
-        return url.hashCode()
+        return url.hashCode() + id.hashCode()
    }
 }
@@ -15,9 +15,9 @@ import java.util.Date

 interface ChapterQueries : DbProvider {
    // SY -->
-    fun getChapters(manga: Manga) = getChaptersByMangaId(manga.id)
+    fun getChapters(manga: Manga) = getChapters(manga.id)

-    fun getChaptersByMangaId(mangaId: Long?) = db.get()
+    fun getChapters(mangaId: Long?) = db.get()
        .listOfObjects(Chapter::class.java)
        .withQuery(
            Query.builder()
@@ -27,15 +27,6 @@ interface ChapterQueries : DbProvider {
                .build()
        )
        .prepare()
-
-    fun getChaptersByMergedMangaId(mangaId: Long) = db.get()
-        .listOfObjects(Chapter::class.java)
-        .withQuery(
-            RawQuery.builder()
-                .query(getMergedChaptersQuery(mangaId))
-                .build()
-        )
-        .prepare()
    // SY <--

    fun getRecentChapters(date: Date) = db.get()
@@ -94,6 +85,17 @@ interface ChapterQueries : DbProvider {
                .build()
        )
        .prepare()
+
+    fun getChaptersReadByUrls(urls: List<String>) = db.get()
+        .listOfObjects(Chapter::class.java)
+        .withQuery(
+            Query.builder()
+                .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()
+        )
+        .prepare()
    // SY <--

    fun insertChapter(chapter: Chapter) = db.put().`object`(chapter).prepare()
@@ -10,6 +10,7 @@ import eu.kanade.tachiyomi.data.database.resolvers.LibraryMangaGetResolver
 import eu.kanade.tachiyomi.data.database.resolvers.MangaCoverLastModifiedPutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.MangaFavoritePutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.MangaFlagsPutResolver
+import eu.kanade.tachiyomi.data.database.resolvers.MangaInfoPutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.MangaLastUpdatedPutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.MangaTitlePutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.MangaViewerPutResolver
@@ -17,6 +18,7 @@ import eu.kanade.tachiyomi.data.database.tables.CategoryTable
 import eu.kanade.tachiyomi.data.database.tables.ChapterTable
 import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable
 import eu.kanade.tachiyomi.data.database.tables.MangaTable
+import exh.merged.sql.tables.MergedTable
 import exh.metadata.sql.tables.SearchMetadataTable

 interface MangaQueries : DbProvider {
@@ -76,13 +78,14 @@ interface MangaQueries : DbProvider {
        .prepare()

    // SY -->
-    fun getMergedMangas(id: Long) = db.get()
-        .listOfObjects(Manga::class.java)
-        .withQuery(
-            RawQuery.builder()
-                .query(getMergedMangaQuery(id))
-                .build()
-        )
+    fun updateMangaInfo(manga: Manga) = db.put()
+        .`object`(manga)
+        .withPutResolver(MangaInfoPutResolver())
+        .prepare()
+
+    fun resetMangaInfo(manga: Manga) = db.put()
+        .`object`(manga)
+        .withPutResolver(MangaInfoPutResolver(true))
        .prepare()
    // SY <--

@@ -128,7 +131,7 @@ interface MangaQueries : DbProvider {
        .byQuery(
            DeleteQuery.builder()
                .table(MangaTable.TABLE)
-                .where("${MangaTable.COL_FAVORITE} = ?")
+                .where("${MangaTable.COL_FAVORITE} = ? AND ${MangaTable.COL_ID} NOT IN (SELECT ${MergedTable.COL_MANGA_ID} FROM ${MergedTable.TABLE})")
                .whereArgs(0)
                .build()
        )
@@ -1,21 +1,48 @@
 package eu.kanade.tachiyomi.data.database.queries

+import exh.MERGED_SOURCE_ID
 import eu.kanade.tachiyomi.data.database.tables.CategoryTable as Category
 import eu.kanade.tachiyomi.data.database.tables.ChapterTable as Chapter
 import eu.kanade.tachiyomi.data.database.tables.HistoryTable as History
 import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable as MangaCategory
 import eu.kanade.tachiyomi.data.database.tables.MangaTable as Manga
-import eu.kanade.tachiyomi.data.database.tables.MergedTable as Merged
+import exh.merged.sql.tables.MergedTable as Merged

 // SY -->
 /**
 * Query to get the manga merged into a merged manga
 */
-fun getMergedMangaQuery(id: Long) =
+fun getMergedMangaQuery() =
    """
    SELECT ${Manga.TABLE}.*
    FROM (
-        SELECT ${Merged.COL_MANGA_ID} FROM ${Merged.TABLE} WHERE $(Merged.COL_MERGE_ID} = $id
+        SELECT ${Merged.COL_MANGA_ID} FROM ${Merged.TABLE} WHERE ${Merged.COL_MERGE_ID} = ?
+    ) AS M
+    JOIN ${Manga.TABLE}
+    ON ${Manga.TABLE}.${Manga.COL_ID} = M.${Merged.COL_MANGA_ID}
+"""
+
+/**
+ * Query to get all the manga that are merged into other manga
+ */
+fun getAllMergedMangaQuery() =
+    """
+    SELECT ${Manga.TABLE}.*
+    FROM (
+        SELECT ${Merged.COL_MANGA_ID} FROM ${Merged.TABLE}
+    ) AS M
+    JOIN ${Manga.TABLE}
+    ON ${Manga.TABLE}.${Manga.COL_ID} = M.${Merged.COL_MANGA_ID}
+"""
+
+/**
+ * Query to get the manga merged into a merged manga using the Url
+ */
+fun getMergedMangaFromUrlQuery() =
+    """
+    SELECT ${Manga.TABLE}.*
+    FROM (
+        SELECT ${Merged.COL_MANGA_ID} FROM ${Merged.TABLE} WHERE ${Merged.COL_MERGE_URL} = ?
    ) AS M
    JOIN ${Manga.TABLE}
    ON ${Manga.TABLE}.${Manga.COL_ID} = M.${Merged.COL_MANGA_ID}
@@ -24,16 +51,15 @@ fun getMergedMangaQuery(id: Long) =
 /**
 * Query to get the chapters of all manga in a merged manga
 */
-fun getMergedChaptersQuery(id: Long) =
+fun getMergedChaptersQuery() =
    """
    SELECT ${Chapter.TABLE}.*
    FROM (
-        SELECT ${Merged.COL_MANGA_ID} FROM ${Merged.TABLE} WHERE $(Merged.COL_MERGE_ID} = $id
+        SELECT ${Merged.COL_MANGA_ID} FROM ${Merged.TABLE} WHERE ${Merged.COL_MERGE_ID} = ?
    ) AS M
    JOIN ${Chapter.TABLE}
    ON ${Chapter.TABLE}.${Chapter.COL_MANGA_ID} = M.${Merged.COL_MANGA_ID}
 """
-// SY <--

 /**
 * Query to get the manga from the library, with their categories and unread count.
@@ -42,23 +68,55 @@ val libraryQuery =
    """
    SELECT M.*, COALESCE(MC.${MangaCategory.COL_CATEGORY_ID}, 0) AS ${Manga.COL_CATEGORY}
    FROM (
-        SELECT ${Manga.TABLE}.*, COALESCE(C.unread, 0) AS ${Manga.COL_UNREAD}
-        FROM ${Manga.TABLE}
-        LEFT JOIN (
-            SELECT ${Chapter.COL_MANGA_ID}, COUNT(*) AS unread
-            FROM ${Chapter.TABLE}
-            WHERE ${Chapter.COL_READ} = 0
-            GROUP BY ${Chapter.COL_MANGA_ID}
-        ) AS C
-        ON ${Manga.COL_ID} = C.${Chapter.COL_MANGA_ID}
-        WHERE ${Manga.COL_FAVORITE} = 1
-        GROUP BY ${Manga.COL_ID}
+        SELECT ${Manga.TABLE}.*, COALESCE(C.unread, 0) AS ${Manga.COL_UNREAD}, COALESCE(R.read, 0) AS ${Manga.COL_READ}
+            FROM ${Manga.TABLE}
+            LEFT JOIN (
+                SELECT ${Chapter.TABLE}.${Chapter.COL_MANGA_ID}, COUNT(*) AS unread
+                FROM ${Chapter.TABLE}
+                WHERE ${Chapter.COL_READ} = 0
+                GROUP BY ${Chapter.TABLE}.${Chapter.COL_MANGA_ID}
+            ) AS C
+            ON ${Manga.TABLE}.${Manga.COL_ID} = C.${Chapter.COL_MANGA_ID}
+            LEFT JOIN (
+                SELECT ${Chapter.COL_MANGA_ID}, COUNT(*) AS read
+                FROM ${Chapter.TABLE}
+                WHERE ${Chapter.COL_READ} = 1
+                GROUP BY ${Chapter.COL_MANGA_ID}
+            ) AS R
+            ON ${Manga.TABLE}.${Manga.COL_ID} = R.${Chapter.COL_MANGA_ID}
+            WHERE ${Manga.COL_FAVORITE} = 1 AND ${Manga.COL_SOURCE} <> $MERGED_SOURCE_ID
+            GROUP BY ${Manga.TABLE}.${Manga.COL_ID}
+        UNION
+        SELECT ${Manga.TABLE}.*, COALESCE(C.unread, 0) AS ${Manga.COL_UNREAD}, COALESCE(R.read, 0) AS ${Manga.COL_READ}
+            FROM ${Manga.TABLE}
+            LEFT JOIN (
+                SELECT ${Merged.TABLE}.${Merged.COL_MERGE_ID}, COUNT(*) as unread
+                FROM ${Merged.TABLE}
+                JOIN ${Chapter.TABLE}
+                ON ${Chapter.TABLE}.${Chapter.COL_MANGA_ID} = ${Merged.TABLE}.${Merged.COL_MANGA_ID}
+                WHERE ${Chapter.TABLE}.${Chapter.COL_READ} = 0
+                GROUP BY ${Merged.TABLE}.${Merged.COL_MERGE_ID}
+            ) AS C
+            ON ${Manga.TABLE}.${Manga.COL_ID} = C.${Merged.COL_MERGE_ID}
+            LEFT JOIN (
+                SELECT ${Merged.TABLE}.${Merged.COL_MERGE_ID}, COUNT(*) as read
+                FROM ${Merged.TABLE}
+                JOIN ${Chapter.TABLE}
+                ON ${Chapter.TABLE}.${Chapter.COL_MANGA_ID} = ${Merged.TABLE}.${Merged.COL_MANGA_ID}
+                WHERE ${Chapter.TABLE}.${Chapter.COL_READ} = 1
+                GROUP BY ${Merged.TABLE}.${Merged.COL_MERGE_ID}
+            ) AS R
+            ON ${Manga.TABLE}.${Manga.COL_ID} = R.${Merged.COL_MERGE_ID}
+            WHERE ${Manga.COL_FAVORITE} = 1 AND ${Manga.COL_SOURCE} = $MERGED_SOURCE_ID
+            GROUP BY ${Manga.TABLE}.${Manga.COL_ID}
        ORDER BY ${Manga.COL_TITLE}
    ) AS M
    LEFT JOIN (
-        SELECT * FROM ${MangaCategory.TABLE}) AS MC
-        ON MC.${MangaCategory.COL_MANGA_ID} = M.${Manga.COL_ID}
+            SELECT * FROM ${MangaCategory.TABLE}
+        ) AS MC
+        ON MC.${MangaCategory.COL_MANGA_ID} = M.${Manga.COL_ID};
 """
+// SY <--

 /**
 * Query to get the recent chapters of manga from the library up to a date.
@@ -67,7 +125,9 @@ fun getRecentsQuery() =
    """
    SELECT ${Manga.TABLE}.${Manga.COL_URL} as mangaUrl, * FROM ${Manga.TABLE} JOIN ${Chapter.TABLE}
    ON ${Manga.TABLE}.${Manga.COL_ID} = ${Chapter.TABLE}.${Chapter.COL_MANGA_ID}
-    WHERE ${Manga.COL_FAVORITE} = 1 AND ${Chapter.COL_DATE_UPLOAD} > ?
+    WHERE ${Manga.COL_FAVORITE} = 1 
+    AND ${Chapter.COL_DATE_UPLOAD} > ?
+    AND ${Chapter.COL_DATE_FETCH} > ${Manga.COL_DATE_ADDED}
    ORDER BY ${Chapter.COL_DATE_UPLOAD} DESC
 """

@@ -18,6 +18,9 @@ class LibraryMangaGetResolver : DefaultGetResolver<LibraryManga>(), BaseMangaGet
        mapBaseFromCursor(manga, cursor)
        manga.unread = cursor.getInt(cursor.getColumnIndex(MangaTable.COL_UNREAD))
        manga.category = cursor.getInt(cursor.getColumnIndex(MangaTable.COL_CATEGORY))
+        // SY -->
+        manga.read = cursor.getInt(cursor.getColumnIndex(MangaTable.COL_READ))
+        // SY <--

        return manga
    }
@@ -0,0 +1,44 @@
+package eu.kanade.tachiyomi.data.database.resolvers
+
+import android.content.ContentValues
+import com.pushtorefresh.storio.sqlite.StorIOSQLite
+import com.pushtorefresh.storio.sqlite.operations.put.PutResolver
+import com.pushtorefresh.storio.sqlite.operations.put.PutResult
+import com.pushtorefresh.storio.sqlite.queries.UpdateQuery
+import eu.kanade.tachiyomi.data.database.inTransactionReturn
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.tables.MangaTable
+
+class MangaInfoPutResolver(val reset: Boolean = false) : PutResolver<Manga>() {
+
+    override fun performPut(db: StorIOSQLite, manga: Manga) = db.inTransactionReturn {
+        val updateQuery = mapToUpdateQuery(manga)
+        val contentValues = if (reset) resetToContentValues(manga) else mapToContentValues(manga)
+
+        val numberOfRowsUpdated = db.lowLevel().update(updateQuery, contentValues)
+        PutResult.newUpdateResult(numberOfRowsUpdated, updateQuery.table())
+    }
+
+    fun mapToUpdateQuery(manga: Manga) = UpdateQuery.builder()
+        .table(MangaTable.TABLE)
+        .where("${MangaTable.COL_ID} = ?")
+        .whereArgs(manga.id)
+        .build()
+
+    fun mapToContentValues(manga: Manga) = ContentValues(1).apply {
+        put(MangaTable.COL_TITLE, manga.originalTitle)
+        put(MangaTable.COL_GENRE, manga.originalGenre)
+        put(MangaTable.COL_AUTHOR, manga.originalAuthor)
+        put(MangaTable.COL_ARTIST, manga.originalArtist)
+        put(MangaTable.COL_DESCRIPTION, manga.originalDescription)
+    }
+
+    fun resetToContentValues(manga: Manga) = ContentValues(1).apply {
+        val splitter = "▒ ▒∩▒"
+        put(MangaTable.COL_TITLE, manga.title.split(splitter).last())
+        put(MangaTable.COL_GENRE, manga.genre?.split(splitter)?.lastOrNull())
+        put(MangaTable.COL_AUTHOR, manga.author?.split(splitter)?.lastOrNull())
+        put(MangaTable.COL_ARTIST, manga.artist?.split(splitter)?.lastOrNull())
+        put(MangaTable.COL_DESCRIPTION, manga.description?.split(splitter)?.lastOrNull())
+    }
+}
@@ -0,0 +1,32 @@
+package eu.kanade.tachiyomi.data.database.resolvers
+
+import android.content.ContentValues
+import com.pushtorefresh.storio.sqlite.StorIOSQLite
+import com.pushtorefresh.storio.sqlite.operations.put.PutResolver
+import com.pushtorefresh.storio.sqlite.operations.put.PutResult
+import com.pushtorefresh.storio.sqlite.queries.UpdateQuery
+import eu.kanade.tachiyomi.data.database.inTransactionReturn
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.tables.MangaTable
+
+// [EXH]
+class MangaUrlPutResolver : PutResolver<Manga>() {
+
+    override fun performPut(db: StorIOSQLite, manga: Manga) = db.inTransactionReturn {
+        val updateQuery = mapToUpdateQuery(manga)
+        val contentValues = mapToContentValues(manga)
+
+        val numberOfRowsUpdated = db.lowLevel().update(updateQuery, contentValues)
+        PutResult.newUpdateResult(numberOfRowsUpdated, updateQuery.table())
+    }
+
+    fun mapToUpdateQuery(manga: Manga) = UpdateQuery.builder()
+        .table(MangaTable.TABLE)
+        .where("${MangaTable.COL_ID} = ?")
+        .whereArgs(manga.id)
+        .build()
+
+    fun mapToContentValues(manga: Manga) = ContentValues(1).apply {
+        put(MangaTable.COL_URL, manga.url)
+    }
+}
@@ -28,6 +28,8 @@ object MangaTable {

    const val COL_LAST_UPDATE = "last_update"

+    const val COL_DATE_ADDED = "date_added"
+
    const val COL_INITIALIZED = "initialized"

    const val COL_VIEWER = "viewer"
@@ -36,6 +38,10 @@ object MangaTable {

    const val COL_UNREAD = "unread"

+    // SY ->>
+    const val COL_READ = "read"
+    // SY <--
+
    const val COL_CATEGORY = "category"

    const val COL_COVER_LAST_MODIFIED = "cover_last_modified"
@@ -58,7 +64,8 @@ object MangaTable {
            $COL_INITIALIZED BOOLEAN NOT NULL,
            $COL_VIEWER INTEGER NOT NULL,
            $COL_CHAPTER_FLAGS INTEGER NOT NULL,
-            $COL_COVER_LAST_MODIFIED LONG NOT NULL
+            $COL_COVER_LAST_MODIFIED LONG NOT NULL,
+            $COL_DATE_ADDED LONG NOT NULL
            )"""

    val createUrlIndexQuery: String
@@ -70,4 +77,17 @@ object MangaTable {

    val addCoverLastModified: String
        get() = "ALTER TABLE $TABLE ADD COLUMN $COL_COVER_LAST_MODIFIED LONG NOT NULL DEFAULT 0"
+
+    val addDateAdded: String
+        get() = "ALTER TABLE $TABLE ADD COLUMN $COL_DATE_ADDED LONG NOT NULL DEFAULT 0"
+
+    /**
+     * Used with addDateAdded to populate it with the oldest chapter fetch date.
+     */
+    val backfillDateAdded: String
+        get() = "UPDATE $TABLE SET $COL_DATE_ADDED = " +
+            "(SELECT MIN(${ChapterTable.COL_DATE_FETCH}) " +
+            "FROM $TABLE INNER JOIN ${ChapterTable.TABLE} " +
+            "ON $TABLE.$COL_ID = ${ChapterTable.TABLE}.${ChapterTable.COL_MANGA_ID} " +
+            "GROUP BY $TABLE.$COL_ID)"
 }
@@ -1,20 +0,0 @@
-package eu.kanade.tachiyomi.data.database.tables
-
-object MergedTable {
-
-    const val TABLE = "merged"
-
-    const val COL_MERGE_ID = "mergeID"
-
-    const val COL_MANGA_ID = "mangaID"
-
-    val createTableQuery: String
-        get() =
-            """CREATE TABLE $TABLE(
-            $COL_MERGE_ID INTEGER NOT NULL,
-            $COL_MANGA_ID INTEGER NOT NULL
-            )"""
-
-    val createIndexQuery: String
-        get() = "CREATE INDEX ${TABLE}_${COL_MERGE_ID}_index ON $TABLE($COL_MERGE_ID)"
-}
@@ -1,16 +1,16 @@
 package eu.kanade.tachiyomi.data.download

 import android.content.Context
-import android.net.Uri
+import androidx.core.net.toUri
 import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.source.SourceManager
-import java.util.concurrent.TimeUnit
 import kotlinx.coroutines.flow.onEach
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
+import java.util.concurrent.TimeUnit

 /**
 * Cache where we dump the downloads directory from the filesystem. This class is needed because
@@ -59,7 +59,7 @@ class DownloadCache(
     */
    private fun getDirectoryFromPreference(): UniFile {
        val dir = preferences.downloadsDirectory().get()
-        return UniFile.fromUri(context, Uri.parse(dir))
+        return UniFile.fromUri(context, dir.toUri())
    }

    /**
@@ -81,7 +81,7 @@ class DownloadCache(
        if (sourceDir != null) {
            val mangaDir = sourceDir.files[provider.getMangaDirName(manga)]
            if (mangaDir != null) {
-                return provider.getChapterDirName(chapter) in mangaDir.files
+                return provider.getValidChapterDirNames(chapter).any { it in mangaDir.files || "$it.cbz" in mangaDir.files }
            }
        }
        return false
@@ -122,7 +122,9 @@ class DownloadCache(
     * Renews the downloads cache.
     */
    private fun renew() {
-        val onlineSources = sourceManager.getOnlineSources()
+        // SY -->
+        val onlineSources = sourceManager.getVisibleOnlineSources()
+        // SY <--

        val sourceDirs = rootDir.dir.listFiles()
            .orEmpty()
@@ -143,7 +145,7 @@ class DownloadCache(
            mangaDirs.values.forEach { mangaDir ->
                val chapterDirs = mangaDir.dir.listFiles()
                    .orEmpty()
-                    .mapNotNull { it.name }
+                    .mapNotNull { it.name?.replace(".cbz", "") }
                    .toHashSet()

                mangaDir.files = chapterDirs
@@ -191,12 +193,27 @@ class DownloadCache(
    fun removeChapter(chapter: Chapter, manga: Manga) {
        val sourceDir = rootDir.files[manga.source] ?: return
        val mangaDir = sourceDir.files[provider.getMangaDirName(manga)] ?: return
-        val chapterDirName = provider.getChapterDirName(chapter)
-        if (chapterDirName in mangaDir.files) {
-            mangaDir.files -= chapterDirName
+        provider.getValidChapterDirNames(chapter).forEach {
+            if (it in mangaDir.files) {
+                mangaDir.files -= it
+            } else if ("$it.cbz" in mangaDir.files) {
+                mangaDir.files -= "$it.cbz"
+            }
        }
    }

+    // SY -->
+    fun removeFolders(folders: List<String>, manga: Manga) {
+        val sourceDir = rootDir.files[manga.source] ?: return
+        val mangaDir = sourceDir.files[provider.getMangaDirName(manga)] ?: return
+        folders.forEach { chapter ->
+            if (chapter in mangaDir.files) {
+                mangaDir.files -= chapter
+            }
+        }
+    }
+    // SY <--
+
    /**
     * Removes a list of chapters that have been deleted from this cache.
     *
@@ -208,9 +225,12 @@ class DownloadCache(
        val sourceDir = rootDir.files[manga.source] ?: return
        val mangaDir = sourceDir.files[provider.getMangaDirName(manga)] ?: return
        chapters.forEach { chapter ->
-            val chapterDirName = provider.getChapterDirName(chapter)
-            if (chapterDirName in mangaDir.files) {
-                mangaDir.files -= chapterDirName
+            provider.getValidChapterDirNames(chapter).forEach {
+                if (it in mangaDir.files) {
+                    mangaDir.files -= it
+                } else if ("$it.cbz" in mangaDir.files) {
+                    mangaDir.files -= "$it.cbz"
+                }
            }
        }
    }
@@ -8,6 +8,7 @@ import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.download.model.Download
 import eu.kanade.tachiyomi.data.download.model.DownloadQueue
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.model.Page
@@ -22,12 +23,10 @@ import uy.kohesive.injekt.injectLazy
 *
 * @param context the application context.
 */
-class DownloadManager(private val context: Context) {
+class DownloadManager(/* SY private */ val context: Context) {

-    /**
-     * The sources manager.
-     */
-    private val sourceManager by injectLazy<SourceManager>()
+    private val sourceManager: SourceManager by injectLazy()
+    private val preferences: PreferencesHelper by injectLazy()

    /**
     * Downloads provider, used to retrieve the folders where the chapters are or should be stored.
@@ -199,16 +198,74 @@ class DownloadManager(private val context: Context) {
     * @param manga the manga of the chapters.
     * @param source the source of the chapters.
     */
-    fun deleteChapters(chapters: List<Chapter>, manga: Manga, source: Source) {
-        queue.remove(chapters)
-        val chapterDirs = provider.findChapterDirs(chapters, manga, source)
+    fun deleteChapters(chapters: List<Chapter>, manga: Manga, source: Source): List<Chapter> {
+        val filteredChapters = getChaptersToDelete(chapters)
+
+        queue.remove(filteredChapters)
+
+        val chapterDirs = provider.findChapterDirs(filteredChapters, manga, source)
        chapterDirs.forEach { it.delete() }
-        cache.removeChapters(chapters, manga)
+        cache.removeChapters(filteredChapters, manga)
        if (cache.getDownloadCount(manga) == 0) { // Delete manga directory if empty
            chapterDirs.firstOrNull()?.parentFile?.delete()
        }
+
+        return filteredChapters
    }

+    // SY -->
+    /**
+     * return the list of all manga folders
+     */
+    fun getMangaFolders(source: Source): List<UniFile> {
+        return provider.findSourceDir(source)?.listFiles()?.toList() ?: emptyList()
+    }
+
+    /**
+     * Deletes the directories of chapters that were read or have no match
+     *
+     * @param chapters the list of chapters to delete.
+     * @param manga the manga of the chapters.
+     * @param source the source of the chapters.
+     */
+    fun cleanupChapters(allChapters: List<Chapter>, manga: Manga, source: Source, removeRead: Boolean, removeNonFavorite: Boolean): Int {
+        var cleaned = 0
+
+        if (removeNonFavorite && !manga.favorite) {
+            val mangaFolder = provider.getMangaDir(manga, source)
+            cleaned += 1 + (mangaFolder.listFiles()?.size ?: 0)
+            mangaFolder.delete()
+            cache.removeManga(manga)
+            return cleaned
+        }
+
+        val filesWithNoChapter = provider.findUnmatchedChapterDirs(allChapters, manga, source)
+        cleaned += filesWithNoChapter.size
+        cache.removeFolders(filesWithNoChapter.mapNotNull { it.name }, manga)
+        filesWithNoChapter.forEach { it.delete() }
+
+        if (removeRead) {
+            val readChapters = allChapters.filter { it.read }
+            val readChapterDirs = provider.findChapterDirs(readChapters, manga, source)
+            readChapterDirs.forEach { it.delete() }
+            cleaned += readChapterDirs.size
+            cache.removeChapters(readChapters, manga)
+        }
+
+        if (cache.getDownloadCount(manga) == 0) {
+            val mangaFolder = provider.getMangaDir(manga, source)
+            val size = mangaFolder.listFiles()?.size ?: 0
+            if (size == 0) {
+                mangaFolder.delete()
+                cache.removeManga(manga)
+            } else {
+                Timber.e("Cache and download folder doesn't match for %s", manga.title)
+            }
+        }
+        return cleaned
+    }
+    // SY <--
+
    /**
     * Deletes the directory of a downloaded manga.
     *
@@ -228,7 +285,7 @@ class DownloadManager(private val context: Context) {
     * @param manga the manga of the chapters.
     */
    fun enqueueDeleteChapters(chapters: List<Chapter>, manga: Manga) {
-        pendingDeleter.addChapters(chapters, manga)
+        pendingDeleter.addChapters(getChaptersToDelete(chapters), manga)
    }

    /**
@@ -251,16 +308,28 @@ class DownloadManager(private val context: Context) {
     * @param newChapter the target chapter with the new name.
     */
    fun renameChapter(source: Source, manga: Manga, oldChapter: Chapter, newChapter: Chapter) {
-        val oldName = provider.getChapterDirName(oldChapter)
+        val oldNames = provider.getValidChapterDirNames(oldChapter)
        val newName = provider.getChapterDirName(newChapter)
        val mangaDir = provider.getMangaDir(manga, source)

-        val oldFolder = mangaDir.findFile(oldName)
-        if (oldFolder?.renameTo(newName) == true) {
+        // Assume there's only 1 version of the chapter name formats present
+        val oldFolder = oldNames.asSequence()
+            .mapNotNull { mangaDir.findFile(it) ?: mangaDir.findFile("$it.cbz") }
+            .firstOrNull()
+
+        if (oldFolder?.renameTo(newName + if (oldFolder.name?.endsWith(".cbz") == true) ".cbz" else "") == true) {
            cache.removeChapter(oldChapter, manga)
-            cache.addChapter(newName, mangaDir, manga)
+            cache.addChapter(newName + if (oldFolder.name?.endsWith(".cbz") == true) ".cbz" else "", mangaDir, manga)
        } else {
-            Timber.e("Could not rename downloaded chapter: %s.", oldName)
+            Timber.e("Could not rename downloaded chapter: %s.", oldNames.joinToString())
+        }
+    }
+
+    private fun getChaptersToDelete(chapters: List<Chapter>): List<Chapter> {
+        return if (!preferences.removeBookmarkedChapters()) {
+            chapters.filterNot { it.bookmark }
+        } else {
+            chapters
        }
    }
 }
@@ -12,9 +12,8 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.util.lang.chop
 import eu.kanade.tachiyomi.util.system.notificationBuilder
 import eu.kanade.tachiyomi.util.system.notificationManager
+import uy.kohesive.injekt.injectLazy
 import java.util.regex.Pattern
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get

 /**
 * DownloadNotifier is used to show notifications when downloading one or multiple chapters.
@@ -23,16 +22,29 @@ import uy.kohesive.injekt.api.get
 */
 internal class DownloadNotifier(private val context: Context) {

-    private val notificationBuilder = context.notificationBuilder(Notifications.CHANNEL_DOWNLOADER) {
-        setLargeIcon(BitmapFactory.decodeResource(context.resources, R.mipmap.ic_launcher))
+    private val preferences: PreferencesHelper by injectLazy()
+
+    private val progressNotificationBuilder by lazy {
+        context.notificationBuilder(Notifications.CHANNEL_DOWNLOADER_PROGRESS) {
+            setLargeIcon(BitmapFactory.decodeResource(context.resources, R.mipmap.ic_launcher))
+        }
    }

-    private val preferences by lazy { Injekt.get<PreferencesHelper>() }
+    private val completeNotificationBuilder by lazy {
+        context.notificationBuilder(Notifications.CHANNEL_DOWNLOADER_COMPLETE) {
+            setAutoCancel(false)
+        }
+    }
+
+    private val errorNotificationBuilder by lazy {
+        context.notificationBuilder(Notifications.CHANNEL_DOWNLOADER_ERROR) {
+            setAutoCancel(false)
+        }
+    }

    /**
     * Status of download. Used for correct notification icon.
     */
-    @Volatile
    private var isDownloading = false

    /**
@@ -50,14 +62,14 @@ internal class DownloadNotifier(private val context: Context) {
     *
     * @param id the id of the notification.
     */
-    private fun NotificationCompat.Builder.show(id: Int = Notifications.ID_DOWNLOAD_CHAPTER) {
+    private fun NotificationCompat.Builder.show(id: Int) {
        context.notificationManager.notify(id, build())
    }

    /**
     * Clear old actions if they exist.
     */
-    private fun clearActions() = with(notificationBuilder) {
+    private fun NotificationCompat.Builder.clearActions() {
        if (mActions.isNotEmpty()) {
            mActions.clear()
        }
@@ -67,8 +79,8 @@ internal class DownloadNotifier(private val context: Context) {
     * Dismiss the downloader's notification. Downloader error notifications use a different id, so
     * those can only be dismissed by the user.
     */
-    fun dismiss() {
-        context.notificationManager.cancel(Notifications.ID_DOWNLOAD_CHAPTER)
+    fun dismissProgress() {
+        context.notificationManager.cancel(Notifications.ID_DOWNLOAD_CHAPTER_PROGRESS)
    }

    /**
@@ -77,8 +89,7 @@ internal class DownloadNotifier(private val context: Context) {
     * @param download download object containing download information.
     */
    fun onProgressChange(download: Download) {
-        // Create notification
-        with(notificationBuilder) {
+        with(progressNotificationBuilder) {
            // Check if first call.
            if (!isDownloading) {
                setSmallIcon(android.R.drawable.stat_sys_download)
@@ -96,7 +107,9 @@ internal class DownloadNotifier(private val context: Context) {
            }

            val downloadingProgressText = context.getString(
-                R.string.chapter_downloading_progress, download.downloadedImages, download.pages!!.size
+                R.string.chapter_downloading_progress,
+                download.downloadedImages,
+                download.pages!!.size
            )

            if (preferences.hideNotificationContent()) {
@@ -110,17 +123,16 @@ internal class DownloadNotifier(private val context: Context) {
            }

            setProgress(download.pages!!.size, download.downloadedImages, false)
-        }

-        // Displays the progress bar on notification
-        notificationBuilder.show()
+            show(Notifications.ID_DOWNLOAD_CHAPTER_PROGRESS)
+        }
    }

    /**
     * Show notification when download is paused.
     */
-    fun onDownloadPaused() {
-        with(notificationBuilder) {
+    fun onPaused() {
+        with(progressNotificationBuilder) {
            setContentTitle(context.getString(R.string.chapter_paused))
            setContentText(context.getString(R.string.download_notifier_download_paused))
            setSmallIcon(R.drawable.ic_pause_24dp)
@@ -141,22 +153,45 @@ internal class DownloadNotifier(private val context: Context) {
                context.getString(R.string.action_cancel_all),
                NotificationReceiver.clearDownloadsPendingBroadcast(context)
            )
+
+            show(Notifications.ID_DOWNLOAD_CHAPTER_PROGRESS)
        }

-        // Show notification.
-        notificationBuilder.show()
-
        // Reset initial values
        isDownloading = false
    }

+    /**
+     *  This function shows a notification to inform download tasks are done.
+     */
+    fun onComplete() {
+        if (!errorThrown) {
+            // Create notification
+            with(completeNotificationBuilder) {
+                setContentTitle(context.getString(R.string.download_notifier_downloader_title))
+                setContentText(context.getString(R.string.download_notifier_download_finish))
+                setSmallIcon(android.R.drawable.stat_sys_download_done)
+                clearActions()
+                setAutoCancel(true)
+                setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context))
+                setProgress(0, 0, false)
+
+                show(Notifications.ID_DOWNLOAD_CHAPTER_COMPLETE)
+            }
+        }
+
+        // Reset states to default
+        errorThrown = false
+        isDownloading = false
+    }
+
    /**
     * Called when the downloader receives a warning.
     *
     * @param reason the text to show.
     */
    fun onWarning(reason: String) {
-        with(notificationBuilder) {
+        with(errorNotificationBuilder) {
            setContentTitle(context.getString(R.string.download_notifier_downloader_title))
            setContentText(reason)
            setSmallIcon(android.R.drawable.stat_sys_warning)
@@ -164,8 +199,9 @@ internal class DownloadNotifier(private val context: Context) {
            clearActions()
            setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context))
            setProgress(0, 0, false)
+
+            show(Notifications.ID_DOWNLOAD_CHAPTER_ERROR)
        }
-        notificationBuilder.show()

        // Reset download information
        isDownloading = false
@@ -180,7 +216,7 @@ internal class DownloadNotifier(private val context: Context) {
     */
    fun onError(error: String? = null, chapter: String? = null) {
        // Create notification
-        with(notificationBuilder) {
+        with(errorNotificationBuilder) {
            setContentTitle(
                chapter
                    ?: context.getString(R.string.download_notifier_downloader_title)
@@ -191,8 +227,9 @@ internal class DownloadNotifier(private val context: Context) {
            setAutoCancel(false)
            setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context))
            setProgress(0, 0, false)
+
+            show(Notifications.ID_DOWNLOAD_CHAPTER_ERROR)
        }
-        notificationBuilder.show(Notifications.ID_DOWNLOAD_CHAPTER_ERROR)

        // Reset download information
        errorThrown = true
@@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi.data.download

 import android.content.Context
+import androidx.core.content.edit
 import com.github.salomonbrys.kotson.fromJson
 import com.google.gson.Gson
 import eu.kanade.tachiyomi.data.database.models.Chapter
@@ -22,7 +23,7 @@ class DownloadPendingDeleter(context: Context) {
    /**
     * Preferences used to store the list of chapters to delete.
     */
-    private val prefs = context.getSharedPreferences("chapters_to_delete", Context.MODE_PRIVATE)
+    private val preferences = context.getSharedPreferences("chapters_to_delete", Context.MODE_PRIVATE)

    /**
     * Last added chapter, used to avoid decoding from the preference too often.
@@ -49,7 +50,7 @@ class DownloadPendingDeleter(context: Context) {
            // Last entry matches the manga, reuse it to avoid decoding json from preferences
            lastEntry.copy(chapters = newChapters)
        } else {
-            val existingEntry = prefs.getString(manga.id!!.toString(), null)
+            val existingEntry = preferences.getString(manga.id!!.toString(), null)
            if (existingEntry != null) {
                // Existing entry found on preferences, decode json and add the new chapter
                val savedEntry = gson.fromJson<Entry>(existingEntry)
@@ -69,7 +70,9 @@ class DownloadPendingDeleter(context: Context) {

        // Save current state
        val json = gson.toJson(newEntry)
-        prefs.edit().putString(newEntry.manga.id.toString(), json).apply()
+        preferences.edit {
+            putString(newEntry.manga.id.toString(), json)
+        }
        lastAddedEntry = newEntry
    }

@@ -82,7 +85,9 @@ class DownloadPendingDeleter(context: Context) {
    @Synchronized
    fun getPendingChapters(): Map<Manga, List<Chapter>> {
        val entries = decodeAll()
-        prefs.edit().clear().apply()
+        preferences.edit {
+            clear()
+        }
        lastAddedEntry = null

        return entries.associate { entry ->
@@ -94,7 +99,7 @@ class DownloadPendingDeleter(context: Context) {
     * Decodes all the chapters from preferences.
     */
    private fun decodeAll(): List<Entry> {
-        return prefs.all.values.mapNotNull { rawEntry ->
+        return preferences.all.values.mapNotNull { rawEntry ->
            try {
                (rawEntry as? String)?.let { gson.fromJson<Entry>(it) }
            } catch (e: Exception) {
@@ -130,7 +135,8 @@ class DownloadPendingDeleter(context: Context) {
    private data class ChapterEntry(
        val id: Long,
        val url: String,
-        val name: String
+        val name: String,
+        val scanlator: String?
    )

    /**
@@ -154,7 +160,7 @@ class DownloadPendingDeleter(context: Context) {
     * Returns a chapter entry from a chapter model.
     */
    private fun Chapter.toEntry(): ChapterEntry {
-        return ChapterEntry(id!!, url, name)
+        return ChapterEntry(id!!, url, name, scanlator)
    }

    /**
@@ -174,6 +180,7 @@ class DownloadPendingDeleter(context: Context) {
            it.id = id
            it.url = url
            it.name = name
+            it.scanlator = scanlator
        }
    }
 }
@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.data.download

 import android.content.Context
-import android.net.Uri
+import androidx.core.net.toUri
 import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Chapter
@@ -32,14 +32,14 @@ class DownloadProvider(private val context: Context) {
     * The root directory for downloads.
     */
    private var downloadsDir = preferences.downloadsDirectory().get().let {
-        val dir = UniFile.fromUri(context, Uri.parse(it))
+        val dir = UniFile.fromUri(context, it.toUri())
        DiskUtil.createNoMediaFile(dir, context)
        dir
    }

    init {
        preferences.downloadsDirectory().asFlow()
-            .onEach { downloadsDir = UniFile.fromUri(context, Uri.parse(it)) }
+            .onEach { downloadsDir = UniFile.fromUri(context, it.toUri()) }
            .launchIn(scope)
    }

@@ -88,7 +88,9 @@ class DownloadProvider(private val context: Context) {
     */
    fun findChapterDir(chapter: Chapter, manga: Manga, source: Source): UniFile? {
        val mangaDir = findMangaDir(manga, source)
-        return mangaDir?.findFile(getChapterDirName(chapter))
+        return getValidChapterDirNames(chapter).asSequence()
+            .mapNotNull { mangaDir?.findFile(it) ?: mangaDir?.findFile("$it.cbz") }
+            .firstOrNull()
    }

    /**
@@ -100,9 +102,39 @@ class DownloadProvider(private val context: Context) {
     */
    fun findChapterDirs(chapters: List<Chapter>, manga: Manga, source: Source): List<UniFile> {
        val mangaDir = findMangaDir(manga, source) ?: return emptyList()
-        return chapters.mapNotNull { mangaDir.findFile(getChapterDirName(it)) }
+        return chapters.mapNotNull { chapter ->
+            getValidChapterDirNames(chapter).asSequence()
+                .mapNotNull { mangaDir.findFile(it) ?: mangaDir.findFile("$it.cbz") }
+                .firstOrNull()
+        }
    }

+    // SY -->
+    /**
+     * Returns a list of all files in manga directory
+     *
+     * @param chapters the chapters to query.
+     * @param manga the manga of the chapter.
+     * @param source the source of the chapter.
+     */
+    fun findUnmatchedChapterDirs(
+        chapters: List<Chapter>,
+        manga: Manga,
+        source: Source
+    ): List<UniFile> {
+        val mangaDir = findMangaDir(manga, source) ?: return emptyList()
+        return mangaDir.listFiles()!!.asList().filter {
+            (
+                chapters.find { chp ->
+                    getValidChapterDirNames(chp).any { dir ->
+                        mangaDir.findFile(dir) ?: mangaDir.findFile("$dir.cbz") != null
+                    }
+                } == null
+                ) || it.name?.endsWith(Downloader.TMP_DIR_SUFFIX) == true
+        }
+    }
+    // SY <--
+
    /**
     * Returns the download directory name for a source.
     *
@@ -118,7 +150,9 @@ class DownloadProvider(private val context: Context) {
     * @param manga the manga to query.
     */
    fun getMangaDirName(manga: Manga): String {
-        return DiskUtil.buildValidFilename(manga.title)
+        // SY -->
+        return DiskUtil.buildValidFilename(manga.originalTitle)
+        // SY <--
    }

    /**
@@ -127,6 +161,25 @@ class DownloadProvider(private val context: Context) {
     * @param chapter the chapter to query.
     */
    fun getChapterDirName(chapter: Chapter): String {
-        return DiskUtil.buildValidFilename(chapter.name)
+        return DiskUtil.buildValidFilename(
+            when {
+                chapter.scanlator != null -> "${chapter.scanlator}_${chapter.name}"
+                else -> chapter.name
+            }
+        )
+    }
+
+    /**
+     * Returns valid downloaded chapter directory names.
+     *
+     * @param chapter the chapter to query.
+     */
+    fun getValidChapterDirNames(chapter: Chapter): List<String> {
+        return listOf(
+            getChapterDirName(chapter),
+
+            // Legacy chapter directory name used in v0.9.2 and before
+            DiskUtil.buildValidFilename(chapter.name)
+        )
    }
 }
@@ -4,6 +4,7 @@ import android.app.Notification
 import android.app.Service
 import android.content.Context
 import android.content.Intent
+import android.net.ConnectivityManager
 import android.net.NetworkInfo.State.CONNECTED
 import android.net.NetworkInfo.State.DISCONNECTED
 import android.os.Build
@@ -82,7 +83,7 @@ class DownloadService : Service() {
     */
    override fun onCreate() {
        super.onCreate()
-        startForeground(Notifications.ID_DOWNLOAD_CHAPTER, getPlaceholderNotification())
+        startForeground(Notifications.ID_DOWNLOAD_CHAPTER_PROGRESS, getPlaceholderNotification())
        wakeLock = acquireWakeLock(javaClass.name)
        runningRelay.call(true)
        subscriptions = CompositeSubscription()
@@ -143,7 +144,7 @@ class DownloadService : Service() {
    private fun onNetworkStateChanged(connectivity: Connectivity) {
        when (connectivity.state) {
            CONNECTED -> {
-                if (preferences.downloadOnlyOverWifi() && connectivityManager.isActiveNetworkMetered) {
+                if (preferences.downloadOnlyOverWifi() && connectivityManager.activeNetworkInfo?.type != ConnectivityManager.TYPE_WIFI) {
                    downloadManager.stopDownloads(getString(R.string.download_notifier_text_only_wifi))
                } else {
                    val started = downloadManager.startDownloads()
@@ -175,19 +176,19 @@ class DownloadService : Service() {
    /**
     * Releases the wake lock if it's held.
     */
-    fun PowerManager.WakeLock.releaseIfNeeded() {
+    private fun PowerManager.WakeLock.releaseIfNeeded() {
        if (isHeld) release()
    }

    /**
     * Acquires the wake lock if it's not held.
     */
-    fun PowerManager.WakeLock.acquireIfNeeded() {
+    private fun PowerManager.WakeLock.acquireIfNeeded() {
        if (!isHeld) acquire()
    }

    private fun getPlaceholderNotification(): Notification {
-        return notification(Notifications.CHANNEL_DOWNLOADER) {
+        return notification(Notifications.CHANNEL_DOWNLOADER_PROGRESS) {
            setContentTitle(getString(R.string.download_notifier_downloader_title))
        }
    }
@@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi.data.download

 import android.content.Context
+import androidx.core.content.edit
 import com.google.gson.Gson
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.Manga
@@ -42,9 +43,9 @@ class DownloadStore(
     * @param downloads the list of downloads to add.
     */
    fun addAll(downloads: List<Download>) {
-        val editor = preferences.edit()
-        downloads.forEach { editor.putString(getKey(it), serialize(it)) }
-        editor.apply()
+        preferences.edit {
+            downloads.forEach { putString(getKey(it), serialize(it)) }
+        }
    }

    /**
@@ -53,14 +54,18 @@ class DownloadStore(
     * @param download the download to remove.
     */
    fun remove(download: Download) {
-        preferences.edit().remove(getKey(download)).apply()
+        preferences.edit {
+            remove(getKey(download))
+        }
    }

    /**
     * Removes all the downloads from the store.
     */
    fun clear() {
-        preferences.edit().clear().apply()
+        preferences.edit {
+            clear()
+        }
    }

    /**
@@ -11,6 +11,7 @@ import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.download.model.Download
 import eu.kanade.tachiyomi.data.download.model.DownloadQueue
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.online.HttpSource
@@ -22,7 +23,6 @@ import eu.kanade.tachiyomi.util.lang.plusAssign
 import eu.kanade.tachiyomi.util.storage.DiskUtil
 import eu.kanade.tachiyomi.util.storage.saveTo
 import eu.kanade.tachiyomi.util.system.ImageUtil
-import java.io.File
 import kotlinx.coroutines.async
 import okhttp3.Response
 import rx.Observable
@@ -30,7 +30,13 @@ import rx.android.schedulers.AndroidSchedulers
 import rx.schedulers.Schedulers
 import rx.subscriptions.CompositeSubscription
 import timber.log.Timber
+import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
+import java.io.BufferedOutputStream
+import java.io.File
+import java.util.zip.CRC32
+import java.util.zip.ZipEntry
+import java.util.zip.ZipOutputStream

 /**
 * This class is the one in charge of downloading chapters.
@@ -53,6 +59,8 @@ class Downloader(
    private val sourceManager: SourceManager
 ) {

+    private val preferences: PreferencesHelper by injectLazy()
+
    private val chapterCache: ChapterCache by injectLazy()

    /**
@@ -137,9 +145,10 @@ class Downloader(
        } else {
            if (notifier.paused) {
                notifier.paused = false
-                notifier.onDownloadPaused()
+                notifier.onPaused()
            } else {
-                notifier.dismiss()
+                notifier.dismissProgress()
+                notifier.onComplete()
            }
        }
    }
@@ -170,7 +179,7 @@ class Downloader(
                .forEach { it.status = Download.NOT_DOWNLOADED }
        }
        queue.clear()
-        notifier.dismiss()
+        notifier.dismissProgress()
    }

    /**
@@ -231,13 +240,9 @@ class Downloader(
        val wasEmpty = queue.isEmpty()
        // Called in background thread, the operation can be slow with SAF.
        val chaptersWithoutDir = async {
-            val mangaDir = provider.findMangaDir(manga, source)
-
            chapters
-                // Avoid downloading chapters with the same name.
-                .distinctBy { it.name }
                // Filter out those already downloaded.
-                .filter { mangaDir?.findFile(provider.getChapterDirName(it)) == null }
+                .filter { provider.findChapterDir(it, manga, source) == null }
                // Add chapters to queue from the start.
                .sortedByDescending { it.source_order }
        }
@@ -270,8 +275,16 @@ class Downloader(
     * @param download the chapter to be downloaded.
     */
    private fun downloadChapter(download: Download): Observable<Download> = Observable.defer {
-        val chapterDirname = provider.getChapterDirName(download.chapter)
        val mangaDir = provider.getMangaDir(download.manga, download.source)
+
+        val availSpace = DiskUtil.getAvailableStorageSpace(mangaDir)
+        if (availSpace != -1L && availSpace < MIN_DISK_SPACE) {
+            download.status = Download.ERROR
+            notifier.onError(context.getString(R.string.download_insufficient_space), download.chapter.name)
+            return@defer Observable.just(download)
+        }
+
+        val chapterDirname = provider.getChapterDirName(download.chapter)
        val tmpDir = mangaDir.createDirectory(chapterDirname + TMP_DIR_SUFFIX)

        val pageListObservable = if (download.pages == null) {
@@ -459,7 +472,39 @@ class Downloader(

        // Only rename the directory if it's downloaded.
        if (download.status == Download.DOWNLOADED) {
-            tmpDir.renameTo(dirname)
+            if (preferences.saveChaptersAsCBZ().get()) {
+                val zip = mangaDir.createFile("$dirname.cbz.tmp")
+                val zipOut = ZipOutputStream(BufferedOutputStream(zip.openOutputStream()))
+                val compressionLevel = preferences.saveChaptersAsCBZLevel().get()
+
+                zipOut.setLevel(compressionLevel)
+
+                if (compressionLevel == 0) {
+                    zipOut.setMethod(ZipEntry.STORED)
+                }
+
+                tmpDir.listFiles()?.forEach { img ->
+                    val input = img.openInputStream()
+                    val data = input.readBytes()
+                    val entry = ZipEntry(img.name)
+                    if (compressionLevel == 0) {
+                        val crc = CRC32()
+                        val size = img.length()
+                        crc.update(data)
+                        entry.crc = crc.value
+                        entry.compressedSize = size
+                        entry.size = size
+                    }
+                    zipOut.putNextEntry(entry)
+                    zipOut.write(data)
+                    input.close()
+                }
+                zipOut.close()
+                zip.renameTo("$dirname.cbz")
+                tmpDir.delete()
+            } else {
+                tmpDir.renameTo(dirname)
+            }
            cache.addChapter(dirname, mangaDir, download.manga)

            DiskUtil.createNoMediaFile(tmpDir, context)
@@ -489,5 +534,8 @@ class Downloader(

    companion object {
        const val TMP_DIR_SUFFIX = "_tmp"
+
+        // Arbitrary minimum required space to start a download: 50 MB
+        const val MIN_DISK_SPACE = 50 * 1024 * 1024
    }
 }
@@ -5,9 +5,9 @@ import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.download.DownloadStore
 import eu.kanade.tachiyomi.source.model.Page
-import java.util.concurrent.CopyOnWriteArrayList
 import rx.Observable
 import rx.subjects.PublishSubject
+import java.util.concurrent.CopyOnWriteArrayList

 class DownloadQueue(
    private val store: DownloadStore,
@@ -5,12 +5,12 @@ import android.util.Log
 import com.bumptech.glide.Priority
 import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.data.DataFetcher
+import timber.log.Timber
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileNotFoundException
 import java.io.IOException
 import java.io.InputStream
-import timber.log.Timber

 open class FileFetcher(private val filePath: String = "") : DataFetcher<InputStream> {

@@ -14,10 +14,10 @@ import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.isLocal
-import java.io.InputStream
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
+import java.io.InputStream

 /**
 * A class for loading a cover associated with a [Manga] that can be present in our own cache.
@@ -14,9 +14,9 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.bumptech.glide.module.AppGlideModule
 import com.bumptech.glide.request.RequestOptions
 import eu.kanade.tachiyomi.network.NetworkHelper
-import java.io.InputStream
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
+import java.io.InputStream

 /**
 * Class used to update Glide module settings
@@ -0,0 +1,117 @@
+package eu.kanade.tachiyomi.data.library
+
+import android.content.Context
+import com.github.salomonbrys.kotson.nullLong
+import com.github.salomonbrys.kotson.nullString
+import com.github.salomonbrys.kotson.set
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonObject
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.models.MangaImpl
+import java.io.File
+import java.util.Scanner
+
+class CustomMangaManager(val context: Context) {
+
+    private val editJson = File(context.getExternalFilesDir(null), "edits.json")
+
+    private var customMangaMap = mutableMapOf<Long, Manga>()
+
+    init {
+        fetchCustomData()
+    }
+
+    fun getManga(manga: Manga): Manga? = customMangaMap[manga.id]
+
+    private fun fetchCustomData() {
+        if (!editJson.exists() || !editJson.isFile) return
+
+        val json = try {
+            Gson().fromJson(
+                Scanner(editJson).useDelimiter("\\Z").next(),
+                JsonObject::class.java
+            )
+        } catch (e: Exception) {
+            null
+        } ?: return
+
+        val mangasJson = json.get("mangas").asJsonArray ?: return
+        customMangaMap = mangasJson.mapNotNull { element ->
+            val mangaObject = element.asJsonObject ?: return@mapNotNull null
+            val id = mangaObject["id"]?.nullLong ?: return@mapNotNull null
+            val manga = MangaImpl().apply {
+                this.id = id
+                title = mangaObject["title"]?.nullString ?: ""
+                author = mangaObject["author"]?.nullString
+                artist = mangaObject["artist"]?.nullString
+                description = mangaObject["description"]?.nullString
+                genre = mangaObject["genre"]?.asJsonArray?.mapNotNull { it.nullString }
+                    ?.joinToString(", ")
+            }
+            id to manga
+        }.toMap().toMutableMap()
+    }
+
+    fun saveMangaInfo(manga: MangaJson) {
+        if (manga.title == null && manga.author == null && manga.artist == null && manga.description == null && manga.genre == null) {
+            customMangaMap.remove(manga.id)
+        } else {
+            customMangaMap[manga.id] = MangaImpl().apply {
+                id = manga.id
+                title = manga.title ?: ""
+                author = manga.author
+                artist = manga.artist
+                description = manga.description
+                genre = manga.genre?.joinToString(", ")
+            }
+        }
+        saveCustomInfo()
+    }
+
+    private fun saveCustomInfo() {
+        val jsonElements = customMangaMap.values.map { it.toJson() }
+        if (jsonElements.isNotEmpty()) {
+            val gson = GsonBuilder().create()
+            val root = JsonObject()
+            val mangaEntries = gson.toJsonTree(jsonElements)
+
+            root["mangas"] = mangaEntries
+            editJson.delete()
+            editJson.writeText(gson.toJson(root))
+        }
+    }
+
+    fun Manga.toJson(): MangaJson {
+        return MangaJson(
+            id!!,
+            title,
+            author,
+            artist,
+            description,
+            genre?.split(", ")?.toTypedArray()
+        )
+    }
+
+    data class MangaJson(
+        val id: Long,
+        val title: String? = null,
+        val author: String? = null,
+        val artist: String? = null,
+        val description: String? = null,
+        val genre: Array<String>? = null
+    ) {
+
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (javaClass != other?.javaClass) return false
+            other as MangaJson
+            if (id != other.id) return false
+            return true
+        }
+
+        override fun hashCode(): Int {
+            return id.hashCode()
+        }
+    }
+}
@@ -9,9 +9,9 @@ import androidx.work.WorkManager
 import androidx.work.Worker
 import androidx.work.WorkerParameters
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import java.util.concurrent.TimeUnit
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
+import java.util.concurrent.TimeUnit

 class LibraryUpdateJob(private val context: Context, workerParams: WorkerParameters) :
    Worker(context, workerParams) {
@@ -45,8 +45,10 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet
                    .build()

                val request = PeriodicWorkRequestBuilder<LibraryUpdateJob>(
-                    interval.toLong(), TimeUnit.HOURS,
-                    10, TimeUnit.MINUTES
+                    interval.toLong(),
+                    TimeUnit.HOURS,
+                    10,
+                    TimeUnit.MINUTES
                )
                    .addTag(TAG)
                    .setConstraints(constraints)
@@ -17,14 +17,15 @@ import eu.kanade.tachiyomi.data.glide.toMangaThumbnail
 import eu.kanade.tachiyomi.data.notification.NotificationReceiver
 import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.ui.main.MainActivity
 import eu.kanade.tachiyomi.util.lang.chop
 import eu.kanade.tachiyomi.util.system.notification
 import eu.kanade.tachiyomi.util.system.notificationBuilder
 import eu.kanade.tachiyomi.util.system.notificationManager
+import uy.kohesive.injekt.injectLazy
 import java.text.DecimalFormat
 import java.text.DecimalFormatSymbols
-import uy.kohesive.injekt.injectLazy

 class LibraryUpdateNotifier(private val context: Context) {

@@ -65,7 +66,7 @@ class LibraryUpdateNotifier(private val context: Context) {
     * @param current the current progress.
     * @param total the total progress.
     */
-    fun showProgressNotification(manga: Manga, current: Int, total: Int) {
+    fun showProgressNotification(manga: /* SY --> */ SManga /* SY <-- */, current: Int, total: Int) {
        val title = if (preferences.hideNotificationContent()) {
            context.getString(R.string.notification_check_updates)
        } else {
@@ -198,18 +199,23 @@ class LibraryUpdateNotifier(private val context: Context) {

            // Mark chapters as read action
            addAction(
-                R.drawable.ic_glasses_black_24dp, context.getString(R.string.action_mark_as_read),
+                R.drawable.ic_glasses_black_24dp,
+                context.getString(R.string.action_mark_as_read),
                NotificationReceiver.markAsReadPendingBroadcast(
                    context,
-                    manga, chapters, Notifications.ID_NEW_CHAPTERS
+                    manga,
+                    chapters,
+                    Notifications.ID_NEW_CHAPTERS
                )
            )
            // View chapters action
            addAction(
-                R.drawable.ic_book_24dp, context.getString(R.string.action_view_chapters),
+                R.drawable.ic_book_24dp,
+                context.getString(R.string.action_view_chapters),
                NotificationReceiver.openChapterPendingActivity(
                    context,
-                    manga, Notifications.ID_NEW_CHAPTERS
+                    manga,
+                    Notifications.ID_NEW_CHAPTERS
                )
            )
        }
@@ -6,6 +6,8 @@ import android.content.Intent
 import android.os.Build
 import android.os.IBinder
 import android.os.PowerManager
+import com.elvishew.xlog.XLog
+import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.cache.CoverCache
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.Category
@@ -17,10 +19,15 @@ import eu.kanade.tachiyomi.data.download.DownloadService
 import eu.kanade.tachiyomi.data.library.LibraryUpdateRanker.rankingScheme
 import eu.kanade.tachiyomi.data.library.LibraryUpdateService.Companion.start
 import eu.kanade.tachiyomi.data.notification.Notifications
+import eu.kanade.tachiyomi.data.preference.PreferenceValues
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.model.SManga
+import eu.kanade.tachiyomi.source.online.all.MangaDex
+import eu.kanade.tachiyomi.source.online.all.MergedSource
+import eu.kanade.tachiyomi.ui.library.LibraryGroup
+import eu.kanade.tachiyomi.util.chapter.NoChaptersException
 import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource
 import eu.kanade.tachiyomi.util.prepUpdateCover
 import eu.kanade.tachiyomi.util.shouldDownloadNewChapters
@@ -28,14 +35,25 @@ import eu.kanade.tachiyomi.util.storage.getUriCompat
 import eu.kanade.tachiyomi.util.system.acquireWakeLock
 import eu.kanade.tachiyomi.util.system.isServiceRunning
 import exh.LIBRARY_UPDATE_EXCLUDED_SOURCES
-import java.io.File
-import java.util.concurrent.atomic.AtomicInteger
+import exh.MERGED_SOURCE_ID
+import exh.md.utils.FollowStatus
+import exh.md.utils.MdUtil
+import exh.metadata.metadata.base.insertFlatMetadata
+import exh.source.EnhancedHttpSource.Companion.getMainSource
+import exh.util.asObservable
+import exh.util.await
+import exh.util.awaitSingle
+import exh.util.nullIfBlank
+import kotlinx.coroutines.runBlocking
 import rx.Observable
 import rx.Subscription
 import rx.schedulers.Schedulers
 import timber.log.Timber
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
+import java.io.File
+import java.util.Date
+import java.util.concurrent.atomic.AtomicInteger

 /**
 * This class will take care of updating the chapters of the manga from the library. It can be
@@ -72,7 +90,10 @@ class LibraryUpdateService(
    enum class Target {
        CHAPTERS, // Manga chapters
        COVERS, // Manga covers
-        TRACKING // Tracking metadata
+        TRACKING, // Tracking metadata
+        // SY -->
+        SYNC_FOLLOWS // MangaDex specific, pull mangadex manga in reading, rereading
+        // SY <--
    }

    companion object {
@@ -87,6 +108,14 @@ class LibraryUpdateService(
         */
        const val KEY_TARGET = "target"

+        // SY -->
+        /**
+         * Key for group to update.
+         */
+        const val KEY_GROUP = "group"
+        const val KEY_GROUP_EXTRA = "group_extra"
+        // SY <--
+
        /**
         * Returns the status of the service.
         *
@@ -106,11 +135,15 @@ class LibraryUpdateService(
         * @param target defines what should be updated.
         * @return true if service newly started, false otherwise
         */
-        fun start(context: Context, category: Category? = null, target: Target = Target.CHAPTERS): Boolean {
+        fun start(context: Context, category: Category? = null, target: Target = Target.CHAPTERS /* SY --> */, group: Int = LibraryGroup.BY_DEFAULT, groupExtra: String? = null /* SY <-- */): Boolean {
            if (!isRunning(context)) {
                val intent = Intent(context, LibraryUpdateService::class.java).apply {
                    putExtra(KEY_TARGET, target)
                    category?.let { putExtra(KEY_CATEGORY, it.id) }
+                    // SY -->
+                    putExtra(KEY_GROUP, group)
+                    groupExtra?.let { putExtra(KEY_GROUP_EXTRA, it) }
+                    // SY <--
                }
                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
                    context.startService(intent)
@@ -194,6 +227,9 @@ class LibraryUpdateService(
                    Target.CHAPTERS -> updateChapterList(mangaList)
                    Target.COVERS -> updateCovers(mangaList)
                    Target.TRACKING -> updateTrackings(mangaList)
+                    // SY -->
+                    Target.SYNC_FOLLOWS -> syncFollows()
+                    // SY <--
                }
            }
            .subscribeOn(Schedulers.io())
@@ -221,10 +257,15 @@ class LibraryUpdateService(
     */
    fun getMangaToUpdate(intent: Intent, target: Target): List<LibraryManga> {
        val categoryId = intent.getIntExtra(KEY_CATEGORY, -1)
+        // SY -->
+        val group = intent.getIntExtra(KEY_GROUP, LibraryGroup.BY_DEFAULT)
+        val groupLibraryUpdateType = preferences.groupLibraryUpdateType().get()
+        // SY <--

        var listToUpdate = if (categoryId != -1) {
            db.getLibraryMangas().executeAsBlocking().filter { it.category == categoryId }
-        } else {
+            // SY -->
+        } else if (group == LibraryGroup.BY_DEFAULT || groupLibraryUpdateType == PreferenceValues.GroupLibraryMode.GLOBAL || (groupLibraryUpdateType == PreferenceValues.GroupLibraryMode.ALL_BUT_UNGROUPED && group == LibraryGroup.UNGROUPED)) {
            val categoriesToUpdate = preferences.libraryUpdateCategories().get().map(String::toInt)
            if (categoriesToUpdate.isNotEmpty()) {
                db.getLibraryMangas().executeAsBlocking()
@@ -233,6 +274,43 @@ class LibraryUpdateService(
            } else {
                db.getLibraryMangas().executeAsBlocking().distinctBy { it.id }
            }
+        } else {
+            val libraryManga = db.getLibraryMangas().executeAsBlocking().distinctBy { it.id }
+            when (group) {
+                LibraryGroup.BY_TRACK_STATUS -> {
+                    val trackingExtra = intent.getStringExtra(KEY_GROUP_EXTRA)?.toIntOrNull() ?: -1
+                    libraryManga.filter {
+                        val loggedServices = trackManager.services.filter { it.isLogged }
+                        val status: String = {
+                            val tracks = db.getTracks(it).executeAsBlocking()
+                            val track = tracks.find { track ->
+                                loggedServices.any { it.id == track?.sync_id }
+                            }
+                            val service = loggedServices.find { it.id == track?.sync_id }
+                            if (track != null && service != null) {
+                                service.getStatus(track.status)
+                            } else {
+                                "not tracked"
+                            }
+                        }()
+                        trackManager.mapTrackingOrder(status, applicationContext) == trackingExtra
+                    }
+                }
+                LibraryGroup.BY_SOURCE -> {
+                    val sourceExtra = intent.getStringExtra(KEY_GROUP_EXTRA).nullIfBlank()
+                    val source = sourceManager.getCatalogueSources().find { it.name == sourceExtra }
+                    if (source != null) libraryManga.filter { it.source == source.id } else emptyList()
+                }
+                LibraryGroup.BY_STATUS -> {
+                    val statusExtra = intent.getStringExtra(KEY_GROUP_EXTRA)?.toIntOrNull() ?: -1
+                    libraryManga.filter {
+                        it.status == statusExtra
+                    }
+                }
+                LibraryGroup.UNGROUPED -> libraryManga
+                else -> libraryManga
+            }
+            // SY <--
        }
        if (target == Target.CHAPTERS && preferences.updateOnlyNonCompleted()) {
            listToUpdate = listToUpdate.filter { it.status != SManga.COMPLETED }
@@ -275,7 +353,12 @@ class LibraryUpdateService(
                    updateManga(manga)
                        // If there's any error, return empty update and continue.
                        .onErrorReturn {
-                            failedUpdates.add(Pair(manga, it.message))
+                            val errorMessage = if (it is NoChaptersException) {
+                                getString(R.string.no_chapters_error)
+                            } else {
+                                it.message
+                            }
+                            failedUpdates.add(Pair(manga, errorMessage))
                            Pair(emptyList(), emptyList())
                        }
                        // Filter out mangas without new chapters (or failed).
@@ -328,7 +411,12 @@ class LibraryUpdateService(
    private fun downloadChapters(manga: Manga, chapters: List<Chapter>) {
        // We don't want to start downloading while the library is updating, because websites
        // may don't like it and they could ban the user.
-        downloadManager.downloadChapters(manga, chapters, false)
+        // SY -->
+        val chapterFilter = if (manga.source == MERGED_SOURCE_ID) {
+            db.getMergedMangaReferences(manga.id!!).executeAsBlocking().filterNot { it.downloadChapters }.mapNotNull { it.mangaId }
+        } else emptyList()
+        // SY <--
+        downloadManager.downloadChapters(manga, /* SY --> */ chapters.filter { it.manga_id !in chapterFilter } /* SY <-- */, false)
    }

    /**
@@ -338,7 +426,7 @@ class LibraryUpdateService(
     * @return a pair of the inserted and removed chapters.
     */
    fun updateManga(manga: Manga): Observable<Pair<List<Chapter>, List<Chapter>>> {
-        val source = sourceManager.get(manga.source) ?: return Observable.empty()
+        val source = sourceManager.getOrStub(manga.source)

        // Update manga details metadata in the background
        if (preferences.autoUpdateMetadata()) {
@@ -360,8 +448,38 @@ class LibraryUpdateService(
                .subscribe()
        }

-        return source.fetchChapterList(manga)
-            .map { syncChaptersWithSource(db, it, manga, source) }
+        // SY -->
+        if (source.getMainSource() is MangaDex && trackManager.mdList.isLogged) {
+            try {
+                val tracks = db.getTracks(manga).executeAsBlocking()
+                if (tracks.isEmpty() || tracks.all { it.sync_id != TrackManager.MDLIST }) {
+                    var track = trackManager.mdList.createInitialTracker(manga)
+                    track = runBlocking { trackManager.mdList.refresh(track).awaitSingle() }
+                    db.insertTrack(track).executeAsBlocking()
+                }
+            } catch (e: Exception) {
+                XLog.e(e)
+            }
+        }
+        // SY <--
+
+        return (
+            /* SY --> */ if (source is MergedSource) runBlocking { source.fetchChaptersAndSync(manga, false).asObservable() }
+            else /* SY <-- */ source.fetchChapterList(manga)
+                .map { syncChaptersWithSource(db, it, manga, source) }
+            // SY -->
+            )
+            .doOnNext {
+                if (source.getMainSource() is MangaDex) {
+                    val tracks = db.getTracks(manga).executeAsBlocking()
+                    if (tracks.isEmpty() || tracks.all { it.sync_id != TrackManager.MDLIST }) {
+                        var track = trackManager.mdList.createInitialTracker(manga)
+                        track = runBlocking { trackManager.mdList.refresh(track).awaitSingle() }
+                        db.insertTrack(track).executeAsBlocking()
+                    }
+                }
+            }
+        // SY <--
    }

    private fun updateCovers(mangaToUpdate: List<LibraryManga>): Observable<LibraryManga> {
@@ -427,6 +545,48 @@ class LibraryUpdateService(
            }
    }

+    // SY -->
+    // filter all follows from Mangadex and only add reading or rereading manga to library
+    private fun syncFollows(): Observable<LibraryManga> {
+        val count = AtomicInteger(0)
+        val mangaDex = MdUtil.getEnabledMangaDex(preferences, sourceManager)!!
+        return mangaDex.fetchAllFollows(true)
+            .asObservable()
+            .map { listManga ->
+                listManga.filter { (_, metadata) ->
+                    metadata.follow_status == FollowStatus.RE_READING.int || metadata.follow_status == FollowStatus.READING.int
+                }
+            }
+            .doOnNext { listManga ->
+                listManga.forEach { (networkManga, metadata) ->
+                    notifier.showProgressNotification(networkManga, count.andIncrement, listManga.size)
+                    var dbManga = db.getManga(networkManga.url, mangaDex.id)
+                        .executeAsBlocking()
+                    if (dbManga == null) {
+                        dbManga = Manga.create(
+                            networkManga.url,
+                            networkManga.title,
+                            mangaDex.id
+                        )
+                        dbManga.date_added = Date().time
+                    }
+
+                    dbManga.copyFrom(networkManga)
+                    dbManga.favorite = true
+                    val id = db.insertManga(dbManga).executeAsBlocking().insertedId()
+                    if (id != null) {
+                        metadata.mangaId = id
+                        db.insertFlatMetadata(metadata.flatten()).await()
+                    }
+                }
+            }
+            .doOnCompleted {
+                notifier.cancelProgressNotification()
+            }
+            .map { LibraryManga() }
+    }
+    // SY <--
+
    /**
     * Writes basic file of update errors to cache dir.
     */
@@ -437,7 +597,8 @@ class LibraryUpdateService(

                destFile.bufferedWriter().use { out ->
                    errors.forEach { (manga, error) ->
-                        out.write("${manga.title}: $error\n")
+                        val source = sourceManager.getOrStub(manga.source)
+                        out.write("${manga.title} ($source): $error\n")
                    }
                }
                return destFile
@@ -7,7 +7,6 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Build
 import android.os.Handler
-import eu.kanade.tachiyomi.BuildConfig.APPLICATION_ID as ID
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.backup.BackupRestoreService
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
@@ -26,10 +25,11 @@ import eu.kanade.tachiyomi.util.storage.DiskUtil
 import eu.kanade.tachiyomi.util.storage.getUriCompat
 import eu.kanade.tachiyomi.util.system.notificationManager
 import eu.kanade.tachiyomi.util.system.toast
-import java.io.File
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
+import java.io.File
+import eu.kanade.tachiyomi.BuildConfig.APPLICATION_ID as ID

 /**
 * Global [BroadcastReceiver] that runs on UI thread
@@ -56,19 +56,22 @@ class NotificationReceiver : BroadcastReceiver() {
            // Launch share activity and dismiss notification
            ACTION_SHARE_IMAGE ->
                shareImage(
-                    context, intent.getStringExtra(EXTRA_FILE_LOCATION),
+                    context,
+                    intent.getStringExtra(EXTRA_FILE_LOCATION),
                    intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1)
                )
            // Delete image from path and dismiss notification
            ACTION_DELETE_IMAGE ->
                deleteImage(
-                    context, intent.getStringExtra(EXTRA_FILE_LOCATION),
+                    context,
+                    intent.getStringExtra(EXTRA_FILE_LOCATION),
                    intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1)
                )
            // Share backup file
            ACTION_SHARE_BACKUP ->
                shareBackup(
-                    context, intent.getParcelableExtra(EXTRA_URI),
+                    context,
+                    intent.getParcelableExtra(EXTRA_URI),
                    intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1)
                )
            ACTION_CANCEL_RESTORE -> cancelRestore(
@@ -80,7 +83,8 @@ class NotificationReceiver : BroadcastReceiver() {
            // Open reader activity
            ACTION_OPEN_CHAPTER -> {
                openChapter(
-                    context, intent.getLongExtra(EXTRA_MANGA_ID, -1),
+                    context,
+                    intent.getLongExtra(EXTRA_MANGA_ID, -1),
                    intent.getLongExtra(EXTRA_CHAPTER_ID, -1)
                )
            }
@@ -155,7 +159,7 @@ class NotificationReceiver : BroadcastReceiver() {
     * @param mangaId id of manga
     * @param chapterId id of chapter
     */
-    internal fun openChapter(context: Context, mangaId: Long, chapterId: Long) {
+    private fun openChapter(context: Context, mangaId: Long, chapterId: Long) {
        val db = DatabaseHelper(context)
        val manga = db.getManga(mangaId).executeAsBlocking()
        val chapter = db.getChapter(chapterId).executeAsBlocking()
@@ -30,8 +30,12 @@ object Notifications {
    /**
     * Notification channel and ids used by the downloader.
     */
-    const val CHANNEL_DOWNLOADER = "downloader_channel"
-    const val ID_DOWNLOAD_CHAPTER = -201
+    private const val GROUP_DOWNLOADER = "group_downloader"
+    const val CHANNEL_DOWNLOADER_PROGRESS = "downloader_progress_channel"
+    const val ID_DOWNLOAD_CHAPTER_PROGRESS = -201
+    const val CHANNEL_DOWNLOADER_COMPLETE = "downloader_complete_channel"
+    const val ID_DOWNLOAD_CHAPTER_COMPLETE = -203
+    const val CHANNEL_DOWNLOADER_ERROR = "downloader_error_channel"
    const val ID_DOWNLOAD_CHAPTER_ERROR = -202

    /**
@@ -50,7 +54,7 @@ object Notifications {
    /**
     * Notification channel and ids used by the backup/restore system.
     */
-    private const val GROUP_BACK_RESTORE = "group_backup_restore"
+    private const val GROUP_BACKUP_RESTORE = "group_backup_restore"
    const val CHANNEL_BACKUP_RESTORE_PROGRESS = "backup_restore_progress_channel"
    const val ID_BACKUP_PROGRESS = -501
    const val ID_RESTORE_PROGRESS = -503
@@ -59,6 +63,7 @@ object Notifications {
    const val ID_RESTORE_COMPLETE = -504

    private val deprecatedChannels = listOf(
+        "downloader_channel",
        "backup_restore_complete_channel"
    )

@@ -70,55 +75,78 @@ object Notifications {
    fun createChannels(context: Context) {
        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return

-        val backupRestoreGroup = NotificationChannelGroup(GROUP_BACK_RESTORE, context.getString(R.string.channel_backup_restore))
-        context.notificationManager.createNotificationChannelGroup(backupRestoreGroup)
+        listOf(
+            NotificationChannelGroup(GROUP_BACKUP_RESTORE, context.getString(R.string.group_backup_restore)),
+            NotificationChannelGroup(GROUP_DOWNLOADER, context.getString(R.string.group_downloader))
+        ).forEach(context.notificationManager::createNotificationChannelGroup)

-        val channels = listOf(
+        listOf(
            NotificationChannel(
-                CHANNEL_COMMON, context.getString(R.string.channel_common),
+                CHANNEL_COMMON,
+                context.getString(R.string.channel_common),
                NotificationManager.IMPORTANCE_LOW
            ),
            NotificationChannel(
-                CHANNEL_LIBRARY, context.getString(R.string.channel_library),
+                CHANNEL_LIBRARY,
+                context.getString(R.string.channel_library),
                NotificationManager.IMPORTANCE_LOW
            ).apply {
                setShowBadge(false)
            },
            NotificationChannel(
-                CHANNEL_DOWNLOADER, context.getString(R.string.channel_downloader),
+                CHANNEL_DOWNLOADER_PROGRESS,
+                context.getString(R.string.channel_progress),
                NotificationManager.IMPORTANCE_LOW
            ).apply {
+                group = GROUP_DOWNLOADER
                setShowBadge(false)
            },
            NotificationChannel(
-                CHANNEL_NEW_CHAPTERS, context.getString(R.string.channel_new_chapters),
+                CHANNEL_DOWNLOADER_COMPLETE,
+                context.getString(R.string.channel_complete),
+                NotificationManager.IMPORTANCE_LOW
+            ).apply {
+                group = GROUP_DOWNLOADER
+                setShowBadge(false)
+            },
+            NotificationChannel(
+                CHANNEL_DOWNLOADER_ERROR,
+                context.getString(R.string.channel_errors),
+                NotificationManager.IMPORTANCE_LOW
+            ).apply {
+                group = GROUP_DOWNLOADER
+                setShowBadge(false)
+            },
+            NotificationChannel(
+                CHANNEL_NEW_CHAPTERS,
+                context.getString(R.string.channel_new_chapters),
                NotificationManager.IMPORTANCE_DEFAULT
            ),
            NotificationChannel(
-                CHANNEL_UPDATES_TO_EXTS, context.getString(R.string.channel_ext_updates),
+                CHANNEL_UPDATES_TO_EXTS,
+                context.getString(R.string.channel_ext_updates),
                NotificationManager.IMPORTANCE_DEFAULT
            ),
            NotificationChannel(
-                CHANNEL_BACKUP_RESTORE_PROGRESS, context.getString(R.string.channel_backup_restore_progress),
+                CHANNEL_BACKUP_RESTORE_PROGRESS,
+                context.getString(R.string.channel_progress),
                NotificationManager.IMPORTANCE_LOW
            ).apply {
-                group = GROUP_BACK_RESTORE
+                group = GROUP_BACKUP_RESTORE
                setShowBadge(false)
            },
            NotificationChannel(
-                CHANNEL_BACKUP_RESTORE_COMPLETE, context.getString(R.string.channel_backup_restore_complete),
+                CHANNEL_BACKUP_RESTORE_COMPLETE,
+                context.getString(R.string.channel_complete),
                NotificationManager.IMPORTANCE_HIGH
            ).apply {
-                group = GROUP_BACK_RESTORE
+                group = GROUP_BACKUP_RESTORE
                setShowBadge(false)
                setSound(null, null)
            }
-        )
-        context.notificationManager.createNotificationChannels(channels)
+        ).forEach(context.notificationManager::createNotificationChannel)

        // Delete old notification channels
-        deprecatedChannels.forEach {
-            context.notificationManager.deleteNotificationChannel(it)
-        }
+        deprecatedChannels.forEach(context.notificationManager::deleteNotificationChannel)
    }
 }
@@ -55,6 +55,8 @@ object PreferenceKeys {

    const val readWithTapping = "reader_tap"

+    const val readWithTappingInverted = "reader_tapping_inverted"
+
    const val readWithLongTap = "reader_long_tap"

    const val readWithVolumeKeys = "reader_volume_keys"
@@ -67,6 +69,8 @@ object PreferenceKeys {

    const val landscapeColumns = "pref_library_columns_landscape_key"

+    const val jumpToChapters = "jump_to_chapters"
+
    const val updateOnlyNonCompleted = "pref_update_only_non_completed_key"

    const val autoUpdateTrack = "pref_auto_update_manga_sync_key"
@@ -93,6 +97,8 @@ object PreferenceKeys {

    const val removeAfterMarkedAsRead = "pref_remove_after_marked_as_read_key"

+    const val removeBookmarkedChapters = "pref_remove_bookmarked"
+
    const val libraryUpdateInterval = "pref_library_update_interval_key"

    const val libraryUpdateRestriction = "library_update_restriction"
@@ -109,6 +115,8 @@ object PreferenceKeys {

    const val filterCompleted = "pref_filter_completed_key"

+    const val filterStarted = "pref_filter_started_key"
+
    const val filterTracked = "pref_filter_tracked_key"

    const val filterLewd = "pref_filter_lewd_key"
@@ -117,6 +125,8 @@ object PreferenceKeys {

    const val automaticExtUpdates = "automatic_ext_updates"

+    const val allowNsfwSource = "allow_nsfw_source"
+
    const val startScreen = "start_screen"

    const val useBiometricLock = "use_biometric_lock"
@@ -179,8 +189,6 @@ object PreferenceKeys {

    const val eh_lock_manually = "eh_lock_manually"

-    const val eh_nh_useHighQualityThumbs = "eh_nh_hq_thumbs"
-
    const val eh_showSyncIntro = "eh_show_sync_intro"

    const val eh_readOnlySync = "eh_sync_read_only"
@@ -233,8 +241,6 @@ object PreferenceKeys {

    const val eh_aggressivePageLoading = "eh_aggressive_page_loading"

-    const val eh_hl_useHighQualityThumbs = "eh_hl_hq_thumbs"
-
    const val eh_preload_size = "eh_preload_size"

    const val eh_tag_filtering_value = "eh_tag_filtering_value"
@@ -243,8 +249,6 @@ object PreferenceKeys {

    const val eh_is_hentai_enabled = "eh_is_hentai_enabled"

-    const val eh_use_new_manga_interface = "eh_use_new_manga_interface"
-
    const val eh_use_auto_webtoon = "eh_use_auto_webtoon"

    const val eh_watched_list_default_state = "eh_watched_list_default_state"
@@ -268,4 +272,48 @@ object PreferenceKeys {
    const val sources_tab_source_categories = "sources_tab_source_categories"

    const val sourcesSort = "sources_sort"
+
+    const val recommendsInOverflow = "recommends_in_overflow"
+
+    const val enhancedEHentaiView = "enhanced_e_hentai_view"
+
+    const val webtoonEnableZoomOut = "webtoon_enable_zoom_out"
+
+    const val startReadingButton = "start_reading_button"
+
+    const val groupLibraryBy = "group_library_by"
+
+    const val continuousVerticalTappingByPage = "continuous_vertical_tapping_by_page"
+
+    const val groupLibraryUpdateType = "group_library_update_type"
+
+    const val useNewSourceNavigation = "use_new_source_navigation"
+
+    const val mangaDexLowQualityCovers = "manga_dex_low_quality_covers"
+
+    const val mangaDexForceLatestCovers = "manga_dex_force_latest_covers"
+
+    const val preferredMangaDexId = "preferred_mangaDex_id"
+
+    const val dataSaver = "data_saver"
+
+    const val ignoreJpeg = "ignore_jpeg"
+
+    const val ignoreGif = "ignore_gif"
+
+    const val dataSaverImageQuality = "data_saver_image_quality"
+
+    const val dataSaverImageFormatJpeg = "data_saver_image_format_jpeg"
+
+    const val dataSaverServer = "data_saver_server"
+
+    const val dataSaverColorBW = "data_saver_color_bw"
+
+    const val saveChaptersAsCBZ = "save_chapter_as_cbz"
+
+    const val saveChaptersAsCBZLevel = "save_chapter_as_cbz_level"
+
+    const val allowLocalSourceHiddenFolders = "allow_local_source_hidden_folders"
+
+    const val biometricTimeRanges = "biometric_time_ranges"
 }
@@ -23,11 +23,36 @@ object PreferenceValues {
        default,
        blue,
        amoled,
+        red,
    }

    enum class DisplayMode {
        COMPACT_GRID,
        COMFORTABLE_GRID,
+        // SY -->
+        NO_TITLE_GRID,
+        // SY <--
        LIST,
    }
+
+    enum class TappingInvertMode {
+        NONE,
+        HORIZONTAL,
+        VERTICAL,
+        BOTH
+    }
+
+    enum class NsfwAllowance {
+        ALLOWED,
+        PARTIAL,
+        BLOCKED
+    }
+
+    // SY -->
+    enum class GroupLibraryMode {
+        GLOBAL,
+        ALL_BUT_UNGROUPED,
+        ALL
+    }
+    // SY <--
 }
@@ -1,24 +1,25 @@
 package eu.kanade.tachiyomi.data.preference

 import android.content.Context
-import android.net.Uri
 import android.os.Environment
+import androidx.core.net.toUri
 import androidx.preference.PreferenceManager
 import com.tfcporciuncula.flow.FlowSharedPreferences
 import com.tfcporciuncula.flow.Preference
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys
-import eu.kanade.tachiyomi.data.preference.PreferenceValues as Values
 import eu.kanade.tachiyomi.data.preference.PreferenceValues.DisplayMode
+import eu.kanade.tachiyomi.data.preference.PreferenceValues.NsfwAllowance
 import eu.kanade.tachiyomi.data.track.TrackService
 import eu.kanade.tachiyomi.data.track.anilist.Anilist
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.onEach
 import java.io.File
 import java.text.DateFormat
 import java.text.SimpleDateFormat
 import java.util.Locale
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.onEach
+import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys
+import eu.kanade.tachiyomi.data.preference.PreferenceValues as Values

@OptIn(ExperimentalCoroutinesApi::class)
 fun <T> Preference<T>.asImmediateFlow(block: (value: T) -> Unit): Flow<T> {
@@ -27,27 +28,31 @@ fun <T> Preference<T>.asImmediateFlow(block: (value: T) -> Unit): Flow<T> {
        .onEach { block(it) }
 }

+operator fun <T> Preference<Set<T>>.plusAssign(item: T) {
+    set(get() + item)
+}
+
+operator fun <T> Preference<Set<T>>.minusAssign(item: T) {
+    set(get() - item)
+}
+
@OptIn(ExperimentalCoroutinesApi::class)
 class PreferencesHelper(val context: Context) {

    private val prefs = PreferenceManager.getDefaultSharedPreferences(context)
    val flowPrefs = FlowSharedPreferences(prefs)

-    private val defaultDownloadsDir = Uri.fromFile(
-        File(
-            Environment.getExternalStorageDirectory().absolutePath + File.separator +
-                context.getString(R.string.app_name),
-            "downloads"
-        )
-    )
+    private val defaultDownloadsDir = File(
+        Environment.getExternalStorageDirectory().absolutePath + File.separator +
+            context.getString(R.string.app_name),
+        "downloads"
+    ).toUri()

-    private val defaultBackupDir = Uri.fromFile(
-        File(
-            Environment.getExternalStorageDirectory().absolutePath + File.separator +
-                context.getString(R.string.app_name),
-            "backup"
-        )
-    )
+    private val defaultBackupDir = File(
+        Environment.getExternalStorageDirectory().absolutePath + File.separator +
+            context.getString(R.string.app_name),
+        "backup"
+    ).toUri()

    fun startScreen() = prefs.getInt(Keys.startScreen, 1)

@@ -109,7 +114,7 @@ class PreferencesHelper(val context: Context) {

    fun zoomStart() = flowPrefs.getInt(Keys.zoomStart, 1)

-    fun readerTheme() = flowPrefs.getInt(Keys.readerTheme, 1)
+    fun readerTheme() = flowPrefs.getInt(Keys.readerTheme, 3)

    fun alwaysShowChapterTransition() = flowPrefs.getBoolean(Keys.alwaysShowChapterTransition, true)

@@ -121,6 +126,8 @@ class PreferencesHelper(val context: Context) {

    fun readWithTapping() = flowPrefs.getBoolean(Keys.readWithTapping, true)

+    fun readWithTappingInverted() = flowPrefs.getEnum(Keys.readWithTappingInverted, Values.TappingInvertMode.NONE)
+
    fun readWithLongTap() = flowPrefs.getBoolean(Keys.readWithLongTap, true)

    fun readWithVolumeKeys() = flowPrefs.getBoolean(Keys.readWithVolumeKeys, false)
@@ -131,6 +138,8 @@ class PreferencesHelper(val context: Context) {

    fun landscapeColumns() = flowPrefs.getInt(Keys.landscapeColumns, 0)

+    fun jumpToChapters() = prefs.getBoolean(Keys.jumpToChapters, false)
+
    fun updateOnlyNonCompleted() = prefs.getBoolean(Keys.updateOnlyNonCompleted, false)

    fun autoUpdateTrack() = prefs.getBoolean(Keys.autoUpdateTrack, true)
@@ -179,6 +188,8 @@ class PreferencesHelper(val context: Context) {

    fun removeAfterMarkedAsRead() = prefs.getBoolean(Keys.removeAfterMarkedAsRead, false)

+    fun removeBookmarkedChapters() = prefs.getBoolean(Keys.removeBookmarkedChapters, false)
+
    fun libraryUpdateInterval() = flowPrefs.getInt(Keys.libraryUpdateInterval, 24)

    fun libraryUpdateRestriction() = prefs.getStringSet(Keys.libraryUpdateRestriction, setOf("wifi"))
@@ -204,6 +215,8 @@ class PreferencesHelper(val context: Context) {

    fun filterCompleted() = flowPrefs.getInt(Keys.filterCompleted, 0)

+    fun filterStarted() = flowPrefs.getInt(Keys.filterStarted, 0)
+
    fun filterTracked() = flowPrefs.getInt(Keys.filterTracked, 0)

    fun filterLewd() = flowPrefs.getInt(Keys.filterLewd, 0)
@@ -214,6 +227,8 @@ class PreferencesHelper(val context: Context) {

    fun automaticExtUpdates() = flowPrefs.getBoolean(Keys.automaticExtUpdates, true)

+    fun allowNsfwSource() = flowPrefs.getEnum(Keys.allowNsfwSource, NsfwAllowance.ALLOWED)
+
    fun extensionUpdatesCount() = flowPrefs.getInt("ext_updates_count", 0)

    fun lastExtCheck() = flowPrefs.getLong("last_ext_check", 0)
@@ -299,8 +314,6 @@ class PreferencesHelper(val context: Context) {
    fun eh_sessionCookie() = flowPrefs.getString(Keys.eh_sessionCookie, "")
    fun eh_hathPerksCookies() = flowPrefs.getString(Keys.eh_hathPerksCookie, "")

-    fun eh_nh_useHighQualityThumbs() = flowPrefs.getBoolean(Keys.eh_nh_useHighQualityThumbs, false)
-
    fun eh_showSyncIntro() = flowPrefs.getBoolean(Keys.eh_showSyncIntro, true)

    fun eh_readOnlySync() = flowPrefs.getBoolean(Keys.eh_readOnlySync, false)
@@ -343,12 +356,8 @@ class PreferencesHelper(val context: Context) {

    fun eh_aggressivePageLoading() = flowPrefs.getBoolean(Keys.eh_aggressivePageLoading, false)

-    fun eh_hl_useHighQualityThumbs() = flowPrefs.getBoolean(Keys.eh_hl_useHighQualityThumbs, false)
-
    fun eh_preload_size() = flowPrefs.getInt(Keys.eh_preload_size, 4)

-    fun eh_useNewMangaInterface() = flowPrefs.getBoolean(Keys.eh_use_new_manga_interface, true)
-
    fun eh_useAutoWebtoon() = flowPrefs.getBoolean(Keys.eh_use_auto_webtoon, true)

    fun eh_watchedListDefaultState() = flowPrefs.getBoolean(Keys.eh_watched_list_default_state, false)
@@ -368,4 +377,48 @@ class PreferencesHelper(val context: Context) {
    fun sourcesTabSourcesInCategories() = flowPrefs.getStringSet(Keys.sources_tab_source_categories, mutableSetOf())

    fun sourceSorting() = flowPrefs.getInt(Keys.sourcesSort, 0)
+
+    fun recommendsInOverflow() = flowPrefs.getBoolean(Keys.recommendsInOverflow, false)
+
+    fun enhancedEHentaiView() = flowPrefs.getBoolean(Keys.enhancedEHentaiView, true)
+
+    fun webtoonEnableZoomOut() = flowPrefs.getBoolean(Keys.webtoonEnableZoomOut, false)
+
+    fun startReadingButton() = flowPrefs.getBoolean(Keys.startReadingButton, true)
+
+    fun groupLibraryBy() = flowPrefs.getInt(Keys.groupLibraryBy, 0)
+
+    fun continuousVerticalTappingByPage() = flowPrefs.getBoolean(Keys.continuousVerticalTappingByPage, false)
+
+    fun groupLibraryUpdateType() = flowPrefs.getEnum(Keys.groupLibraryUpdateType, Values.GroupLibraryMode.GLOBAL)
+
+    fun useNewSourceNavigation() = flowPrefs.getBoolean(Keys.useNewSourceNavigation, false)
+
+    fun mangaDexLowQualityCovers() = flowPrefs.getBoolean(Keys.mangaDexLowQualityCovers, false)
+
+    fun mangaDexForceLatestCovers() = flowPrefs.getBoolean(Keys.mangaDexForceLatestCovers, false)
+
+    fun preferredMangaDexId() = flowPrefs.getString(Keys.preferredMangaDexId, "0")
+
+    fun dataSaver() = flowPrefs.getBoolean(Keys.dataSaver, false)
+
+    fun ignoreJpeg() = flowPrefs.getBoolean(Keys.ignoreJpeg, false)
+
+    fun ignoreGif() = flowPrefs.getBoolean(Keys.ignoreGif, true)
+
+    fun dataSaverImageQuality() = flowPrefs.getInt(Keys.dataSaverImageQuality, 80)
+
+    fun dataSaverImageFormatJpeg() = flowPrefs.getBoolean(Keys.dataSaverImageFormatJpeg, false)
+
+    fun dataSaverServer() = flowPrefs.getString(Keys.dataSaverServer, "")
+
+    fun dataSaverColorBW() = flowPrefs.getBoolean(Keys.dataSaverColorBW, false)
+
+    fun saveChaptersAsCBZ() = flowPrefs.getBoolean(Keys.saveChaptersAsCBZ, false)
+
+    fun saveChaptersAsCBZLevel() = flowPrefs.getInt(Keys.saveChaptersAsCBZLevel, 0)
+
+    fun allowLocalSourceHiddenFolders() = flowPrefs.getBoolean(Keys.allowLocalSourceHiddenFolders, false)
+
+    fun biometricTimeRanges() = flowPrefs.getStringSet(Keys.biometricTimeRanges, mutableSetOf())
 }
@@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi.data.preference

 import android.content.SharedPreferences
+import androidx.core.content.edit
 import androidx.preference.PreferenceDataStore

 class SharedPreferencesDataStore(private val prefs: SharedPreferences) : PreferenceDataStore() {
@@ -10,7 +11,9 @@ class SharedPreferencesDataStore(private val prefs: SharedPreferences) : Prefere
    }

    override fun putBoolean(key: String?, value: Boolean) {
-        prefs.edit().putBoolean(key, value).apply()
+        prefs.edit {
+            putBoolean(key, value)
+        }
    }

    override fun getInt(key: String?, defValue: Int): Int {
@@ -18,7 +21,9 @@ class SharedPreferencesDataStore(private val prefs: SharedPreferences) : Prefere
    }

    override fun putInt(key: String?, value: Int) {
-        prefs.edit().putInt(key, value).apply()
+        prefs.edit {
+            putInt(key, value)
+        }
    }

    override fun getLong(key: String?, defValue: Long): Long {
@@ -26,7 +31,9 @@ class SharedPreferencesDataStore(private val prefs: SharedPreferences) : Prefere
    }

    override fun putLong(key: String?, value: Long) {
-        prefs.edit().putLong(key, value).apply()
+        prefs.edit {
+            putLong(key, value)
+        }
    }

    override fun getFloat(key: String?, defValue: Float): Float {
@@ -34,7 +41,9 @@ class SharedPreferencesDataStore(private val prefs: SharedPreferences) : Prefere
    }

    override fun putFloat(key: String?, value: Float) {
-        prefs.edit().putFloat(key, value).apply()
+        prefs.edit {
+            putFloat(key, value)
+        }
    }

    override fun getString(key: String?, defValue: String?): String? {
@@ -42,7 +51,9 @@ class SharedPreferencesDataStore(private val prefs: SharedPreferences) : Prefere
    }

    override fun putString(key: String?, value: String?) {
-        prefs.edit().putString(key, value).apply()
+        prefs.edit {
+            putString(key, value)
+        }
    }

    override fun getStringSet(key: String?, defValues: MutableSet<String>?): MutableSet<String>? {
@@ -50,6 +61,8 @@ class SharedPreferencesDataStore(private val prefs: SharedPreferences) : Prefere
    }

    override fun putStringSet(key: String?, values: MutableSet<String>?) {
-        prefs.edit().putStringSet(key, values).apply()
+        prefs.edit {
+            putStringSet(key, values)
+        }
    }
 }
@@ -4,6 +4,7 @@ import android.content.Context
 import eu.kanade.tachiyomi.data.track.anilist.Anilist
 import eu.kanade.tachiyomi.data.track.bangumi.Bangumi
 import eu.kanade.tachiyomi.data.track.kitsu.Kitsu
+import eu.kanade.tachiyomi.data.track.mdlist.MdList
 import eu.kanade.tachiyomi.data.track.myanimelist.MyAnimeList
 import eu.kanade.tachiyomi.data.track.shikimori.Shikimori

@@ -15,8 +16,24 @@ class TrackManager(context: Context) {
        const val KITSU = 3
        const val SHIKIMORI = 4
        const val BANGUMI = 5
+
+        // SY --> Mangadex from Neko
+        const val MDLIST = 6
+        // SY <--
+
+        // SY -->
+        const val READING = 1
+        const val REREADING = 2
+        const val PLANTOREAD = 3
+        const val PAUSED = 4
+        const val COMPLETED = 5
+        const val DROPPED = 6
+        const val OTHER = 7
+        // SY <--
    }

+    val mdList = MdList(context, MDLIST)
+
    val myAnimeList = MyAnimeList(context, MYANIMELIST)

    val aniList = Anilist(context, ANILIST)
@@ -27,9 +44,25 @@ class TrackManager(context: Context) {

    val bangumi = Bangumi(context, BANGUMI)

-    val services = listOf(myAnimeList, aniList, kitsu, shikimori, bangumi)
+    val services = listOf(mdList, myAnimeList, aniList, kitsu, shikimori, bangumi)

    fun getService(id: Int) = services.find { it.id == id }

-    fun hasLoggedServices() = services.any { it.isLogged }
+    fun hasLoggedServices(isMangaDexManga: Boolean = true) = services.any { it.isLogged && ((it.id == MDLIST && isMangaDexManga) || it.id != MDLIST) }
+
+    // SY -->
+    fun mapTrackingOrder(status: String, context: Context): Int {
+        with(context) {
+            return when (status) {
+                getString(eu.kanade.tachiyomi.R.string.reading), getString(eu.kanade.tachiyomi.R.string.currently_reading) -> READING
+                getString(eu.kanade.tachiyomi.R.string.repeating) -> REREADING
+                getString(eu.kanade.tachiyomi.R.string.plan_to_read), getString(eu.kanade.tachiyomi.R.string.want_to_read) -> PLANTOREAD
+                getString(eu.kanade.tachiyomi.R.string.on_hold), getString(eu.kanade.tachiyomi.R.string.paused) -> PAUSED
+                getString(eu.kanade.tachiyomi.R.string.completed) -> COMPLETED
+                getString(eu.kanade.tachiyomi.R.string.dropped) -> DROPPED
+                else -> OTHER
+            }
+        }
+    }
+    // SY <--
 }
@@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi.data.track.anilist

 import android.net.Uri
+import androidx.core.net.toUri
 import com.github.salomonbrys.kotson.array
 import com.github.salomonbrys.kotson.get
 import com.github.salomonbrys.kotson.jsonObject
@@ -12,12 +13,12 @@ import com.google.gson.JsonParser
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.model.TrackSearch
 import eu.kanade.tachiyomi.network.asObservableSuccess
-import java.util.Calendar
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import rx.Observable
+import java.util.Calendar

 class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {

@@ -270,9 +271,14 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
        }

        return ALManga(
-            struct["id"].asInt, struct["title"]["romaji"].asString, struct["coverImage"]["large"].asString,
-            struct["description"].nullString.orEmpty(), struct["type"].asString, struct["status"].nullString.orEmpty(),
-            date, struct["chapters"].nullInt ?: 0
+            struct["id"].asInt,
+            struct["title"]["romaji"].asString,
+            struct["coverImage"]["large"].asString,
+            struct["description"].nullString.orEmpty(),
+            struct["type"].asString,
+            struct["status"].nullString.orEmpty(),
+            date,
+            struct["chapters"].nullInt ?: 0
        )
    }

@@ -291,7 +297,7 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
            return baseMangaUrl + mediaId
        }

-        fun authUrl() = Uri.parse("${baseUrl}oauth/authorize").buildUpon()
+        fun authUrl(): Uri = "${baseUrl}oauth/authorize".toUri().buildUpon()
            .appendQueryParameter("client_id", clientId)
            .appendQueryParameter("response_type", "token")
            .build()
@@ -4,9 +4,9 @@ import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.data.track.model.TrackSearch
+import uy.kohesive.injekt.injectLazy
 import java.text.SimpleDateFormat
 import java.util.Locale
-import uy.kohesive.injekt.injectLazy

 data class ALManga(
    val media_id: Int,
@@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi.data.track.bangumi

 import android.net.Uri
+import androidx.core.net.toUri
 import com.github.salomonbrys.kotson.array
 import com.github.salomonbrys.kotson.obj
 import com.google.gson.Gson
@@ -11,13 +12,13 @@ import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.data.track.model.TrackSearch
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.network.asObservableSuccess
-import java.net.URLEncoder
 import okhttp3.CacheControl
 import okhttp3.FormBody
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import rx.Observable
 import uy.kohesive.injekt.injectLazy
+import java.net.URLEncoder

 class BangumiApi(private val client: OkHttpClient, interceptor: BangumiInterceptor) {

@@ -72,9 +73,9 @@ class BangumiApi(private val client: OkHttpClient, interceptor: BangumiIntercept
    }

    fun search(search: String): Observable<List<TrackSearch>> {
-        val url = Uri.parse(
-            "$apiUrl/search/subject/${URLEncoder.encode(search, Charsets.UTF_8.name())}"
-        ).buildUpon()
+        val url = "$apiUrl/search/subject/${URLEncoder.encode(search, Charsets.UTF_8.name())}"
+            .toUri()
+            .buildUpon()
            .appendQueryParameter("max_results", "20")
            .build()
        val request = Request.Builder()
@@ -196,8 +197,8 @@ class BangumiApi(private val client: OkHttpClient, interceptor: BangumiIntercept
            return "$baseMangaUrl/$remoteId"
        }

-        fun authUrl() =
-            Uri.parse(loginUrl).buildUpon()
+        fun authUrl(): Uri =
+            loginUrl.toUri().buildUpon()
                .appendQueryParameter("client_id", clientId)
                .appendQueryParameter("response_type", "code")
                .appendQueryParameter("redirect_uri", redirectUrl)
@@ -7,10 +7,10 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.TrackService
 import eu.kanade.tachiyomi.data.track.model.TrackSearch
-import java.text.DecimalFormat
 import rx.Completable
 import rx.Observable
 import uy.kohesive.injekt.injectLazy
+import java.text.DecimalFormat

 class Kitsu(private val context: Context, id: Int) : TrackService(id) {

@@ -0,0 +1,134 @@
+package eu.kanade.tachiyomi.data.track.mdlist
+
+import android.content.Context
+import android.graphics.Color
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.database.DatabaseHelper
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.models.Track
+import eu.kanade.tachiyomi.data.track.TrackManager
+import eu.kanade.tachiyomi.data.track.TrackService
+import eu.kanade.tachiyomi.data.track.model.TrackSearch
+import exh.md.utils.FollowStatus
+import exh.md.utils.MdUtil
+import exh.metadata.metadata.MangaDexSearchMetadata
+import exh.metadata.metadata.base.getFlatMetadataForManga
+import exh.metadata.metadata.base.insertFlatMetadata
+import exh.util.asObservable
+import exh.util.floor
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.runBlocking
+import rx.Completable
+import rx.Observable
+import uy.kohesive.injekt.injectLazy
+
+class MdList(private val context: Context, id: Int) : TrackService(id) {
+
+    private val mdex by lazy { MdUtil.getEnabledMangaDex() }
+    private val db: DatabaseHelper by injectLazy()
+
+    override val name = "MDList"
+
+    override fun getLogo(): Int {
+        return R.drawable.ic_tracker_mangadex_logo
+    }
+
+    override fun getLogoColor(): Int {
+        return Color.rgb(43, 48, 53)
+    }
+
+    override fun getStatusList(): List<Int> {
+        return FollowStatus.values().map { it.int }
+    }
+
+    override fun getStatus(status: Int): String =
+        context.resources.getStringArray(R.array.md_follows_options).asList()[status]
+
+    override fun getScoreList() = IntRange(0, 10).map(Int::toString)
+
+    override fun displayScore(track: Track) = track.score.toInt().toString()
+
+    override fun add(track: Track): Observable<Track> {
+        return update(track)
+    }
+
+    override fun update(track: Track): Observable<Track> {
+        val mdex = mdex ?: throw Exception("Mangadex not enabled")
+        return Observable.defer {
+            db.getManga(track.tracking_url.substringAfter(".org"), mdex.id)
+                .asRxObservable()
+                .map { manga ->
+                    val mangaMetadata = db.getFlatMetadataForManga(manga.id!!).executeAsBlocking()?.raise(MangaDexSearchMetadata::class) ?: throw Exception("Invalid manga metadata")
+                    val followStatus = FollowStatus.fromInt(track.status)!!
+
+                    // allow follow status to update
+                    if (mangaMetadata.follow_status != followStatus.int) {
+                        runBlocking { mdex.updateFollowStatus(MdUtil.getMangaId(track.tracking_url), followStatus).collect() }
+                        mangaMetadata.follow_status = followStatus.int
+                        db.insertFlatMetadata(mangaMetadata.flatten()).await()
+                    }
+
+                    if (track.score.toInt() > 0) {
+                        runBlocking { mdex.updateRating(track).collect() }
+                    }
+
+                    // mangadex wont update chapters if manga is not follows this prevents unneeded network call
+
+                    if (followStatus != FollowStatus.UNFOLLOWED) {
+                        if (track.total_chapters != 0 && track.last_chapter_read == track.total_chapters) {
+                            track.status = FollowStatus.COMPLETED.int
+                        }
+
+                        runBlocking { mdex.updateReadingProgress(track).collect() }
+                    } else if (track.last_chapter_read != 0) {
+                        // When followStatus has been changed to unfollowed 0 out read chapters since dex does
+                        track.last_chapter_read = 0
+                    }
+                    track
+                }
+        }
+    }
+
+    override fun getCompletionStatus(): Int = FollowStatus.COMPLETED.int
+
+    override fun bind(track: Track): Observable<Track> {
+        val mdex = mdex ?: throw Exception("Mangadex not enabled")
+        return mdex.fetchTrackingInfo(track.tracking_url).asObservable()
+            .doOnNext { remoteTrack ->
+                track.copyPersonalFrom(remoteTrack)
+                track.total_chapters = if (remoteTrack.total_chapters == 0) {
+                    db.getChapters(track.manga_id).executeAsBlocking().maxOfOrNull { it.chapter_number }?.floor() ?: remoteTrack.total_chapters
+                } else {
+                    remoteTrack.total_chapters
+                }
+                update(track)
+            }
+    }
+
+    override fun refresh(track: Track): Observable<Track> {
+        val mdex = mdex ?: throw Exception("Mangadex not enabled")
+        return mdex.fetchTrackingInfo(track.tracking_url).asObservable()
+            .map { remoteTrack ->
+                track.copyPersonalFrom(remoteTrack)
+                track.total_chapters = if (remoteTrack.total_chapters == 0) {
+                    db.getChapters(track.manga_id).executeAsBlocking().maxOfOrNull { it.chapter_number }?.floor() ?: remoteTrack.total_chapters
+                } else {
+                    remoteTrack.total_chapters
+                }
+                track
+            }
+    }
+
+    fun createInitialTracker(manga: Manga): Track {
+        val track = Track.create(TrackManager.MDLIST)
+        track.manga_id = manga.id!!
+        track.status = FollowStatus.UNFOLLOWED.int
+        track.tracking_url = MdUtil.baseUrl + manga.url
+        track.title = manga.title
+        return track
+    }
+
+    override fun search(query: String): Observable<List<TrackSearch>> = throw Exception("not used")
+
+    override fun login(username: String, password: String): Completable = throw Exception("not used")
+}
@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.data.track.myanimelist

-import android.net.Uri
+import androidx.core.net.toUri
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.data.track.model.TrackSearch
@@ -11,13 +11,6 @@ import eu.kanade.tachiyomi.network.asObservableSuccess
 import eu.kanade.tachiyomi.util.lang.toCalendar
 import eu.kanade.tachiyomi.util.selectInt
 import eu.kanade.tachiyomi.util.selectText
-import java.io.BufferedReader
-import java.io.InputStreamReader
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.GregorianCalendar
-import java.util.Locale
-import java.util.zip.GZIPInputStream
 import okhttp3.FormBody
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
@@ -30,6 +23,13 @@ import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import org.jsoup.parser.Parser
 import rx.Observable
+import java.io.BufferedReader
+import java.io.InputStreamReader
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.GregorianCalendar
+import java.util.Locale
+import java.util.zip.GZIPInputStream

 class MyAnimeListApi(private val client: OkHttpClient, interceptor: MyAnimeListInterceptor) {

@@ -260,13 +260,13 @@ class MyAnimeListApi(private val client: OkHttpClient, interceptor: MyAnimeListI

        private fun mangaUrl(remoteId: Int) = baseMangaUrl + remoteId

-        private fun loginUrl() = Uri.parse(baseUrl).buildUpon()
+        private fun loginUrl() = baseUrl.toUri().buildUpon()
            .appendPath("login.php")
            .toString()

        private fun searchUrl(query: String): String {
            val col = "c[]"
-            return Uri.parse(baseUrl).buildUpon()
+            return baseUrl.toUri().buildUpon()
                .appendPath("manga.php")
                .appendQueryParameter("q", query)
                .appendQueryParameter(col, "a")
@@ -278,17 +278,17 @@ class MyAnimeListApi(private val client: OkHttpClient, interceptor: MyAnimeListI
                .toString()
        }

-        private fun exportListUrl() = Uri.parse(baseUrl).buildUpon()
+        private fun exportListUrl() = baseUrl.toUri().buildUpon()
            .appendPath("panel.php")
            .appendQueryParameter("go", "export")
            .toString()

-        private fun editPageUrl(mediaId: Int) = Uri.parse(baseModifyListUrl).buildUpon()
+        private fun editPageUrl(mediaId: Int) = baseModifyListUrl.toUri().buildUpon()
            .appendPath(mediaId.toString())
            .appendPath("edit")
            .toString()

-        private fun addUrl() = Uri.parse(baseModifyListUrl).buildUpon()
+        private fun addUrl() = baseModifyListUrl.toUri().buildUpon()
            .appendPath("add.json")
            .toString()

@@ -476,7 +476,9 @@ class MyAnimeListApi(private val client: OkHttpClient, interceptor: MyAnimeListI
        fun copyPersonalFrom(track: Track) {
            num_read_chapters = track.last_chapter_read.toString()
            val numScore = track.score.toInt()
-            if (numScore in 1..9) {
+            if (numScore == 0) {
+                score = ""
+            } else if (numScore in 1..10) {
                score = numScore.toString()
            }
            status = track.status.toString()
@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.data.track.shikimori

-import android.net.Uri
+import androidx.core.net.toUri
 import com.github.salomonbrys.kotson.array
 import com.github.salomonbrys.kotson.jsonObject
 import com.github.salomonbrys.kotson.nullString
@@ -54,7 +54,7 @@ class ShikimoriApi(private val client: OkHttpClient, interceptor: ShikimoriInter
    fun updateLibManga(track: Track, user_id: String): Observable<Track> = addLibManga(track, user_id)

    fun search(search: String): Observable<List<TrackSearch>> {
-        val url = Uri.parse("$apiUrl/mangas").buildUpon()
+        val url = "$apiUrl/mangas".toUri().buildUpon()
            .appendQueryParameter("order", "popularity")
            .appendQueryParameter("search", search)
            .appendQueryParameter("limit", "20")
@@ -102,7 +102,7 @@ class ShikimoriApi(private val client: OkHttpClient, interceptor: ShikimoriInter
    }

    fun findLibManga(track: Track, user_id: String): Observable<Track?> {
-        val url = Uri.parse("$apiUrl/v2/user_rates").buildUpon()
+        val url = "$apiUrl/v2/user_rates".toUri().buildUpon()
            .appendQueryParameter("user_id", user_id)
            .appendQueryParameter("target_id", track.media_id.toString())
            .appendQueryParameter("target_type", "Manga")
@@ -112,7 +112,7 @@ class ShikimoriApi(private val client: OkHttpClient, interceptor: ShikimoriInter
            .get()
            .build()

-        val urlMangas = Uri.parse("$apiUrl/mangas").buildUpon()
+        val urlMangas = "$apiUrl/mangas".toUri().buildUpon()
            .appendPath(track.media_id.toString())
            .build()
        val requestMangas = Request.Builder()
@@ -187,7 +187,7 @@ class ShikimoriApi(private val client: OkHttpClient, interceptor: ShikimoriInter
        }

        fun authUrl() =
-            Uri.parse(loginUrl).buildUpon()
+            loginUrl.toUri().buildUpon()
                .appendQueryParameter("client_id", clientId)
                .appendQueryParameter("redirect_uri", redirectUrl)
                .appendQueryParameter("response_type", "code")
@@ -1,19 +0,0 @@
-package eu.kanade.tachiyomi.data.updater
-
-import eu.kanade.tachiyomi.data.updater.github.GithubUpdateChecker
-
-abstract class UpdateChecker {
-
-    companion object {
-        fun getUpdateChecker(): UpdateChecker {
-            // SY -->
-            return GithubUpdateChecker()
-            // SY <--
-        }
-    }
-
-    /**
-     * Returns observable containing release information
-     */
-    abstract suspend fun checkForUpdate(): UpdateResult
-}
@@ -13,9 +13,10 @@ import androidx.work.Worker
 import androidx.work.WorkerParameters
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.notification.Notifications
+import eu.kanade.tachiyomi.data.updater.github.GithubUpdateChecker
 import eu.kanade.tachiyomi.util.system.notificationManager
-import java.util.concurrent.TimeUnit
 import kotlinx.coroutines.runBlocking
+import java.util.concurrent.TimeUnit

 class UpdaterJob(private val context: Context, workerParams: WorkerParameters) :
    Worker(context, workerParams) {
@@ -23,7 +24,7 @@ class UpdaterJob(private val context: Context, workerParams: WorkerParameters) :
    override fun doWork(): Result {
        return runBlocking {
            try {
-                val result = UpdateChecker.getUpdateChecker().checkForUpdate()
+                val result = GithubUpdateChecker().checkForUpdate()

                if (result is UpdateResult.NewUpdate<*>) {
                    val url = result.release.downloadLink
@@ -65,8 +66,10 @@ class UpdaterJob(private val context: Context, workerParams: WorkerParameters) :
                .build()

            val request = PeriodicWorkRequestBuilder<UpdaterJob>(
-                3, TimeUnit.DAYS,
-                3, TimeUnit.HOURS
+                3,
+                TimeUnit.DAYS,
+                3,
+                TimeUnit.HOURS
            )
                .addTag(TAG)
                .setConstraints(constraints)
@@ -20,9 +20,9 @@ import eu.kanade.tachiyomi.util.storage.getUriCompat
 import eu.kanade.tachiyomi.util.storage.saveTo
 import eu.kanade.tachiyomi.util.system.acquireWakeLock
 import eu.kanade.tachiyomi.util.system.isServiceRunning
-import java.io.File
 import timber.log.Timber
 import uy.kohesive.injekt.injectLazy
+import java.io.File

 class UpdaterService : Service() {

@@ -1,13 +0,0 @@
-package eu.kanade.tachiyomi.data.updater.devrepo
-
-import eu.kanade.tachiyomi.data.updater.Release
-
-class DevRepoRelease(override val info: String) : Release {
-
-    override val downloadLink: String
-        get() = LATEST_URL
-
-    companion object {
-        const val LATEST_URL = "https://tachiyomi.kanade.eu/latest"
-    }
-}
@@ -1,41 +0,0 @@
-package eu.kanade.tachiyomi.data.updater.devrepo
-
-import eu.kanade.tachiyomi.BuildConfig
-import eu.kanade.tachiyomi.data.updater.UpdateChecker
-import eu.kanade.tachiyomi.data.updater.UpdateResult
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.NetworkHelper
-import eu.kanade.tachiyomi.network.await
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import okhttp3.OkHttpClient
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-
-class DevRepoUpdateChecker : UpdateChecker() {
-
-    private val client: OkHttpClient by lazy {
-        Injekt.get<NetworkHelper>().client.newBuilder()
-            .followRedirects(false)
-            .build()
-    }
-
-    private val versionRegex: Regex by lazy {
-        Regex("tachiyomi-r(\\d+).apk")
-    }
-
-    override suspend fun checkForUpdate(): UpdateResult {
-        val response = withContext(Dispatchers.IO) {
-            client.newCall(GET(DevRepoRelease.LATEST_URL)).await(assertSuccess = false)
-        }
-
-        // Get latest repo version number from header in format "Location: tachiyomi-r1512.apk"
-        val latestVersionNumber: String = versionRegex.find(response.header("Location")!!)!!.groupValues[1]
-
-        return if (latestVersionNumber.toInt() > BuildConfig.COMMIT_COUNT.toInt()) {
-            DevRepoUpdateResult.NewUpdate(DevRepoRelease("v$latestVersionNumber"))
-        } else {
-            DevRepoUpdateResult.NoNewUpdate()
-        }
-    }
-}
@@ -1,9 +0,0 @@
-package eu.kanade.tachiyomi.data.updater.devrepo
-
-import eu.kanade.tachiyomi.data.updater.UpdateResult
-
-sealed class DevRepoUpdateResult : UpdateResult() {
-
-    class NewUpdate(release: DevRepoRelease) : UpdateResult.NewUpdate<DevRepoRelease>(release)
-    class NoNewUpdate : UpdateResult.NoNewUpdate()
-}
@@ -28,5 +28,5 @@ class GithubRelease(
     * Assets class containing download url.
     * @param downloadLink download url.
     */
-    inner class Assets(@SerializedName("browser_download_url") val downloadLink: String)
+    class Assets(@SerializedName("browser_download_url") val downloadLink: String)
 }
@@ -4,11 +4,12 @@ import eu.kanade.tachiyomi.network.NetworkHelper
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.http.GET
+import retrofit2.http.Path
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get

 /**
- * Used to connect with the GitHub API.
+ * Used to connect with the GitHub API to get the latest release version from a repo.
 */
 interface GithubService {

@@ -24,11 +25,6 @@ interface GithubService {
        }
    }

-    // SY -->
-    @GET("/repos/jobobby04/tachiyomiSY/releases/latest")
-    suspend fun getLatestVersion(): GithubRelease
-
-    @GET("/repos/jobobby04/TachiyomiSYPreview/releases/latest")
-    suspend fun getLatestDebugVersion(): GithubRelease
-    // SY <--
+    @GET("/repos/{repo}/releases/latest")
+    suspend fun getLatestVersion(@Path("repo", encoded = true) repo: String): GithubRelease
 }
@@ -1,28 +1,49 @@
 package eu.kanade.tachiyomi.data.updater.github

 import eu.kanade.tachiyomi.BuildConfig
-import eu.kanade.tachiyomi.data.updater.UpdateChecker
 import eu.kanade.tachiyomi.data.updater.UpdateResult
 import exh.syDebugVersion
-// SY -->
-class GithubUpdateChecker(val debug: Boolean = false) : UpdateChecker() {
+
+class GithubUpdateChecker {

    private val service: GithubService = GithubService.create()

-    override suspend fun checkForUpdate(): UpdateResult {
-        val release = if (syDebugVersion != "0") {
-            service.getLatestDebugVersion()
+    private val repo: String by lazy {
+        // Sy -->
+        if (syDebugVersion != "0") {
+            "jobobby04/TachiyomiSYPreview"
        } else {
-            service.getLatestVersion()
+            "jobobby04/tachiyomiSY"
        }
+        // SY <--
+    }
+
+    suspend fun checkForUpdate(): UpdateResult {
+        val release = service.getLatestVersion(repo)

-        val newVersion = release.version
        // Check if latest version is different from current version
+        // SY -->
+        val newVersion = release.version
        return if ((newVersion != BuildConfig.VERSION_NAME && (syDebugVersion == "0")) || ((syDebugVersion != "0") && newVersion != syDebugVersion)) {
+            // SY <--
            GithubUpdateResult.NewUpdate(release)
        } else {
            GithubUpdateResult.NoNewUpdate()
        }
    }
+
+    private fun isNewVersion(versionTag: String): Boolean {
+        // Removes prefixes like "r" or "v"
+        val newVersion = versionTag.replace("[^\\d.]".toRegex(), "")
+
+        return if (BuildConfig.DEBUG) {
+            // Preview builds: based on releases in "tachiyomiorg/android-app-preview" repo
+            // tagged as something like "r1234"
+            newVersion.toInt() > BuildConfig.COMMIT_COUNT.toInt()
+        } else {
+            // Release builds: based on releases in "inorichi/tachiyomi" repo
+            // tagged as something like "v0.1.2"
+            newVersion != BuildConfig.VERSION_NAME
+        }
+    }
 }
-// SY <--
@@ -6,6 +6,7 @@ import com.elvishew.xlog.XLog
 import com.jakewharton.rxrelay.BehaviorRelay
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.data.preference.plusAssign
 import eu.kanade.tachiyomi.extension.api.ExtensionGithubApi
 import eu.kanade.tachiyomi.extension.model.Extension
 import eu.kanade.tachiyomi.extension.model.InstallStep
@@ -18,14 +19,8 @@ import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.util.lang.launchNow
 import eu.kanade.tachiyomi.util.system.toast
 import exh.EH_SOURCE_ID
-import exh.EIGHTMUSES_SOURCE_ID
 import exh.EXH_SOURCE_ID
-import exh.HBROWSE_SOURCE_ID
-import exh.HITOMI_SOURCE_ID
 import exh.MERGED_SOURCE_ID
-import exh.NHENTAI_SOURCE_ID
-import exh.PERV_EDEN_EN_SOURCE_ID
-import exh.PERV_EDEN_IT_SOURCE_ID
 import exh.source.BlacklistedSources
 import kotlinx.coroutines.async
 import rx.Observable
@@ -83,12 +78,6 @@ class ExtensionManager(
        return when (source.id) {
            EH_SOURCE_ID -> context.getDrawable(R.mipmap.ic_ehentai_source)
            EXH_SOURCE_ID -> context.getDrawable(R.mipmap.ic_ehentai_source)
-            PERV_EDEN_EN_SOURCE_ID -> context.getDrawable(R.mipmap.ic_perveden_source)
-            PERV_EDEN_IT_SOURCE_ID -> context.getDrawable(R.mipmap.ic_perveden_source)
-            NHENTAI_SOURCE_ID -> context.getDrawable(R.mipmap.ic_nhentai_source)
-            HITOMI_SOURCE_ID -> context.getDrawable(R.mipmap.ic_hitomi_source)
-            EIGHTMUSES_SOURCE_ID -> context.getDrawable(R.mipmap.ic_8muses_source)
-            HBROWSE_SOURCE_ID -> context.getDrawable(R.mipmap.ic_hbrowse_source)
            MERGED_SOURCE_ID -> context.getDrawable(R.mipmap.ic_merged_source)
            else -> null
        }
@@ -319,8 +308,7 @@ class ExtensionManager(
        if (signature !in untrustedSignatures) return

        ExtensionLoader.trustedSignatures += signature
-        val preference = preferences.trustedSignatures()
-        preference.set(preference.get() + signature)
+        preferences.trustedSignatures() += signature

        val nowTrustedExtensions = untrustedExtensions.filter { it.signatureHash == signature }
        untrustedExtensions -= nowTrustedExtensions
@@ -16,10 +16,10 @@ import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.extension.api.ExtensionGithubApi
 import eu.kanade.tachiyomi.util.system.notification
-import java.util.concurrent.TimeUnit
 import kotlinx.coroutines.coroutineScope
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
+import java.util.concurrent.TimeUnit

 class ExtensionUpdateJob(private val context: Context, workerParams: WorkerParameters) :
    CoroutineWorker(context, workerParams) {
@@ -73,8 +73,10 @@ class ExtensionUpdateJob(private val context: Context, workerParams: WorkerParam
                    .build()

                val request = PeriodicWorkRequestBuilder<ExtensionUpdateJob>(
-                    12, TimeUnit.HOURS,
-                    1, TimeUnit.HOURS
+                    12,
+                    TimeUnit.HOURS,
+                    1,
+                    TimeUnit.HOURS
                )
                    .addTag(TAG)
                    .setConstraints(constraints)
@@ -1,44 +1,30 @@
 package eu.kanade.tachiyomi.extension.api

 import android.content.Context
-import com.github.salomonbrys.kotson.fromJson
 import com.github.salomonbrys.kotson.get
 import com.github.salomonbrys.kotson.int
 import com.github.salomonbrys.kotson.string
-import com.google.gson.Gson
 import com.google.gson.JsonArray
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.extension.model.Extension
 import eu.kanade.tachiyomi.extension.model.LoadResult
 import eu.kanade.tachiyomi.extension.util.ExtensionLoader
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.NetworkHelper
-import eu.kanade.tachiyomi.network.await
 import exh.source.BlacklistedSources
-import java.util.Date
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import okhttp3.Response
 import uy.kohesive.injekt.injectLazy
+import java.util.Date

 internal class ExtensionGithubApi {

-    private val network: NetworkHelper by injectLazy()
    private val preferences: PreferencesHelper by injectLazy()

-    private val gson: Gson by injectLazy()
-
    suspend fun findExtensions(): List<Extension.Available> {
-        val call = GET(EXT_URL)
+        val service: ExtensionGithubService = ExtensionGithubService.create()

        return withContext(Dispatchers.IO) {
-            val response = network.client.newCall(call).await()
-            if (response.isSuccessful) {
-                parseResponse(response)
-            } else {
-                response.close()
-                throw Exception("Failed to get extensions")
-            }
+            val response = service.getRepo()
+            parseResponse(response)
        }
    }

@@ -72,11 +58,7 @@ internal class ExtensionGithubApi {
        return extensionsWithUpdate
    }

-    private fun parseResponse(response: Response): List<Extension.Available> {
-        val text = response.body?.use { it.string() } ?: return emptyList()
-
-        val json = gson.fromJson<JsonArray>(text)
-
+    private fun parseResponse(json: JsonArray): List<Extension.Available> {
        return json
            .filter { element ->
                val versionName = element["version"].string
@@ -90,14 +72,15 @@ internal class ExtensionGithubApi {
                val versionName = element["version"].string
                val versionCode = element["code"].int
                val lang = element["lang"].string
-                val icon = "$REPO_URL/icon/${apkName.replace(".apk", ".png")}"
+                val nsfw = element["nsfw"].int == 1
+                val icon = "$REPO_URL_PREFIX/icon/${apkName.replace(".apk", ".png")}"

-                Extension.Available(name, pkgName, versionName, versionCode, lang, apkName, icon)
+                Extension.Available(name, pkgName, versionName, versionCode, lang, nsfw, apkName, icon)
            }
    }

    fun getApkUrl(extension: Extension.Available): String {
-        return "$REPO_URL/apk/${extension.apkName}"
+        return "$REPO_URL_PREFIX/apk/${extension.apkName}"
    }

    // SY -->
@@ -110,7 +93,7 @@ internal class ExtensionGithubApi {
    // SY <--

    companion object {
-        private const val REPO_URL = "https://raw.githubusercontent.com/inorichi/tachiyomi-extensions/repo"
-        private const val EXT_URL = "$REPO_URL/index.json"
+        const val BASE_URL = "https://raw.githubusercontent.com/"
+        const val REPO_URL_PREFIX = "${BASE_URL}inorichi/tachiyomi-extensions/repo/"
    }
 }
--- a/Show More
+++ b/Show More