Release 0.10.6

Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: Ava <Sasu.ruotsalainen@live.fi>
Co-authored-by: C201 <derasetad@gmail.com>
Co-authored-by: DarKCroX <darkcrox.2020@outlook.com>
Co-authored-by: Eduard Ereza Martínez <eduard@ereza.cat>
Co-authored-by: Eric <spice2wolf@gmail.com>
Co-authored-by: HaruSasaki <aiqusubaru@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Huang Zhiyi <hzy980512@126.com>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Kurocon <weblate@kurocon.nl>
Co-authored-by: Mario Kevin D. A <programas013@gmail.com>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Oğuz Ersen <oguzersen@protonmail.com>
Co-authored-by: Paulo Pinho <kebrus@gmail.com>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Samuel Carvalho de Araújo <samuelnegro12345@gmail.com>
Co-authored-by: Tooster <max@polarczyk.pl>
Co-authored-by: Woodyx <shiposhouyou@gmail.com>
Co-authored-by: Yassin <yassinelaoud@gmail.com>
Co-authored-by: f0roots <f0rootss@gmail.com>
Co-authored-by: sunbeams001 <sunbeams001@gmail.com>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ar/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ca/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/de/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/el/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es_419/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/id/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/it/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ja/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ms/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/nl/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pl/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt_BR/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ro/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ru/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sc/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/tr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hans/
Translation: Tachiyomi/Strings

Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: Ava <Sasu.ruotsalainen@live.fi>
Co-authored-by: C201 <derasetad@gmail.com>
Co-authored-by: DarKCroX <darkcrox.2020@outlook.com>
Co-authored-by: Eduard Ereza Martínez <eduard@ereza.cat>
Co-authored-by: Eric <spice2wolf@gmail.com>
Co-authored-by: HaruSasaki <aiqusubaru@gmail.com>
Co-authored-by: Huang Zhiyi <hzy980512@126.com>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Kurocon <weblate@kurocon.nl>
Co-authored-by: Mario Kevin D. A <programas013@gmail.com>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Oğuz Ersen <oguzersen@protonmail.com>
Co-authored-by: Paulo Pinho <kebrus@gmail.com>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Samuel Carvalho de Araújo <samuelnegro12345@gmail.com>
Co-authored-by: Tooster <max@polarczyk.pl>
Co-authored-by: Woodyx <shiposhouyou@gmail.com>
Co-authored-by: Yassin <yassinelaoud@gmail.com>
Co-authored-by: f0roots <f0rootss@gmail.com>
Co-authored-by: sunbeams001 <sunbeams001@gmail.com>
Co-authored-by: Роман <Rozhenkov69@gmail.com>

.gitattributes

@@ -0,0 +1,24 @@
+* text=auto
+* text eol=lf
+
+# Windows forced line-endings
+/.idea/* text eol=crlf
+
+# Gradle wrapper
+*.jar binary
+
+# Images
+*.webp binary
+*.png binary
+*.jpg binary
+*.jpeg binary
+*.gif binary
+*.ico binary
+*.gz binary
+*.zip binary
+*.7z binary
+*.ttf binary
+*.eot binary
+*.woff binary
+*.pyc binary
+*.swp binary

.github/CONTRIBUTING.md

@@ -1,10 +1,10 @@
-1. **Before reporting a new issue, take a look at the [FAQ](https://github.com/inorichi/tachiyomi/wiki/FAQ), the [changelog](https://github.com/inorichi/tachiyomi/releases) and the already opened [issues](https://github.com/inorichi/tachiyomi/issues).**
+1. **Before reporting a new issue, take a look at the [FAQ](https://tachiyomi.org/help/faq/), the [changelog](https://github.com/inorichi/tachiyomi/releases) and the already opened [issues](https://github.com/inorichi/tachiyomi/issues).**
 2. If you are unsure, ask here: [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/tachiyomi)
 3. What is your type of issue?
     * [Catalogue request](#catalogue-requests)
     * [Bugs](#bugs)
     * [Feature requests](#feature-requests)
-    * [Translations](https://github.com/inorichi/tachiyomi/wiki/Translation)
+    * [Translations](https://tachiyomi.org/help/contribution/#translation)
 4. After following 1. and 3. you can [open your issue](https://github.com/inorichi/tachiyomi/issues/new)
 
 ***
@@ -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)
@@ -29,5 +29,5 @@ DON'T: https://github.com/inorichi/tachiyomi/issues/75
 
 # Feature requests
 
-* Write a detailed issue, explaning what it should do or how. Avoid writing just "like X app does"
+* Write a detailed issue, explaining what it should do or how. Avoid writing just "like X app does"
 * Include screenshot (if needed)

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: inorichi
+ko_fi: inorichi

.github/ISSUE_TEMPLATE.md

@@ -1,17 +1,26 @@
-**DO NOT OPEN ISSUES/REQUESTS RELATING TO EXTENSIONS/CATALOGUES IN THIS REPOSITORY. Open them at the following repository  https://github.com/inorichi/tachiyomi-extensions/**
+**PLEASE READ THIS**
 
-**For all other requests Please fill out the form below and remove the first 3 lines of this template**
+I acknowledge that:
 
-**App version:**
+- I have updated to the latest version of the app (stable is v0.10.5)
+- 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
 
-**Android version:**
+**DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT**
 
-**Issue/Request:**
+---
 
-**Steps to reproduce (if applicable)**
+## Device information
+* Tachiyomi version: ?
+* Android version: ?
+* Device: ?
 
- 1.
+## Steps to reproduce
- 2.
+1. First step
- 3.
+2. Second step
 
-**Other details:**
+## Issue/Request
+?
+
+## Other details
+Additional details and attachments.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,36 @@
+---
+name: "🐞 Bug report"
+about: Report a bug
+title: "[Bug] <Write short description here>"
+labels: "bug"
+---
+
+**PLEASE READ THIS**
+
+I acknowledge that:
+
+- I have updated to the latest version of the app (stable is v0.10.5)
+- I have updated all extensions
+- If this is an issue with an extension, that I should be opening an issue in https://github.com/inorichi/tachiyomi-extensions
+
+**DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT**
+
+---
+
+## Device information
+* Tachiyomi version: ?
+* Android version: ?
+* Device: ?
+
+## Steps to reproduce
+1. First step
+2. Second step
+
+### Expected behavior
+This should happen.
+
+### Actual behavior
+This happened instead.
+
+## Other details
+Additional details and attachments.

.github/ISSUE_TEMPLATE/config.yml

@@ -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.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,24 @@
+---
+name: "🌟 Feature request"
+about: Suggest a feature to improve Tachiyomi
+title: "[Feature Request] <Write short description here>"
+labels: "feature"
+---
+
+**PLEASE READ THIS**
+
+I acknowledge that:
+
+- I have updated to the latest version of the app (stable is v0.10.5)
+- I have updated all extensions
+- If this is an issue with an extension, that I should be opening an issue in https://github.com/inorichi/tachiyomi-extensions
+
+**DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT**
+
+---
+
+## Why/User Benefit/User Problem
+(explain why this feature should be added)
+
+## What/Requirements
+(explain how this feature would behave)

.github/ISSUE_TEMPLATE/source_issue.md

@@ -0,0 +1,8 @@
+---
+name: "Extension/source/catalogue issue"
+about: "Do not open an issue here. See https://github.com/inorichi/tachiyomi-extensions"
+title: "THIS ISSUE IS IN THE WRONG REPO; SEE https://github.com/inorichi/tachiyomi-extensions"
+labels: "catalog, invalid"
+---
+
+DO NOT OPEN AN ISSUE IN THIS REPO. SEE https://github.com/inorichi/tachiyomi-extensions

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

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

.github/workflows/build.yml

@@ -0,0 +1,95 @@
+name: CI
+on:
+  push:
+    branches:
+      - dev
+    tags:
+      - v*
+  pull_request:
+
+jobs:
+  check_wrapper:
+    name: Validate Gradle Wrapper
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone repo
+        uses: actions/checkout@v2
+
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v1
+
+  build:
+    name: Build app
+    needs: check_wrapper
+    if: "!startsWith(github.event.head_commit.message, '[SKIP CI]')"
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Cancel previous runs
+        uses: styfle/cancel-workflow-action@0.5.0
+        with:
+          access_token: ${{ github.token }}
+
+      - name: Clone repo
+        uses: actions/checkout@v2
+
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+      - name: Copy CI gradle.properties
+        run: |
+          mkdir -p ~/.gradle
+          cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
+
+      - name: Build app
+        uses: eskatos/gradle-command-action@v1
+        with:
+          arguments: assembleStandardRelease
+          wrapper-cache-enabled: true
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: true
+
+      # Sign APK and create release for tags
+
+      - name: Get tag name
+        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'inorichi/tachiyomi'
+        id: get_tag_name
+        run: |
+          set -x
+          echo "VERSION_TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
+
+      - name: Sign APK
+        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'inorichi/tachiyomi'
+        uses: r0adkll/sign-android-release@v1
+        with:
+          releaseDirectory: app/build/outputs/apk/standard/release
+          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+          alias: ${{ secrets.ALIAS }}
+          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+
+      - name: Create release
+        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'inorichi/tachiyomi'
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ env.VERSION_TAG }}
+          release_name: Tachiyomi ${{ env.VERSION_TAG }}
+          draft: true
+          prerelease: false
+
+      - name: Upload APK to release
+        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'inorichi/tachiyomi'
+        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: tachiyomi-${{ env.VERSION_TAG }}.apk
+          asset_content_type: application/vnd.android.package-archive

.github/workflows/issue_closer.yml

@@ -0,0 +1,37 @@
+name: Issue closer
+on:
+  issues:
+    types: [opened, edited, reopened]
+
+jobs:
+  autoclose:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Autoclose when created in wrong repo
+      uses: arkon/issue-closer-action@v1.1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        type: title
+        regex: ".*THIS ISSUE IS IN THE WRONG REPO.*"
+        message: "@${issue.user.login} this issue was automatically closed because it was not opened in the correct repo, as the template mentioned."
+    - name: Autoclose when no short description provided
+      uses: arkon/issue-closer-action@v1.1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        type: title
+        regex: ".*<Write short description here>*"
+        message: "@${issue.user.login} this issue was automatically closed because you did not fill out the description in the title."
+    - name: Autoclose when body acknowledgement section not removed
+      uses: arkon/issue-closer-action@v1.1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        type: body
+        regex: ".*DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT.*"
+        message: "@${issue.user.login} this issue was automatically closed because the acknowledgment section was not removed."
+    - name: Autoclose when body requested information not filled out
+      uses: arkon/issue-closer-action@v1.1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        type: body
+        regex: ".*\\* (Tachiyomi version|Android version|Device): \\?.*"
+        message: "@${issue.user.login} this issue was automatically closed because the requested information was not filled out."

.gitignore

@@ -2,8 +2,15 @@
 /local.properties
 /.idea/workspace.xml
 .DS_Store
-/build
 .idea/
 *iml
 *.iml
+
+# Built files
 */build
+/build
+*.apk
+app/**/output.json
+
+# Hebrew assets are copied on build
+app/src/main/res/values-iw/

.travis.yml

@@ -1,58 +0,0 @@
-language: android
-android:
-  components:
-  - build-tools-28.0.3
-  - android-27
-  - extra-android-m2repository
-  - extra-google-m2repository
-  - extra-android-support
-  - extra-google-google_play_services
-  licenses:
-  - android-sdk-license-.+
-before_install:
-- yes | sdkmanager "platforms;android-27" # workaround for accepting the license
-- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
-    openssl aes-256-cbc -K $encrypted_e56be693d4fd_key -iv $encrypted_e56be693d4fd_iv -in "$PWD/.travis/secrets.tar.enc" -out secrets.tar -d;
-    tar xf secrets.tar;
-    mv debug.keystore "$HOME/.android";
-  fi
-- git clone https://github.com/urho3d/android-ndk.git $HOME/android-ndk-root
-- export ANDROID_NDK_HOME=$HOME/android-ndk-root
-- mkdir "$ANDROID_HOME/licenses" || true
-- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
-- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
-script: ".travis/build.sh"
-before_cache:
-- rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-cache:
-  directories:
-  - "$HOME/.gradle/caches/"
-  - "$HOME/.gradle/wrapper/"
-  - "$HOME/.android/build-cache"
-deploy:
-- provider: releases
-  api_key:
-    secure: qmS9SyMq8xPDqaY83rvAFyZcvic24lGBj3MFt22RhVJzIXAAN/vqL1R70PnNiCF7CE+R7PaDlBpwjxDMBiuh0QQNc1oX6cgepUbro4/Nt7NFFfCvKXaFdR1cSgYouhuHmy0SS0/alrcfhQ2bPwcm1/vAOiSa8Wu7hsXhCcxbFyEbXZVD11QZmiffEM0py+OeuqOFo2JxZaGRu2z04E/u5TWep1ZEuhFRCC87PGgFqABgg6jYYebQOUZADG/0G8581HTGU0mdwueYsiA35ncRzpV2V8DajEEBd5wOe5d8SyMtE+6Qs5PD9KcXAqGGe4QRmrJMX5EcLQaLZf/Qd5s9SFZVHb1aJIw/y05w4L5dlVpsjx5WuUAYAVg7Ol5UawofFo/hYkYCNmfub67wJQdHSIxPif7V6YeON6RQQMpc5GBYY9eA6ZxhrdA2m7eyoOT3jcbdaVJwC0jMGhn26hkgJfTo1LfAUs85Cs3BrK8w6Poqc/Jb+4Y0NhdGIKgO5tS3vY54cTJVVrQTq4/XmME4ZnzOX3HaOqzfyt/6M4gEQMvaeFksxwoFhocV7wfaCq9ps/Kdq2dl4KwoqRV2WqVaauqzCP4XPSlVLaJqztsw0wboupcaZepWJ2a/6j9IrKo1pEnyeHF5y+k0SUAxL0X8iKZ0uPxsgoVrlNtqXJWNGvA=
-  file: tachiyomi-v*.apk
-  file_glob: true
-  skip_cleanup: true
-  on:
-    tags: true
-    repo: inorichi/tachiyomi
-- provider: script
-  script: ".travis/deploy.sh"
-  skip_cleanup: true
-  on:
-    branch: master
-    condition: "-z $TRAVIS_TAG"
-    repo: inorichi/tachiyomi
-env:
-  global:
-  - secure: Ita1+tzo7P5IC2yqU3KgRcXt+5DTpP0103Hx/ECYi42/7rLt+TC7PMjl2yH3Z189+tGwLq0Ol1KJ2Z5Rn3q7EaQgD0+WRkH/ijtrjKoVh7dyItIBp7yowZpA0TJHQ4EZpGSxZakKbIP4di8XMxJ2+5VzEivYUt04LCUpzugemL6b6XOfUmOZykVxV2UDAlPPggklITYBXkHUa0mwJhjS1aPPeeR3PhVXomkqfuOJOKejPXXXJope9fhAnmopHA7ISfjIrTuwDVQJqNSuco+O9kQShmlu0C8pob1vFGPEDvafaDS8SZ9A6gKT1ZfgSUqVmvDbx0WLX8XugBLrQedtZv63esOa1WUyGhgFVpeJjexlszXlhyfP1gH5QbzRr+EiSaagCyjf9II2veLAtU5cFY+nj6KBdKQsazIMRHf8SAQlWASyJYMED/N9RnUFxSf1rnLGqiY2ezjycx4ieFj7vhlbTgyao1GHjjR9cwNuntdMYWhY8+Vc7Fctmzm46xOyyz9oJGdyim76Y4w4MZvQNKeZOBAjdEgX6cXBk15scoM2Vj9ENox+MKZLaKRawXg2U1ujK+bWAQkXiVvPriv05/JtYsNUft8qAsm+69vtohDsUW7Wu0bBIKDL+v0W30ty1PpyNehBB2OquUE7fp53gitOmYl7TyuxktkMY8PXKKU=
-  - secure: NABCfigMUVM/9TLALYBpQLp/p3rG6MbH5y34/oqCSej/oh2u0nyhFSi8veS0lFpDIcv0TZvxHJXoSA0zeZijb1fUU8jYVNT2azuPWE6Gu7sf0TfBeCvulqbgLMoaA6JuWbEbZwHcxpKHg4vLSMjNk+ZP4v2dffI6A620fxLltxxhTpsYkYYsfKG857CpQtdgN/HqcOaxyvzXFmWWyVWHala1uMcMeXZCwgnlVAqau9o0bsU092txSmHqoesHoAinidSCTCmTlEqp/1AFaYQTbxmnfNC1yLgzxWAlJcS3NWzNo3ellMvKjsiIGn3JJpAjTGcyf3yPsvhs1cY3MZbmJYVyKH5HbnkA5ms6mx0DDJ2UOs5H2dmED82m14+hu62Xb8XN8zAdq+bySNSwgsGzvr1PT74pT4BW1T+D7L1xvUe6k1enZ38GIMJbJPhBybRQazhjKPmXRB30Thxoqe5VqU8UeiXHAEps7JYAWUR1PLZvEYQb6MWurmTxs9be/OTwrUT1LDiqeJZg6XkDGgQwuR2YBaQJHJD17Piq6q1BUX8abhK6wzAAYVqyGvpmUCmQCtHZgenE6ulwcKChzBv4n97OjE21LGWnbNF5ViUhfAbGcKOVufd1chZsfbkJ7a3tHYCfLnxHUIhKvHk26f5Em8h68D0wQkPnkcVVkfh7XpI=
-  - secure: C93UADV5aR0zhLCLwR6tCyz+fwUYslZbhjBl3PHQp+0boIGS/Be2UQTFHp/NB9mQmhWqbwqHoAVFENZFytV04ePgOuNtMFcjAIfnzm19Am7iRAMFixD45pF/CuYYfLupElkAcSequtAzN0g4G0sQ5KR1hibaDIoz9kfA2YcUAMaZ4T5bhCr8os/xA2nOlmvPDWsRWCFBYkSpnmbsSsgYAhulA/V5bSNAWnp9LPw3CBLibW3WsVP4wuhZAkXznKwn/mHT31kfQlpMH3qNhXpsN9huUkZ/k8QWeakcHJKugung0Z2T1StK8rlI8OrJstVcwueHTa2ses4f5VbhWog/Z8HDkdll9W9RM/QqXjNDtOVBt/SPuhCp4k2rvJixFUxzvSqgSWQvQnbHwjWxIUVVyHtnb0/zc/S9ONZG14TOwB/+Lkgacb85PNszurZ2f3mH0O6slIh1mH+5d9J4+L976ot4nTPlK1OtothagVyKGOrn9HycrPk/MjftIJuElHzo7NEJd/wRPqIb5y12iZN1RSPriU+itg1uSAVP891/o3peJyuqY9WSB7dYwgDJos6dDvbr19emtdyxkQR+eAb5duyH6s4R58wh1kJ1d4zu0X6uSnF4AIc+6teKkN24rSXcqB/hrcojS49jgLy5P0/CVsUbYZPI/tx8E/IJfr8m36E=
-  - secure: mawwBvllvESc/mp+JHvncq1iUhiC7nyokPgXmOehffc0K3byMLs2L25HjNsU6EnXG9Lcae1cfP8S9bWLquU2C3kpAkLBUpjEbdx7K0654uvs7Rrvb5hcTRHwjzaEVmVaBFX4ROcjUhBYny/Wjj/YENCkSWpkfcMd1esFbVsO+fOLyaAPvrb6auKY7H+pUSqlEwaEnrkYeBBZIHa7KqwL4g5DHbq6K368tjmval/wBzwMB0V8V3dt/ik8RMVDtKPrik4Bu0V9UmXZUIo/a06ii/CM82ekFRh3eUb0DKkdkmYbdH6MBMoLTfQtMa6A4luXaA0oycAnTX3OGB5MWIjK39KhWRavh6ybSIt4aHKoolxzH8Zgmk7xMhFSot/laX5q5IzjZu5KU6F2SmdV0kcQugM8oAjANFySetPvY1q7nZ8pM+NO1xKS/mH0w4vChhdJFD1mw7aCoh8FdeUf0Eym2+pp5Q9uAisWMmNn5XN8/fL5q6PzAxkXmkedfrr1N61FmIL6EKx8qiWpOUNlRRTIMJ4GMhCyckCF6cNxDkBItp52c+Hmkbn+ZEInEyX6gpjYVm3xyEi0Z5kLCi/fMX2nBNczc5BuGLzzmJnITv4ovpeYn2/vPvHbaPgPC4LqDK3AjlpVadMZk/M5Egn+hWY7Mni57CmpZD+SpxUbbsItI0c=
-  - secure: PJPDkUg1zc57brxUvNpSh+Q3ZEaGpBqZzwDavqslkn0WmjBTLrE6/OG7TFHKNmO+P56qFl+pMEKqThxqR3+4bWEeEx8ykkixDVzxNJMmws+7A7ImJ75iQyB6giMW/4tykVMMHgIPNAdcnI8VOWn0LGHnpFWUd70yoyAGX8s6cspHCKgcuWMA3GS410KJfHpyd0B9/QS7ZyWzSETW7zSPyLPa81SBO95EhOF3TOGZYLt/mBhdtU3YGFs4k9fZ8jDDcm9XmBfqVlUhb8HiZcxJiZDdRvxODERfNnwc47uaJk6+kxGDzIW2uAxrMXXVKkG04GeMOokXoR9kW1Hl2JmoyySLKLZmB7I/XEtVWdzZw16mWi+4zmhjLhfB0phSW+/5I+0VtZZ6jO031J5FL/JqVrcq1ws/aw4QlaOdPUco/x2u4LNHyYYgOi5arD9xSyu6IRy0jCC4Xa1zuqM5adGJX+rZyVfKZ0TxOW661HTxlo8COtkB2i0WR2deZGVN75ooCAEO8DauQoUcFH1OelahmPtzVs1/6ZczuxGdp9ED7ZQq9NHEOsOdUGCj/D79Dm1hWFQsIsslnnGYWitAycNCgEwmlt2Q6fbrv2CJrmLqZ9a9r3AhzxoHn9Qx1GyuyfhZJzm/6Ff2kcOjma2kcz13KUwTxdW+2G5dDCotK3f7aiI=
-  - secure: FIIZfEEYfjNMKODs33Czh603CYVn6LRrzpFNIiPHYTb8iQWv9qAYhsg4FpHfOjDikokTwb5X/h8G7AX93Z0xKyyDi75ACT11oPeTNTArDdcmdDVlOYBvYHc2Ci7pMW5r8LGejB7Y3mWM8uKyA3oKvneEFutB65vO3JVZvFWrm03Lmqqe7+mA4qNqNqTbN7R7fmk5b7zt7A3DHvDu0JPTbSSUwpso/p2I5WJYjrf71I7YMQwIFLoMfplC1onVA3EFS3lZsF65zE+xVRy34AKa41iZAMbhVDyqUHEnx6L0dwEdn2Z5XLlK0ov1+qLTLlQsBE4Knre6TNkWMfktk7MKA+ch8RYxvEYLODhQkIrOkLSNWhZPhdaT+xD4fr0RCKSHo6uWRC4aofsJx8wSqb8ZL4j2zopUp9VisMOI202UEnvFDBtOkVGJSxxYbFjifIB7NCJBn788w+3k+k4IbOg537VdyoK2PMBR8/TDdjImWhWHY1i7+345ejwmzHL7ZPfb6GTNnQTWkajT77/n6Yk41twR5vvegOSTKuuO++WN/pUks4PGqtcQe9fnSfx2OcOq1ofLiG+JDorJ7z8kHSG13wHLq+QYMDayQbyJEYpDzmn/w3Ou1s2o0a7A41+cIkRzAgH9y3v4lgjp9GcMP2S74ZPA7OecWbFSexM7tL/dYxY=
-  - secure: DKCGc4E9PKeTX68r9pbbNg5qITsN0bApQ1m0x8xdEoi8GLRKVMYNn6ahoAxvy1YsBXC9Zlt5++gLmUV1I1JyDMyJXMr/lZrp4oarW0xWpTBmn3HzOph/K2W4i/fTGgMFieumPEbQIFOnU3JSjK6UJB8qVGEXD2OqS7A//EdrGDbAYVDL3ZTKE6JUlTNHgaKaNHhn+Dq4aBLTSYPwlLyqo+WNBVUUCKCHOq62ULF8MpX5YGaPFNxKYzircV7HpF1hCbV31dmpkeYT9xztra5V0SIBM27jAcQqGmtHH2mhx1sLu+gjhFJbbtY6cggA9EedzYYLDx/NPmgfyuOJfyVbSwTF3vhDUYfskqc1THWpwOSKO0Ry+8/xYb9crxg+FSwuI5hnfkIFk9woBvRGBhjto3/1buMNY9dSFiWtEbN6Let8e747l0wIGJCpJxSeh7vn7F1mWjixhf9GX1+V9BrUvGTd3XJDNb9cVnafYa1RTj8BLteA4HBza7Z9R3dvG4YWp16L/94UuaTzgAQfERLTZGopQth/hsaVTlYesJmJLF70lGM+W83y3YuNkSaX1zQ5FAIvp7oH0O16t7ISm6GprUFwN2Uox7AAbPZdWHxJbly+D+yCFNcqS3Bz9mV3YCLo690Sy1ePNHr+nCseVfBMo7OYyavSS/EjPWfEy65Wq04=

.travis/build.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-git fetch --unshallow #required for commit count
-
-cp .travis/google-services.json app/
-
-if [ -z "$TRAVIS_TAG" ]; then
-    ./gradlew clean assembleStandardDebug
-
-    COMMIT_COUNT=$(git rev-list --count HEAD)
-    export ARTIFACT="tachiyomi-r${COMMIT_COUNT}.apk"
-
-    mv app/build/outputs/apk/standard/debug/app-standard-debug.apk $ARTIFACT
-else
-    ./gradlew clean assembleStandardRelease
-
-    TOOLS="$(ls -d ${ANDROID_HOME}/build-tools/* | tail -1)"
-    export ARTIFACT="tachiyomi-${TRAVIS_TAG}.apk"
-
-    ${TOOLS}/zipalign -v -p 4 app/build/outputs/apk/standard/release/app-standard-release-unsigned.apk app-aligned.apk
-    ${TOOLS}/apksigner sign --ks $STORE_PATH --ks-key-alias $STORE_ALIAS --ks-pass env:STORE_PASS --key-pass env:KEY_PASS --out $ARTIFACT app-aligned.apk
-fi

.travis/deploy.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-pattern="tachiyomi-r*"
-files=( $pattern )
-export ARTIFACT="${files[0]}"
-
-if [ -z "$ARTIFACT" ]; then
-    echo "Artifact not found"
-    exit 1
-fi
-
-export SSHOPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${DEPLOY_KEY}"
-
-scp $SSHOPTIONS $ARTIFACT $DEPLOY_USER@$DEPLOY_HOST:builds/
-ssh $SSHOPTIONS $DEPLOY_USER@$DEPLOY_HOST ln -sf $ARTIFACT builds/latest

PREVIEW_RELEASE_NOTES.md

@@ -0,0 +1,28 @@
+### r1810
+- Background jobs were migrated to a new system. You may need to toggle the settings to ensure they
+run properly. This includes app updates, library updates, and automatic backups.
+
+### r1340
+- A new screen for managing extensions was added. If you previously installed extensions from FDroid,
+you will have to uninstall all of them first (tap on the extension then uninstall), otherwise you won't be able
+to update them due to signature mismatch. You won't lose anything in this process as the extensions themselves
+don't store anything.
+
+### r959
+- The download manager has been rewritten and it's possible some of your downloads
+aren't recognized anymore. You may have to check your downloads folder and manually delete those.
+- You can now download to any folder in your SD card.
+- The download directory setting has been reset.
+
+### r857
+- **Important!** Delete after read has been updated.
+This means the value has been reset set to disabled.
+This can be changed in Settings > Downloads
+
+### r736
+- **Important!** Now chapters follow the order of the sources. **It's required that you update your entire library
+before reading in order for them to be synced.** Old behavior can be restored for a manga in the overflow menu of the chapters tab.
+
+### r724
+- Kissmanga covers may not load anymore. The only workaround is to update the details of the manga
+from the info tab, or clearing the database (the latter won't fix covers from library manga).

README.md

@@ -1,20 +1,20 @@
-| Build | Stable | Dev | Contribute | Contact |
+| Build | Stable | Weekly Preview | Contribute | Support Server |
 |-------|----------|---------|------------|---------|
-| [![Travis](https://img.shields.io/travis/inorichi/tachiyomi.svg)](https://travis-ci.org/inorichi/tachiyomi) | [![stable release](https://img.shields.io/github/release/inorichi/tachiyomi.svg?maxAge=3600&label=download%20(autoupdate%20included))](https://github.com/inorichi/tachiyomi/releases) | [![latest dev build](https://img.shields.io/badge/download-latest%20build-blue.svg)](http://tachiyomi.kanade.eu/latest) | [![Translation status](https://hosted.weblate.org/widgets/tachiyomi/-/svg-badge.svg)](https://hosted.weblate.org/engage/tachiyomi/?utm_source=widget) | [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/tachiyomi) |
+| ![CI](https://github.com/inorichi/tachiyomi/workflows/CI/badge.svg?branch=dev&event=push) | [![stable release](https://img.shields.io/github/release/inorichi/tachiyomi.svg?maxAge=3600&label=download)](https://github.com/inorichi/tachiyomi/releases) | [![latest weekly build](https://img.shields.io/github/v/release/tachiyomiorg/android-app-preview.svg?maxAge=3600&label=download)](https://github.com/tachiyomiorg/android-app-preview/releases) | [![Translation status](https://hosted.weblate.org/widgets/tachiyomi/-/svg-badge.svg)](https://hosted.weblate.org/engage/tachiyomi/?utm_source=widget) | [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/tachiyomi) |
 
 
 # ![app icon](./.github/readme-images/app-icon.png)Tachiyomi
-Tachiyomi is a free and open source manga reader for Android.
+Tachiyomi is a free and open source manga reader for Android 5.0 and above.
 
 ![screenshots of app](./.github/readme-images/screens.png)
 
 ## Features
 
 Features include:
-* Online reading from sources such as KissManga, MangaFox, [and more](https://github.com/inorichi/tachiyomi-extensions)
+* Online reading from sources such as MangaDex, MangaSee, Mangakakalot, [and more](https://github.com/inorichi/tachiyomi-extensions)
 * Local reading of downloaded manga
-* Configurable reader with multiple viewers, reading directions and other settings
+* A configurable reader with multiple viewers, reading directions and other settings.
-* [MyAnimeList](https://myanimelist.net/), [AniList](https://anilist.co/), and [Kitsu](https://kitsu.io/explore/anime) support
+* [MyAnimeList](https://myanimelist.net/), [AniList](https://anilist.co/), [Kitsu](https://kitsu.io/), [Shikimori](https://shikimori.one), and [Bangumi](https://bgm.tv/) support
 * Categories to organize your library
 * Light and dark themes
 * Schedule updating your library for new chapters
@@ -23,7 +23,7 @@ Features include:
 ## Download
 Get the app from our [releases page](https://github.com/inorichi/tachiyomi/releases).
 
-If you want to try new features before they get to the stable release, you can download the dev version [here](http://tachiyomi.kanade.eu/latest). (auto-updates not included)
+If you want to try new features before they get to the stable release, you can download the preview version [here](https://github.com/tachiyomiorg/android-app-preview/releases).
 
 ## Issues, Feature Requests and Contributing
 
@@ -31,16 +31,16 @@ Please make sure to read the full guidelines. Your issue may be closed without w
 
 <details><summary>Issues</summary>
 
-1. **Before reporting a new issue, take a look at the [FAQ](https://github.com/inorichi/tachiyomi/wiki/FAQ), the [changelog](https://github.com/inorichi/tachiyomi/releases) and the already opened [issues](https://github.com/inorichi/tachiyomi/issues).**
+1. **Before reporting a new issue, take a look at the [FAQ](https://tachiyomi.org/help/faq/), the [changelog](https://github.com/inorichi/tachiyomi/releases) and the already opened [issues](https://github.com/inorichi/tachiyomi/issues).**
 2. If you are unsure, ask here: [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/tachiyomi)
 
 </details>
 
 <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
- * 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)
@@ -55,7 +55,7 @@ DON'T: https://github.com/inorichi/tachiyomi/issues/75
 
 <details><summary>Feature Requests</summary>
 
-* Write a detailed issue, explaning what it should do or how. Avoid writing just "like X app does"
+* Write a detailed issue, explaining what it should do or how. Avoid writing just "like X app does"
 * Include screenshot (if needed)
 
 Catalogue requests should be created at https://github.com/inorichi/tachiyomi-extensions, they do not belong in this repository.
@@ -63,7 +63,7 @@ Catalogue requests should be created at https://github.com/inorichi/tachiyomi-ex
 
 ## FAQ
 
-[See our wiki.](https://github.com/inorichi/tachiyomi/wiki/FAQ)
+[See our website.](https://tachiyomi.org/)
 You can also reach out to us on [Discord](https://discord.gg/tachiyomi).
 
 ## License

app/.gitignore

@@ -2,4 +2,3 @@
 *iml
 *.iml
 custom.gradle
-google-services.json

app/build.gradle

@@ -1,9 +1,13 @@
+import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile
+
 import java.text.SimpleDateFormat
 
 apply plugin: 'com.android.application'
+apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlinx-serialization'
 apply plugin: 'com.github.zellius.shortcut-helper'
 
 shortcutHelper.filePath = './shortcuts.xml'
@@ -29,25 +33,23 @@ ext {
 }
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion AndroidConfig.compileSdk
-    buildToolsVersion '28.0.3'
+    buildToolsVersion AndroidConfig.buildTools
-    publishNonDefault true
+    ndkVersion AndroidConfig.ndk
 
     defaultConfig {
         applicationId "eu.kanade.tachiyomi"
-        minSdkVersion 16
+        minSdkVersion AndroidConfig.minSdk
-        targetSdkVersion 27
+        targetSdkVersion AndroidConfig.targetSdk
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        versionCode 41
+        versionCode 52
-        versionName "0.8.4"
+        versionName "0.10.6"
 
         buildConfigField "String", "COMMIT_COUNT", "\"${getCommitCount()}\""
         buildConfigField "String", "COMMIT_SHA", "\"${getGitSha()}\""
         buildConfigField "String", "BUILD_TIME", "\"${getBuildTime()}\""
         buildConfigField "boolean", "INCLUDE_UPDATER", "false"
 
-        vectorDrawables.useSupportLibrary = true
-
         multiDexEnabled true
 
         ndk {
@@ -55,11 +57,24 @@ android {
         }
     }
 
+    buildFeatures {
+        viewBinding = true
+    }
+
     buildTypes {
         debug {
             versionNameSuffix "-${getCommitCount()}"
             applicationIdSuffix ".debug"
         }
+        release {
+            postprocessing {
+                obfuscate false
+                optimizeCode true
+                removeUnusedCode false
+                removeUnusedResources true
+                proguardFiles 'proguard-rules.pro'
+            }
+        }
     }
 
     flavorDimensions "default"
@@ -73,7 +88,6 @@ android {
             dimension "default"
         }
         dev {
-            minSdkVersion 21
             resConfigs "en", "xxhdpi"
             dimension "default"
         }
@@ -87,79 +101,113 @@ android {
         exclude 'META-INF/NOTICE'
     }
 
+    dependenciesInfo {
+        includeInApk = false
+    }
+
     lintOptions {
+        disable 'MissingTranslation'
+        disable 'ExtraTranslation'
+
         abortOnError false
         checkReleaseBuilds false
     }
 
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+}
+
+androidExtensions {
+    experimental = true
 }
 
 dependencies {
 
-    // Modified dependencies
+    // Source models and interfaces from Tachiyomi 1.x
-    implementation 'com.github.inorichi:subsampling-scale-image-view:ac0dae7'
+    implementation 'tachiyomi.sourceapi:source-api:1.1'
-    implementation 'com.github.inorichi:junrar-android:634c1f5'
 
-    // Android support library
+    // AndroidX libraries
-    final support_library_version = '27.0.2'
+    implementation 'androidx.annotation:annotation:1.2.0-alpha01'
-    implementation "com.android.support:support-v4:$support_library_version"
+    implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
-    implementation "com.android.support:appcompat-v7:$support_library_version"
+    implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha01'
-    implementation "com.android.support:cardview-v7:$support_library_version"
+    implementation 'androidx.browser:browser:1.3.0'
-    implementation "com.android.support:design:$support_library_version"
+    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation "com.android.support:recyclerview-v7:$support_library_version"
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0-alpha1'
-    implementation "com.android.support:preference-v7:$support_library_version"
+    implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
-    implementation "com.android.support:support-annotations:$support_library_version"
+    implementation 'androidx.core:core-ktx:1.5.0-alpha05'
-    implementation "com.android.support:customtabs:$support_library_version"
+    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'androidx.preference:preference-ktx:1.1.1'
+    implementation 'androidx.recyclerview:recyclerview:1.2.0-beta01'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01'
 
-    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
+    final lifecycle_version = '2.3.0-beta01'
+    implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-process:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
 
-    implementation 'com.android.support:multidex:1.0.3'
+    // Job scheduling
+    implementation "androidx.work:work-runtime-ktx:2.5.0-beta02"
 
-    standardImplementation 'com.google.firebase:firebase-core:11.8.0'
+    // UI library
+    implementation 'com.google.android.material:material:1.3.0-alpha04'
+
+    standardImplementation 'com.google.firebase:firebase-core:18.0.0'
 
     // ReactiveX
     implementation 'io.reactivex:rxandroid:1.2.1'
-    implementation 'io.reactivex:rxjava:1.3.6'
+    implementation 'io.reactivex:rxjava:1.3.8'
     implementation 'com.jakewharton.rxrelay:rxrelay:1.2.0'
-    implementation 'com.f2prateek.rx.preferences:rx-preferences:1.0.2'
+    implementation 'com.github.pwittchen:reactivenetwork:0.13.0'
-    implementation 'com.github.pwittchen:reactivenetwork:0.7.0'
 
     // Network client
-    implementation "com.squareup.okhttp3:okhttp:3.10.0"
+    final okhttp_version = '4.10.0-RC1'
-    implementation 'com.squareup.okio:okio:1.14.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.9.0'
+
+    // TLS 1.3 support for Android < 10
+    implementation 'org.conscrypt:conscrypt-android:2.5.1'
 
     // REST
-    final retrofit_version = '2.3.0'
+    final retrofit_version = '2.9.0'
     implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
+    implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.8.0"
     implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
     implementation "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
 
     // JSON
-    implementation 'com.google.code.gson:gson:2.8.2'
+    final kotlin_serialization_version = '1.0.1'
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialization_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$kotlin_serialization_version"
+    implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.github.salomonbrys.kotson:kotson:2.5.0'
 
     // JavaScript engine
-    implementation 'com.squareup.duktape:duktape-android:1.2.0'
+    implementation 'com.squareup.duktape:duktape-android:1.3.0'
 
     // Disk
     implementation 'com.jakewharton:disklrucache:2.0.2'
     implementation 'com.github.inorichi:unifile:e9ee588'
+    implementation 'com.github.junrar:junrar:7.4.0'
 
     // HTML parser
-    implementation 'org.jsoup:jsoup:1.10.2'
+    implementation 'org.jsoup:jsoup:1.13.1'
-
-    // Job scheduling
-    implementation 'com.evernote:android-job:1.2.5'
-    implementation 'com.google.android.gms:play-services-gcm:11.8.0'
-
-    // Changelog
-    implementation 'com.github.gabrielemariotti.changeloglib:changelog:2.1.0'
 
     // Database
-    implementation 'android.arch.persistence:db:1.0.0'
+    implementation 'androidx.sqlite:sqlite-ktx:2.1.0'
     implementation 'com.github.inorichi.storio:storio-common:8be19de@aar'
     implementation 'com.github.inorichi.storio:storio-sqlite:8be19de@aar'
-    implementation 'io.requery:sqlite-android:3.25.2'
+    implementation 'io.requery:sqlite-android:3.33.0'
+
+    // Preferences
+    implementation 'com.github.tfcporciuncula.flow-preferences:flow-preferences:1.3.3'
 
     // Model View Presenter
     final nucleus_version = '3.0.0'
@@ -170,19 +218,18 @@ dependencies {
     implementation "com.github.inorichi.injekt:injekt-core:65b0440"
 
     // Image library
-    final glide_version = '4.6.1'
+    final glide_version = '4.11.0'
     implementation "com.github.bumptech.glide:glide:$glide_version"
     implementation "com.github.bumptech.glide:okhttp3-integration:$glide_version"
     kapt "com.github.bumptech.glide:compiler:$glide_version"
 
-    // Transformations
+    implementation 'com.github.tachiyomiorg:subsampling-scale-image-view:6caf219'
-    implementation 'jp.wasabeef:glide-transformations:3.1.1'
 
     // Logging
-    implementation 'com.jakewharton.timber:timber:4.6.1'
+    implementation 'com.jakewharton.timber:timber:4.7.1'
 
     // Crash reports
-    implementation 'ch.acra:acra:4.9.2'
+    implementation 'ch.acra:acra-http:5.7.0'
 
     // Sort
     implementation 'com.github.gpanther:java-nat-sort:natural-comparator-1.1'
@@ -190,35 +237,40 @@ dependencies {
     // UI
     implementation 'com.dmitrymalkovich.android:material-design-dimens:1.4'
     implementation 'com.github.dmytrodanylyk.android-process-button:library:1.0.4'
-    implementation 'eu.davidea:flexible-adapter:5.0.0-rc4'
+    implementation 'eu.davidea:flexible-adapter:5.1.0'
-    implementation 'eu.davidea:flexible-adapter-ui:1.0.0-b1'
+    implementation 'eu.davidea:flexible-adapter-ui:1.0.0'
     implementation 'com.nononsenseapps:filepicker:2.5.2'
-    implementation 'com.github.amulyakhare:TextDrawable:558677e'
+    implementation 'com.nightlynexus.viewstatepageradapter:viewstatepageradapter:1.1.0'
-    implementation 'com.afollestad.material-dialogs:core:0.9.6.0'
+    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
-    implementation 'me.zhanghai.android.systemuihelper:library:1.0.0'
+    implementation 'com.github.carlosesco:DirectionalViewPager:a844dbca0a'
-    implementation 'com.nightlynexus.viewstatepageradapter:viewstatepageradapter:1.0.4'
+
-    implementation 'com.github.mthli:Slice:v1.2'
+    // 3.2.0+ introduces weird UI blinking or cut off issues on some devices
-    implementation 'me.gujun.android.taggroup:library:1.4@aar'
+    final material_dialogs_version = '3.1.1'
-    implementation 'com.github.chrisbanes:PhotoView:2.1.3'
+    implementation "com.afollestad.material-dialogs:core:$material_dialogs_version"
-    implementation 'com.github.inorichi:DirectionalViewPager:3acc51a'
+    implementation "com.afollestad.material-dialogs:input:$material_dialogs_version"
+    implementation "com.afollestad.material-dialogs:datetime:$material_dialogs_version"
 
     // Conductor
     implementation 'com.bluelinelabs:conductor:2.1.5'
-    implementation ("com.bluelinelabs:conductor-support:2.1.5") {
+    implementation("com.bluelinelabs:conductor-support:2.1.5") {
         exclude group: "com.android.support"
     }
-    implementation 'com.github.inorichi:conductor-support-preference:27.0.2'
+    implementation 'com.github.tachiyomiorg:conductor-support-preference:1.1.1'
 
-    // RxBindings
+    // FlowBinding
-    final rxbindings_version = '1.0.1'
+    final flowbinding_version = '0.12.0'
-    implementation "com.jakewharton.rxbinding:rxbinding-kotlin:$rxbindings_version"
+    implementation "io.github.reactivecircus.flowbinding:flowbinding-android:$flowbinding_version"
-    implementation "com.jakewharton.rxbinding:rxbinding-appcompat-v7-kotlin:$rxbindings_version"
+    implementation "io.github.reactivecircus.flowbinding:flowbinding-appcompat:$flowbinding_version"
-    implementation "com.jakewharton.rxbinding:rxbinding-support-v4-kotlin:$rxbindings_version"
+    implementation "io.github.reactivecircus.flowbinding:flowbinding-recyclerview:$flowbinding_version"
-    implementation "com.jakewharton.rxbinding:rxbinding-recyclerview-v7-kotlin:$rxbindings_version"
+    implementation "io.github.reactivecircus.flowbinding:flowbinding-swiperefreshlayout:$flowbinding_version"
+    implementation "io.github.reactivecircus.flowbinding:flowbinding-viewpager:$flowbinding_version"
+
+    // Licenses
+    implementation "com.mikepenz:aboutlibraries:$BuildPluginsVersion.ABOUTLIB_PLUGIN"
 
     // Tests
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
-    testImplementation 'org.assertj:assertj-core:1.7.1'
+    testImplementation 'org.assertj:assertj-core:3.16.1'
     testImplementation 'org.mockito:mockito-core:1.10.19'
 
     final robolectric_version = '3.1.4'
@@ -226,37 +278,51 @@ dependencies {
     testImplementation "org.robolectric:shadows-multidex:$robolectric_version"
     testImplementation "org.robolectric:shadows-play-services:$robolectric_version"
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$BuildPluginsVersion.KOTLIN"
 
-    final coroutines_version = '0.22.2'
+    final coroutines_version = '1.4.1'
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
+
+    // For detecting memory leaks; see https://square.github.io/leakcanary/
+//    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.4'
 }
 
 buildscript {
-    ext.kotlin_version = '1.2.71'
     repositories {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$BuildPluginsVersion.KOTLIN"
     }
 }
 
 repositories {
     mavenCentral()
+    jcenter()
 }
 
-kotlin {
+// See https://kotlinlang.org/docs/reference/experimental.html#experimental-status-of-experimental-api-markers
-    experimental {
+tasks.withType(AbstractKotlinCompile).all {
-        coroutines 'enable'
+    kotlinOptions.freeCompilerArgs += [
-    }
+            "-Xopt-in=kotlin.Experimental",
+            "-Xopt-in=kotlin.RequiresOptIn",
+            "-Xuse-experimental=kotlin.ExperimentalStdlibApi",
+            "-Xuse-experimental=kotlinx.coroutines.FlowPreview",
+            "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
+            "-Xuse-experimental=kotlinx.serialization.ExperimentalSerializationApi",
+    ]
 }
 
-androidExtensions {
+// Duplicating Hebrew string assets due to some locale code issues on different devices
-    experimental = true
+task copyHebrewStrings(type: Copy) {
+    from './src/main/res/values-he'
+    into './src/main/res/values-iw'
+    include '**/*'
 }
 
+preBuild.dependsOn(formatKotlin, copyHebrewStrings)
+
 if (getGradle().getStartParameter().getTaskRequests().toString().contains("Standard")) {
     apply plugin: 'com.google.gms.google-services'
 }

app/proguard-rules.pro

@@ -1,33 +1,26 @@
 -dontobfuscate
 
--dontwarn eu.kanade.tachiyomi.**
--keep class eu.kanade.tachiyomi.**
--keep class eu.kanade.tachiyomi.source.model.** { *; }
-
--keep class com.hippo.image.** { *; }
--keep interface com.hippo.image.** { *; }
--dontwarn nucleus.view.NucleusActionBarActivity
-
 # Extensions may require methods unused in the core app
+-dontwarn eu.kanade.tachiyomi.**
+-keep class eu.kanade.tachiyomi.** { public protected private *; }
+
 -keep class org.jsoup.** { *; }
 -keep class kotlin.** { *; }
 -keep class okhttp3.** { *; }
 -keep class com.google.gson.** { *; }
 -keep class com.github.salomonbrys.kotson.** { *; }
+-keep class com.squareup.duktape.** { *; }
 
-# OkHttp
+# Design library
--dontwarn okhttp3.**
+-dontwarn com.google.android.material.**
--dontwarn okio.**
+-keep class com.google.android.material.** { *; }
--dontwarn javax.annotation.**
+-keep interface com.google.android.material.** { *; }
--dontwarn retrofit2.Platform$Java8
+-keep public class com.google.android.material.R$* { *; }
 
-# Glide specific rules #
+-keep class com.hippo.image.** { *; }
-# https://github.com/bumptech/glide
+-keep interface com.hippo.image.** { *; }
--keep public class * implements com.bumptech.glide.module.GlideModule
+-keepclassmembers class * extends nucleus.presenter.Presenter {
--keep public class * extends com.bumptech.glide.AppGlideModule
+    <init>();
--keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
-    **[] $VALUES;
-    public *;
 }
 
 # RxJava 1.1.0
@@ -46,26 +39,6 @@
     rx.internal.util.atomic.LinkedQueueNode consumerNode;
 }
 
-### Support v7, Design
-# http://stackoverflow.com/questions/29679177/cardview-shadow-not-appearing-in-lollipop-after-obfuscate-with-proguard/29698051
--keep class android.support.v7.widget.RoundRectDrawable { *; }
-
--keep public class android.support.v7.widget.** { *; }
--keep public class android.support.v7.internal.widget.** { *; }
--keep public class android.support.v7.internal.view.menu.** { *; }
--keep public class android.support.v7.graphics.drawable.** { *; }
-
--keep public class * extends android.support.v4.view.ActionProvider {
-    public <init>(android.content.Context);
-}
-
--dontwarn android.support.**
--dontwarn android.support.design.**
--keep class android.support.design.** { *; }
--keep interface android.support.design.** { *; }
--keep public class android.support.design.R$* { *; }
-
-
 # ReactiveNetwork
 -dontwarn com.github.pwittchen.reactivenetwork.**
 
@@ -84,9 +57,23 @@
 -keep class * implements com.google.gson.JsonSerializer
 -keep class * implements com.google.gson.JsonDeserializer
 
-# SnakeYaml
--keep class org.yaml.snakeyaml.** { public protected private *; }
--dontwarn org.yaml.snakeyaml.**
 
-# Duktape
+## kotlinx.serialization ##
--keep class com.squareup.duktape.** { *; }
+
+-keepattributes *Annotation*, InnerClasses
+-dontnote kotlinx.serialization.AnnotationsKt # core serialization annotations
+
+-keepclassmembers class kotlinx.serialization.json.** {
+    *** Companion;
+}
+-keepclasseswithmembers class kotlinx.serialization.json.** {
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+-keep,includedescriptorclasses class eu.kanade.tachiyomi.**$$serializer { *; }
+-keepclassmembers class eu.kanade.tachiyomi.** {
+    *** Companion;
+}
+-keepclasseswithmembers class eu.kanade.tachiyomi.** {
+    kotlinx.serialization.KSerializer serializer(...);
+}

app/shortcuts.xml

@@ -2,7 +2,7 @@
 
     <shortcut
         android:enabled="true"
-        android:icon="@drawable/sc_book_48dp"
+        android:icon="@drawable/sc_collections_bookmark_48dp"
         android:shortcutDisabledMessage="@string/app_not_available"
         android:shortcutId="show_library"
         android:shortcutLongLabel="@string/label_library"
@@ -13,7 +13,7 @@
     </shortcut>
     <shortcut
         android:enabled="true"
-        android:icon="@drawable/sc_update_48dp"
+        android:icon="@drawable/sc_new_releases_48dp"
         android:shortcutDisabledMessage="@string/app_not_available"
         android:shortcutId="show_recently_updated"
         android:shortcutLongLabel="@string/label_recent_updates"
@@ -24,7 +24,7 @@
     </shortcut>
     <shortcut
         android:enabled="true"
-        android:icon="@drawable/sc_glasses_48dp"
+        android:icon="@drawable/sc_history_48dp"
         android:shortcutDisabledMessage="@string/app_not_available"
         android:shortcutId="show_recently_read"
         android:shortcutLongLabel="@string/label_recent_manga"
@@ -38,8 +38,8 @@
         android:icon="@drawable/sc_explore_48dp"
         android:shortcutDisabledMessage="@string/app_not_available"
         android:shortcutId="show_catalogues"
-        android:shortcutLongLabel="@string/label_catalogues"
+        android:shortcutLongLabel="@string/browse"
-        android:shortcutShortLabel="@string/label_catalogues">
+        android:shortcutShortLabel="@string/browse">
         <intent
             android:action="eu.kanade.tachiyomi.SHOW_CATALOGUES"
             android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />

app/src/main/AndroidManifest.xml

@@ -8,47 +8,84 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
         android:name=".App"
         android:allowBackup="true"
         android:fullBackupContent="@xml/backup_rules"
         android:hardwareAccelerated="true"
+        android:hasFragileUserData="true"
         android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
         android:largeHeap="true"
-        android:theme="@style/Theme.Tachiyomi">
+        android:requestLegacyExternalStorage="true"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:theme="@style/Theme.Tachiyomi.Light"
+        android:networkSecurityConfig="@xml/network_security_config">
         <activity
             android:name=".ui.main.MainActivity"
-            android:launchMode="singleTask">
+            android:launchMode="singleTop"
+            android:theme="@style/Theme.Splash">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <!--suppress AndroidDomInspection -->
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
+        </activity>
+        <activity
+            android:name=".ui.main.DeepLinkActivity"
+            android:launchMode="singleTask"
+            android:theme="@android:style/Theme.NoDisplay"
+            android:label="@string/process_text_action_name">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
-                <action android:name="com.google.android.gms.actions.SEARCH_ACTION"/>
+                <action android:name="com.google.android.gms.actions.SEARCH_ACTION" />
-                <category android:name="android.intent.category.DEFAULT"/>
+
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
                 <action android:name="eu.kanade.tachiyomi.SEARCH" />
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <meta-data android:name="android.app.searchable" android:resource="@xml/searchable"/>
+            <intent-filter>
-            <!--suppress AndroidDomInspection -->
+                <action android:name="android.intent.action.PROCESS_TEXT" />
-            <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts"/>
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable" />
         </activity>
         <activity
-            android:name=".ui.reader.ReaderActivity" />
+            android:name=".ui.reader.ReaderActivity"
+            android:launchMode="singleTask">
+            <intent-filter>
+                <action android:name="com.samsung.android.support.REMOTE_ACTION" />
+            </intent-filter>
+
+            <meta-data android:name="com.samsung.android.support.REMOTE_ACTION"
+                android:resource="@xml/s_pen_actions"/>
+        </activity>
+        <activity
+            android:name=".ui.security.BiometricUnlockActivity"
+            android:theme="@style/Theme.Splash" />
+        <activity
+            android:name=".ui.webview.WebViewActivity"
+            android:configChanges="uiMode|orientation|screenSize" />
         <activity
             android:name=".widget.CustomLayoutPickerActivity"
             android:label="@string/app_name"
             android:theme="@style/FilePickerTheme" />
         <activity
-            android:name=".ui.setting.AnilistLoginActivity"
+            android:name=".ui.setting.track.AnilistLoginActivity"
             android:label="Anilist">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -62,8 +99,11 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".ui.setting.ShikomoriLoginActivity"
+            android:name=".ui.setting.track.MyAnimeListLoginActivity"
-            android:label="Shikomori">
+            android:configChanges="uiMode|orientation|screenSize" />
+        <activity
+            android:name=".ui.setting.track.ShikimoriLoginActivity"
+            android:label="Shikimori">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -75,13 +115,27 @@
                     android:scheme="tachiyomi" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".ui.setting.track.BangumiLoginActivity"
+            android:label="Bangumi">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="bangumi-auth"
+                    android:scheme="tachiyomi" />
+            </intent-filter>
+        </activity>
 
         <activity
             android:name=".extension.util.ExtensionInstallActivity"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true">
@@ -108,11 +162,11 @@
 
         <service
             android:name=".data.backup.BackupCreateService"
-            android:exported="false"/>
+            android:exported="false" />
 
         <service
             android:name=".data.backup.BackupRestoreService"
-            android:exported="false"/>
+            android:exported="false" />
 
     </application>
 

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

@@ -3,41 +3,65 @@ package eu.kanade.tachiyomi
 import android.app.Application
 import android.content.Context
 import android.content.res.Configuration
-import android.support.multidex.MultiDex
+import android.os.Build
-import com.evernote.android.job.JobManager
+import androidx.lifecycle.Lifecycle
-import eu.kanade.tachiyomi.data.backup.BackupCreatorJob
+import androidx.lifecycle.LifecycleObserver
-import eu.kanade.tachiyomi.data.library.LibraryUpdateJob
+import androidx.lifecycle.OnLifecycleEvent
+import androidx.lifecycle.ProcessLifecycleOwner
+import androidx.multidex.MultiDex
 import eu.kanade.tachiyomi.data.notification.Notifications
-import eu.kanade.tachiyomi.data.updater.UpdaterJob
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.util.LocaleHelper
+import eu.kanade.tachiyomi.ui.security.SecureActivityDelegate
+import eu.kanade.tachiyomi.util.system.LocaleHelper
 import org.acra.ACRA
-import org.acra.annotation.ReportsCrashes
+import org.acra.annotation.AcraCore
+import org.acra.annotation.AcraHttpSender
+import org.acra.sender.HttpSender
+import org.conscrypt.Conscrypt
 import timber.log.Timber
 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.security.Security
 
-@ReportsCrashes(
+@AcraCore(
-        formUri = "http://tachiyomi.kanade.eu/crash_report",
+    buildConfigClass = BuildConfig::class,
-        reportType = org.acra.sender.HttpSender.Type.JSON,
+    excludeMatchingSharedPreferencesKeys = [".*username.*", ".*password.*", ".*token.*"]
-        httpMethod = org.acra.sender.HttpSender.Method.PUT,
-        buildConfigClass = BuildConfig::class,
-        excludeMatchingSharedPreferencesKeys = arrayOf(".*username.*", ".*password.*", ".*token.*")
 )
-open class App : Application() {
+@AcraHttpSender(
+    uri = "https://tachiyomi.kanade.eu/crash_report",
+    httpMethod = HttpSender.Method.PUT
+)
+open class App : Application(), LifecycleObserver {
 
     override fun onCreate() {
         super.onCreate()
         if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree())
 
+        // Debug tool; see https://fbflipper.com/
+        // SoLoader.init(this, false)
+        // if (BuildConfig.DEBUG && FlipperUtils.shouldEnableFlipper(this)) {
+        //     val client = AndroidFlipperClient.getInstance(this)
+        //     client.addPlugin(InspectorFlipperPlugin(this, DescriptorMapping.withDefaults()))
+        //     client.addPlugin(DatabasesFlipperPlugin(this))
+        //     client.start()
+        // }
+
+        // TLS 1.3 support for Android < 10
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+            Security.insertProviderAt(Conscrypt.newProvider(), 1)
+        }
+
         Injekt = InjektScope(DefaultRegistrar())
         Injekt.importModule(AppModule(this))
 
         setupAcra()
-        setupJobManager()
         setupNotificationChannels()
 
         LocaleHelper.updateConfiguration(this, resources.configuration)
+
+        ProcessLifecycleOwner.get().lifecycle.addObserver(this)
     }
 
     override fun attachBaseContext(base: Context) {
@@ -50,27 +74,20 @@ open class App : Application() {
         LocaleHelper.updateConfiguration(this, newConfig, true)
     }
 
-    protected open fun setupAcra() {
+    @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
-        ACRA.init(this)
+    @Suppress("unused")
+    fun onAppBackgrounded() {
+        val preferences: PreferencesHelper by injectLazy()
+        if (preferences.lockAppAfter().get() >= 0) {
+            SecureActivityDelegate.locked = true
+        }
     }
 
-    protected open fun setupJobManager() {
+    protected open fun setupAcra() {
-        try {
+        ACRA.init(this)
-            JobManager.create(this).addJobCreator { tag ->
-                when (tag) {
-                    LibraryUpdateJob.TAG -> LibraryUpdateJob()
-                    UpdaterJob.TAG -> UpdaterJob()
-                    BackupCreatorJob.TAG -> BackupCreatorJob()
-                    else -> null
-                }
-            }
-        } catch (e: Exception) {
-            Timber.w("Can't initialize job manager")
-        }
     }
 
     protected open fun setupNotificationChannels() {
         Notifications.createChannels(this)
     }
-
 }

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

@@ -11,14 +11,18 @@ import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.extension.ExtensionManager
 import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.source.SourceManager
-import rx.Observable
+import kotlinx.coroutines.GlobalScope
-import rx.schedulers.Schedulers
+import kotlinx.coroutines.launch
-import uy.kohesive.injekt.api.*
+import kotlinx.serialization.json.Json
+import uy.kohesive.injekt.api.InjektModule
+import uy.kohesive.injekt.api.InjektRegistrar
+import uy.kohesive.injekt.api.addSingleton
+import uy.kohesive.injekt.api.addSingletonFactory
+import uy.kohesive.injekt.api.get
 
 class AppModule(val app: Application) : InjektModule {
 
     override fun InjektRegistrar.registerInjectables() {
-
         addSingleton(app)
 
         addSingletonFactory { PreferencesHelper(app) }
@@ -41,22 +45,18 @@ class AppModule(val app: Application) : InjektModule {
 
         addSingletonFactory { Gson() }
 
+        addSingletonFactory { Json { ignoreUnknownKeys = true } }
+
         // Asynchronously init expensive components for a faster cold start
 
-        rxAsync { get<PreferencesHelper>() }
+        GlobalScope.launch { get<PreferencesHelper>() }
 
-        rxAsync { get<NetworkHelper>() }
+        GlobalScope.launch { get<NetworkHelper>() }
 
-        rxAsync { get<SourceManager>() }
+        GlobalScope.launch { get<SourceManager>() }
 
-        rxAsync { get<DatabaseHelper>() }
+        GlobalScope.launch { get<DatabaseHelper>() }
-
-        rxAsync { get<DownloadManager>() }
 
+        GlobalScope.launch { get<DownloadManager>() }
     }
-
-    private fun rxAsync(block: () -> Unit) {
-        Observable.fromCallable { block() }.subscribeOn(Schedulers.computation()).subscribe()
-    }
-
 }

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

@@ -1,9 +1,18 @@
 package eu.kanade.tachiyomi
 
+import androidx.core.content.edit
+import androidx.preference.PreferenceManager
+import eu.kanade.tachiyomi.data.backup.BackupCreatorJob
 import eu.kanade.tachiyomi.data.library.LibraryUpdateJob
+import eu.kanade.tachiyomi.data.preference.PreferenceKeys
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.data.preference.getOrDefault
+import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.data.updater.UpdaterJob
+import eu.kanade.tachiyomi.extension.ExtensionUpdateJob
+import eu.kanade.tachiyomi.ui.library.LibrarySort
+import eu.kanade.tachiyomi.widget.ExtendedNavigationView
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
 import java.io.File
 
 object Migrations {
@@ -16,18 +25,33 @@ object Migrations {
      */
     fun upgrade(preferences: PreferencesHelper): Boolean {
         val context = preferences.context
-        val oldVersion = preferences.lastVersionCode().getOrDefault()
+
+        // Cancel app updater job for debug builds that don't include it
+        if (BuildConfig.DEBUG && !BuildConfig.INCLUDE_UPDATER) {
+            UpdaterJob.cancelTask(context)
+        }
+
+        val oldVersion = preferences.lastVersionCode().get()
         if (oldVersion < BuildConfig.VERSION_CODE) {
             preferences.lastVersionCode().set(BuildConfig.VERSION_CODE)
 
-            if (oldVersion == 0) return false
+            // Fresh install
+            if (oldVersion == 0) {
+                // Set up default background tasks
+                if (BuildConfig.INCLUDE_UPDATER) {
+                    UpdaterJob.setupTask(context)
+                }
+                ExtensionUpdateJob.setupTask(context)
+                LibraryUpdateJob.setupTask(context)
+                return false
+            }
 
             if (oldVersion < 14) {
-                // Restore jobs after upgrading to evernote's job scheduler.
+                // Restore jobs after upgrading to Evernote's job scheduler.
-                if (BuildConfig.INCLUDE_UPDATER && preferences.automaticUpdates()) {
+                if (BuildConfig.INCLUDE_UPDATER) {
-                    UpdaterJob.setupTask()
+                    UpdaterJob.setupTask(context)
                 }
-                LibraryUpdateJob.setupTask()
+                LibraryUpdateJob.setupTask(context)
             }
             if (oldVersion < 15) {
                 // Delete internal chapter cache dir.
@@ -39,7 +63,7 @@ object Migrations {
                 if (oldDir.exists()) {
                     val destDir = context.getExternalFilesDir("covers")
                     if (destDir != null) {
-                        oldDir.listFiles().forEach {
+                        oldDir.listFiles()?.forEach {
                             it.renameTo(File(destDir, it.name))
                         }
                     }
@@ -55,9 +79,49 @@ object Migrations {
                     }
                 }
             }
+            if (oldVersion < 43) {
+                // Restore jobs after migrating from Evernote's job scheduler to WorkManager.
+                if (BuildConfig.INCLUDE_UPDATER) {
+                    UpdaterJob.setupTask(context)
+                }
+                LibraryUpdateJob.setupTask(context)
+                BackupCreatorJob.setupTask(context)
+
+                // New extension update check job
+                ExtensionUpdateJob.setupTask(context)
+            }
+            if (oldVersion < 44) {
+                // Reset sorting preference if using removed sort by source
+                if (preferences.librarySortingMode().get() == LibrarySort.SOURCE) {
+                    preferences.librarySortingMode().set(LibrarySort.ALPHA)
+                }
+            }
+            if (oldVersion < 52) {
+                // Migrate library filters to tri-state versions
+                val prefs = PreferenceManager.getDefaultSharedPreferences(context)
+                fun convertBooleanPrefToTriState(key: String): Int {
+                    val oldPrefValue = prefs.getBoolean(key, false)
+                    return if (oldPrefValue) ExtendedNavigationView.Item.TriStateGroup.State.INCLUDE.value
+                    else ExtendedNavigationView.Item.TriStateGroup.State.IGNORE.value
+                }
+                prefs.edit {
+                    putInt(PreferenceKeys.filterDownloaded, convertBooleanPrefToTriState("pref_filter_downloaded_key"))
+                    remove("pref_filter_downloaded_key")
+
+                    putInt(PreferenceKeys.filterUnread, convertBooleanPrefToTriState("pref_filter_unread_key"))
+                    remove("pref_filter_unread_key")
+
+                    putInt(PreferenceKeys.filterCompleted, convertBooleanPrefToTriState("pref_filter_completed_key"))
+                    remove("pref_filter_completed_key")
+                }
+
+                // Force MAL log out due to login flow change
+                val trackManager = Injekt.get<TrackManager>()
+                trackManager.myAnimeList.logout()
+            }
             return true
         }
+
         return false
     }
-
 }

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

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

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

@@ -0,0 +1,88 @@
+package eu.kanade.tachiyomi.data.backup
+
+import android.content.Context
+import android.net.Uri
+import eu.kanade.tachiyomi.data.database.DatabaseHelper
+import eu.kanade.tachiyomi.data.database.models.Chapter
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.data.track.TrackManager
+import eu.kanade.tachiyomi.source.Source
+import eu.kanade.tachiyomi.source.SourceManager
+import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource
+import rx.Observable
+import uy.kohesive.injekt.injectLazy
+
+abstract class AbstractBackupManager(protected val context: Context) {
+
+    internal val databaseHelper: DatabaseHelper by injectLazy()
+    internal val sourceManager: SourceManager by injectLazy()
+    internal val trackManager: TrackManager by injectLazy()
+    protected val preferences: PreferencesHelper by injectLazy()
+
+    abstract fun createBackup(uri: Uri, flags: Int, isJob: Boolean): String?
+
+    /**
+     * Returns manga
+     *
+     * @return [Manga], null if not found
+     */
+    internal fun getMangaFromDatabase(manga: Manga): Manga? =
+        databaseHelper.getManga(manga.url, manga.source).executeAsBlocking()
+
+    /**
+     * [Observable] that fetches chapter information
+     *
+     * @param source source of manga
+     * @param manga manga that needs updating
+     * @param chapters list of chapters in the backup
+     * @return [Observable] that contains manga
+     */
+    internal fun restoreChapterFetchObservable(source: Source, manga: Manga, chapters: List<Chapter>): Observable<Pair<List<Chapter>, List<Chapter>>> {
+        return source.fetchChapterList(manga)
+            .map { syncChaptersWithSource(databaseHelper, it, manga, source) }
+            .doOnNext { (first) ->
+                if (first.isNotEmpty()) {
+                    chapters.forEach { it.manga_id = manga.id }
+                    updateChapters(chapters)
+                }
+            }
+    }
+
+    /**
+     * Returns list containing manga from library
+     *
+     * @return [Manga] from library
+     */
+    protected fun getFavoriteManga(): List<Manga> =
+        databaseHelper.getFavoriteMangas().executeAsBlocking()
+
+    /**
+     * Inserts manga and returns id
+     *
+     * @return id of [Manga], null if not found
+     */
+    internal fun insertManga(manga: Manga): Long? =
+        databaseHelper.insertManga(manga).executeAsBlocking().insertedId()
+
+    /**
+     * Inserts list of chapters
+     */
+    protected fun insertChapters(chapters: List<Chapter>) {
+        databaseHelper.insertChapters(chapters).executeAsBlocking()
+    }
+
+    /**
+     * Updates a list of chapters
+     */
+    protected fun updateChapters(chapters: List<Chapter>) {
+        databaseHelper.updateChaptersBackup(chapters).executeAsBlocking()
+    }
+
+    /**
+     * Return number of backups.
+     *
+     * @return number of backups selected by user
+     */
+    protected fun numberOfBackups(): Int = preferences.numberOfBackups().get()
+}

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

@@ -0,0 +1,138 @@
+package eu.kanade.tachiyomi.data.backup
+
+import android.content.Context
+import android.net.Uri
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.database.DatabaseHelper
+import eu.kanade.tachiyomi.data.database.models.Chapter
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.models.Track
+import eu.kanade.tachiyomi.data.track.TrackManager
+import eu.kanade.tachiyomi.source.Source
+import eu.kanade.tachiyomi.util.chapter.NoChaptersException
+import kotlinx.coroutines.Job
+import rx.Observable
+import uy.kohesive.injekt.injectLazy
+import java.io.File
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+abstract class AbstractBackupRestore<T : AbstractBackupManager>(protected val context: Context, protected val notifier: BackupNotifier) {
+
+    protected val db: DatabaseHelper by injectLazy()
+    protected val trackManager: TrackManager by injectLazy()
+
+    var job: Job? = null
+
+    protected lateinit var backupManager: T
+
+    protected var restoreAmount = 0
+    protected var restoreProgress = 0
+
+    /**
+     * Mapping of source ID to source name from backup data
+     */
+    protected var sourceMapping: Map<Long, String> = emptyMap()
+
+    protected val errors = mutableListOf<Pair<Date, String>>()
+
+    abstract fun performRestore(uri: Uri): Boolean
+
+    fun restoreBackup(uri: Uri): Boolean {
+        val startTime = System.currentTimeMillis()
+        restoreProgress = 0
+        errors.clear()
+
+        if (!performRestore(uri)) {
+            return false
+        }
+
+        val endTime = System.currentTimeMillis()
+        val time = endTime - startTime
+
+        val logFile = writeErrorLog()
+
+        notifier.showRestoreComplete(time, errors.size, logFile.parent, logFile.name)
+        return true
+    }
+
+    /**
+     * [Observable] that fetches chapter information
+     *
+     * @param source source of manga
+     * @param manga manga that needs updating
+     * @return [Observable] that contains manga
+     */
+    internal fun chapterFetchObservable(source: Source, manga: Manga, chapters: List<Chapter>): Observable<Pair<List<Chapter>, List<Chapter>>> {
+        return backupManager.restoreChapterFetchObservable(source, manga, chapters)
+            // If there's any error, return empty update and continue.
+            .onErrorReturn {
+                val errorMessage = if (it is NoChaptersException) {
+                    context.getString(R.string.no_chapters_error)
+                } else {
+                    it.message
+                }
+                errors.add(Date() to "${manga.title} - $errorMessage")
+                Pair(emptyList(), emptyList())
+            }
+    }
+
+    /**
+     * [Observable] that refreshes tracking information
+     * @param manga manga that needs updating.
+     * @param tracks list containing tracks from restore file.
+     * @return [Observable] that contains updated track item
+     */
+    internal fun trackingFetchObservable(manga: Manga, tracks: List<Track>): Observable<Track> {
+        return Observable.from(tracks)
+            .flatMap { track ->
+                val service = trackManager.getService(track.sync_id)
+                if (service != null && service.isLogged) {
+                    service.refresh(track)
+                        .doOnNext { db.insertTrack(it).executeAsBlocking() }
+                        .onErrorReturn {
+                            errors.add(Date() to "${manga.title} - ${it.message}")
+                            track
+                        }
+                } else {
+                    errors.add(Date() to "${manga.title} - ${context.getString(R.string.tracker_not_logged_in, service?.name)}")
+                    Observable.empty()
+                }
+            }
+    }
+
+    /**
+     * Called to update dialog in [BackupConst]
+     *
+     * @param progress restore progress
+     * @param amount total restoreAmount of manga
+     * @param title title of restored manga
+     */
+    internal fun showRestoreProgress(
+        progress: Int,
+        amount: Int,
+        title: String
+    ) {
+        notifier.showRestoreProgress(title, progress, amount)
+    }
+
+    internal fun writeErrorLog(): File {
+        try {
+            if (errors.isNotEmpty()) {
+                val destFile = File(context.externalCacheDir, "tachiyomi_restore.txt")
+                val sdf = SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.getDefault())
+
+                destFile.bufferedWriter().use { out ->
+                    errors.forEach { (date, message) ->
+                        out.write("[${sdf.format(date)}] $message\n")
+                    }
+                }
+                return destFile
+            }
+        } catch (e: Exception) {
+            // Empty
+        }
+        return File("")
+    }
+}

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

@@ -0,0 +1,16 @@
+package eu.kanade.tachiyomi.data.backup
+
+import android.content.Context
+import android.net.Uri
+import eu.kanade.tachiyomi.data.track.TrackManager
+import eu.kanade.tachiyomi.source.SourceManager
+import uy.kohesive.injekt.injectLazy
+
+abstract class AbstractBackupRestoreValidator {
+    protected val sourceManager: SourceManager by injectLazy()
+    protected val trackManager: TrackManager by injectLazy()
+
+    abstract fun validate(context: Context, uri: Uri): Results
+
+    data class Results(val missingSources: List<String>, val missingTrackers: List<String>)
+}

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

@@ -1,23 +1,15 @@
 package eu.kanade.tachiyomi.data.backup
-import eu.kanade.tachiyomi.BuildConfig.APPLICATION_ID as ID
 
+import eu.kanade.tachiyomi.BuildConfig.APPLICATION_ID as ID
 
 object BackupConst {
 
-    const val INTENT_FILTER = "SettingsBackupFragment"
+    private const val NAME = "BackupRestoreServices"
-    const val ACTION_BACKUP_COMPLETED_DIALOG = "$ID.$INTENT_FILTER.ACTION_BACKUP_COMPLETED_DIALOG"
+    const val EXTRA_URI = "$ID.$NAME.EXTRA_URI"
-    const val ACTION_SET_PROGRESS_DIALOG = "$ID.$INTENT_FILTER.ACTION_SET_PROGRESS_DIALOG"
+    const val EXTRA_FLAGS = "$ID.$NAME.EXTRA_FLAGS"
-    const val ACTION_ERROR_BACKUP_DIALOG = "$ID.$INTENT_FILTER.ACTION_ERROR_BACKUP_DIALOG"
+    const val EXTRA_MODE = "$ID.$NAME.EXTRA_MODE"
-    const val ACTION_ERROR_RESTORE_DIALOG = "$ID.$INTENT_FILTER.ACTION_ERROR_RESTORE_DIALOG"
+    const val EXTRA_TYPE = "$ID.$NAME.EXTRA_TYPE"
-    const val ACTION_RESTORE_COMPLETED_DIALOG = "$ID.$INTENT_FILTER.ACTION_RESTORE_COMPLETED_DIALOG"
+
-    const val ACTION = "$ID.$INTENT_FILTER.ACTION"
+    const val BACKUP_TYPE_LEGACY = 0
-    const val EXTRA_PROGRESS = "$ID.$INTENT_FILTER.EXTRA_PROGRESS"
+    const val BACKUP_TYPE_FULL = 1
-    const val EXTRA_AMOUNT = "$ID.$INTENT_FILTER.EXTRA_AMOUNT"
-    const val EXTRA_ERRORS = "$ID.$INTENT_FILTER.EXTRA_ERRORS"
-    const val EXTRA_CONTENT = "$ID.$INTENT_FILTER.EXTRA_CONTENT"
-    const val EXTRA_ERROR_MESSAGE = "$ID.$INTENT_FILTER.EXTRA_ERROR_MESSAGE"
-    const val EXTRA_URI = "$ID.$INTENT_FILTER.EXTRA_URI"
-    const val EXTRA_TIME = "$ID.$INTENT_FILTER.EXTRA_TIME"
-    const val EXTRA_ERROR_FILE_PATH = "$ID.$INTENT_FILTER.EXTRA_ERROR_FILE_PATH"
-    const val EXTRA_ERROR_FILE = "$ID.$INTENT_FILTER.EXTRA_ERROR_FILE"
 }

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

@@ -1,25 +1,26 @@
 package eu.kanade.tachiyomi.data.backup
 
-import android.app.IntentService
+import android.app.Service
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import com.google.gson.JsonArray
+import android.os.IBinder
-import eu.kanade.tachiyomi.data.database.models.Manga
+import android.os.PowerManager
-import eu.kanade.tachiyomi.BuildConfig.APPLICATION_ID as ID
+import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
+import com.hippo.unifile.UniFile
+import eu.kanade.tachiyomi.data.backup.full.FullBackupManager
+import eu.kanade.tachiyomi.data.backup.legacy.LegacyBackupManager
+import eu.kanade.tachiyomi.data.notification.Notifications
+import eu.kanade.tachiyomi.util.system.acquireWakeLock
+import eu.kanade.tachiyomi.util.system.isServiceRunning
 
 /**
- * [IntentService] used to backup [Manga] information to [JsonArray]
+ * Service for backing up library information to a JSON file.
  */
-class BackupCreateService : IntentService(NAME) {
+class BackupCreateService : Service() {
 
     companion object {
-        // Name of class
-        private const val NAME = "BackupCreateService"
-
-        // Options for backup
-        private const val EXTRA_FLAGS = "$ID.$NAME.EXTRA_FLAGS"
-
         // Filter options
         internal const val BACKUP_CATEGORY = 0x1
         internal const val BACKUP_CATEGORY_MASK = 0x1
@@ -31,6 +32,15 @@ class BackupCreateService : IntentService(NAME) {
         internal const val BACKUP_TRACK_MASK = 0x8
         internal const val BACKUP_ALL = 0xF
 
+        /**
+         * Returns the status of the service.
+         *
+         * @param context the application context.
+         * @return true if the service is running, false otherwise.
+         */
+        fun isRunning(context: Context): Boolean =
+            context.isServiceRunning(BackupCreateService::class.java)
+
         /**
          * Make a backup from library
          *
@@ -38,26 +48,75 @@ class BackupCreateService : IntentService(NAME) {
          * @param uri path of Uri
          * @param flags determines what to backup
          */
-        fun makeBackup(context: Context, uri: Uri, flags: Int) {
+        fun start(context: Context, uri: Uri, flags: Int, type: Int) {
-            val intent = Intent(context, BackupCreateService::class.java).apply {
+            if (!isRunning(context)) {
-                putExtra(BackupConst.EXTRA_URI, uri)
+                val intent = Intent(context, BackupCreateService::class.java).apply {
-                putExtra(EXTRA_FLAGS, flags)
+                    putExtra(BackupConst.EXTRA_URI, uri)
+                    putExtra(BackupConst.EXTRA_FLAGS, flags)
+                    putExtra(BackupConst.EXTRA_TYPE, type)
+                }
+                ContextCompat.startForegroundService(context, intent)
             }
-            context.startService(intent)
+        }
+    }
+
+    /**
+     * Wake lock that will be held until the service is destroyed.
+     */
+    private lateinit var wakeLock: PowerManager.WakeLock
+
+    private lateinit var notifier: BackupNotifier
+
+    override fun onCreate() {
+        super.onCreate()
+
+        notifier = BackupNotifier(this)
+        wakeLock = acquireWakeLock(javaClass.name)
+
+        startForeground(Notifications.ID_BACKUP_PROGRESS, notifier.showBackupProgress().build())
+    }
+
+    override fun stopService(name: Intent?): Boolean {
+        destroyJob()
+        return super.stopService(name)
+    }
+
+    override fun onDestroy() {
+        destroyJob()
+        super.onDestroy()
+    }
+
+    private fun destroyJob() {
+        if (wakeLock.isHeld) {
+            wakeLock.release()
+        }
+    }
+
+    /**
+     * This method needs to be implemented, but it's not used/needed.
+     */
+    override fun onBind(intent: Intent): IBinder? = null
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        if (intent == null) return START_NOT_STICKY
+
+        try {
+            val uri = intent.getParcelableExtra<Uri>(BackupConst.EXTRA_URI)
+            val backupFlags = intent.getIntExtra(BackupConst.EXTRA_FLAGS, 0)
+            val backupType = intent.getIntExtra(BackupConst.EXTRA_TYPE, BackupConst.BACKUP_TYPE_LEGACY)
+            val backupManager = when (backupType) {
+                BackupConst.BACKUP_TYPE_FULL -> FullBackupManager(this)
+                else -> LegacyBackupManager(this)
+            }
+
+            val backupFileUri = backupManager.createBackup(uri, backupFlags, false)?.toUri()
+            val unifile = UniFile.fromUri(this, backupFileUri)
+            notifier.showBackupComplete(unifile)
+        } catch (e: Exception) {
+            notifier.showBackupError(e.message)
         }
 
+        stopSelf(startId)
+        return START_NOT_STICKY
     }
-
-    private val backupManager by lazy { BackupManager(this) }
-
-    override fun onHandleIntent(intent: Intent?) {
-        if (intent == null) return
-
-        // Get values
-        val uri = intent.getParcelableExtra<Uri>(BackupConst.EXTRA_URI)
-        val flags = intent.getIntExtra(EXTRA_FLAGS, 0)
-        // Create backup
-        backupManager.createBackup(uri, flags, false)
-    }
-
 }

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

@@ -1,42 +1,57 @@
 package eu.kanade.tachiyomi.data.backup
 
-import android.net.Uri
+import android.content.Context
-import com.evernote.android.job.Job
+import androidx.core.net.toUri
-import com.evernote.android.job.JobManager
+import androidx.work.ExistingPeriodicWorkPolicy
-import com.evernote.android.job.JobRequest
+import androidx.work.PeriodicWorkRequestBuilder
+import androidx.work.WorkManager
+import androidx.work.Worker
+import androidx.work.WorkerParameters
+import eu.kanade.tachiyomi.data.backup.full.FullBackupManager
+import eu.kanade.tachiyomi.data.backup.legacy.LegacyBackupManager
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.data.preference.getOrDefault
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
+import java.util.concurrent.TimeUnit
 
-class BackupCreatorJob : Job() {
+class BackupCreatorJob(private val context: Context, workerParams: WorkerParameters) :
+    Worker(context, workerParams) {
 
-    override fun onRunJob(params: Params): Result {
+    override fun doWork(): Result {
         val preferences = Injekt.get<PreferencesHelper>()
-        val backupManager = BackupManager(context)
+        val uri = preferences.backupsDirectory().get().toUri()
-        val uri = Uri.parse(preferences.backupsDirectory().getOrDefault())
         val flags = BackupCreateService.BACKUP_ALL
-        backupManager.createBackup(uri, flags, true)
+        return try {
-        return Result.SUCCESS
+            FullBackupManager(context).createBackup(uri, flags, true)
+            if (preferences.createLegacyBackup().get()) {
+                LegacyBackupManager(context).createBackup(uri, flags, true)
+            }
+            Result.success()
+        } catch (e: Exception) {
+            Result.failure()
+        }
     }
 
     companion object {
-        const val TAG = "BackupCreator"
+        private const val TAG = "BackupCreator"
 
-        fun setupTask(prefInterval: Int? = null) {
+        fun setupTask(context: Context, prefInterval: Int? = null) {
             val preferences = Injekt.get<PreferencesHelper>()
-            val interval = prefInterval ?: preferences.backupInterval().getOrDefault()
+            val interval = prefInterval ?: preferences.backupInterval().get()
             if (interval > 0) {
-                JobRequest.Builder(TAG)
+                val request = PeriodicWorkRequestBuilder<BackupCreatorJob>(
-                        .setPeriodic(interval * 60 * 60 * 1000L, 10 * 60 * 1000)
+                    interval.toLong(),
-                        .setUpdateCurrent(true)
+                    TimeUnit.HOURS,
-                        .build()
+                    10,
-                        .schedule()
+                    TimeUnit.MINUTES
-            }
+                )
-        }
+                    .addTag(TAG)
+                    .build()
 
-        fun cancelTask() {
+                WorkManager.getInstance(context).enqueueUniquePeriodicWork(TAG, ExistingPeriodicWorkPolicy.REPLACE, request)
-            JobManager.instance().cancelAllForTag(TAG)
+            } else {
+                WorkManager.getInstance(context).cancelAllWorkByTag(TAG)
+            }
         }
     }
 }

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

@@ -0,0 +1,158 @@
+package eu.kanade.tachiyomi.data.backup
+
+import android.content.Context
+import android.graphics.BitmapFactory
+import androidx.core.app.NotificationCompat
+import com.hippo.unifile.UniFile
+import eu.kanade.tachiyomi.R
+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.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
+
+class BackupNotifier(private val context: Context) {
+
+    private val preferences: PreferencesHelper by injectLazy()
+
+    private val progressNotificationBuilder = context.notificationBuilder(Notifications.CHANNEL_BACKUP_RESTORE_PROGRESS) {
+        setLargeIcon(BitmapFactory.decodeResource(context.resources, R.mipmap.ic_launcher))
+        setSmallIcon(R.drawable.ic_tachi)
+        setAutoCancel(false)
+        setOngoing(true)
+    }
+
+    private val completeNotificationBuilder = context.notificationBuilder(Notifications.CHANNEL_BACKUP_RESTORE_COMPLETE) {
+        setLargeIcon(BitmapFactory.decodeResource(context.resources, R.mipmap.ic_launcher))
+        setSmallIcon(R.drawable.ic_tachi)
+        setAutoCancel(false)
+    }
+
+    private fun NotificationCompat.Builder.show(id: Int) {
+        context.notificationManager.notify(id, build())
+    }
+
+    fun showBackupProgress(): NotificationCompat.Builder {
+        val builder = with(progressNotificationBuilder) {
+            setContentTitle(context.getString(R.string.creating_backup))
+
+            setProgress(0, 0, true)
+            setOnlyAlertOnce(true)
+        }
+
+        builder.show(Notifications.ID_BACKUP_PROGRESS)
+
+        return builder
+    }
+
+    fun showBackupError(error: String?) {
+        context.notificationManager.cancel(Notifications.ID_BACKUP_PROGRESS)
+
+        with(completeNotificationBuilder) {
+            setContentTitle(context.getString(R.string.creating_backup_error))
+            setContentText(error)
+
+            show(Notifications.ID_BACKUP_COMPLETE)
+        }
+    }
+
+    fun showBackupComplete(unifile: UniFile) {
+        context.notificationManager.cancel(Notifications.ID_BACKUP_PROGRESS)
+
+        with(completeNotificationBuilder) {
+            setContentTitle(context.getString(R.string.backup_created))
+            setContentText(unifile.filePath ?: unifile.name)
+
+            // Clear old actions if they exist
+            if (mActions.isNotEmpty()) {
+                mActions.clear()
+            }
+
+            addAction(
+                R.drawable.ic_share_24dp,
+                context.getString(R.string.action_share),
+                NotificationReceiver.shareBackupPendingBroadcast(context, unifile.uri, Notifications.ID_BACKUP_COMPLETE)
+            )
+
+            show(Notifications.ID_BACKUP_COMPLETE)
+        }
+    }
+
+    fun showRestoreProgress(content: String = "", progress: Int = 0, maxAmount: Int = 100): NotificationCompat.Builder {
+        val builder = with(progressNotificationBuilder) {
+            setContentTitle(context.getString(R.string.restoring_backup))
+
+            if (!preferences.hideNotificationContent()) {
+                setContentText(content)
+            }
+
+            setProgress(maxAmount, progress, false)
+            setOnlyAlertOnce(true)
+
+            // Clear old actions if they exist
+            if (mActions.isNotEmpty()) {
+                mActions.clear()
+            }
+
+            addAction(
+                R.drawable.ic_close_24dp,
+                context.getString(R.string.action_stop),
+                NotificationReceiver.cancelRestorePendingBroadcast(context, Notifications.ID_RESTORE_PROGRESS)
+            )
+        }
+
+        builder.show(Notifications.ID_RESTORE_PROGRESS)
+
+        return builder
+    }
+
+    fun showRestoreError(error: String?) {
+        context.notificationManager.cancel(Notifications.ID_RESTORE_PROGRESS)
+
+        with(completeNotificationBuilder) {
+            setContentTitle(context.getString(R.string.restoring_backup_error))
+            setContentText(error)
+
+            show(Notifications.ID_RESTORE_COMPLETE)
+        }
+    }
+
+    fun showRestoreComplete(time: Long, errorCount: Int, path: String?, file: String?) {
+        context.notificationManager.cancel(Notifications.ID_RESTORE_PROGRESS)
+
+        val timeString = context.getString(
+            R.string.restore_duration,
+            TimeUnit.MILLISECONDS.toMinutes(time),
+            TimeUnit.MILLISECONDS.toSeconds(time) - TimeUnit.MINUTES.toSeconds(
+                TimeUnit.MILLISECONDS.toMinutes(time)
+            )
+        )
+
+        with(completeNotificationBuilder) {
+            setContentTitle(context.getString(R.string.restore_completed))
+            setContentText(context.resources.getQuantityString(R.plurals.restore_completed_message, errorCount, timeString, errorCount))
+
+            // Clear old actions if they exist
+            if (mActions.isNotEmpty()) {
+                mActions.clear()
+            }
+
+            if (errorCount > 0 && !path.isNullOrEmpty() && !file.isNullOrEmpty()) {
+                val destFile = File(path, file)
+                val uri = destFile.getUriCompat(context)
+
+                addAction(
+                    R.drawable.nnf_ic_file_folder,
+                    context.getString(R.string.action_open_log),
+                    NotificationReceiver.openErrorLogPendingActivity(context, uri)
+                )
+            }
+
+            show(Notifications.ID_RESTORE_COMPLETE)
+        }
+    }
+}

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

@@ -6,40 +6,20 @@ import android.content.Intent
 import android.net.Uri
 import android.os.IBinder
 import android.os.PowerManager
-import com.github.salomonbrys.kotson.fromJson
+import androidx.core.content.ContextCompat
-import com.google.gson.JsonArray
-import com.google.gson.JsonParser
-import com.google.gson.stream.JsonReader
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.data.backup.models.Backup.CATEGORIES
+import eu.kanade.tachiyomi.data.backup.full.FullBackupRestore
-import eu.kanade.tachiyomi.data.backup.models.Backup.CHAPTERS
+import eu.kanade.tachiyomi.data.backup.legacy.LegacyBackupRestore
-import eu.kanade.tachiyomi.data.backup.models.Backup.HISTORY
+import eu.kanade.tachiyomi.data.notification.Notifications
-import eu.kanade.tachiyomi.data.backup.models.Backup.MANGA
+import eu.kanade.tachiyomi.util.system.acquireWakeLock
-import eu.kanade.tachiyomi.data.backup.models.Backup.MANGAS
+import eu.kanade.tachiyomi.util.system.isServiceRunning
-import eu.kanade.tachiyomi.data.backup.models.Backup.TRACK
+import kotlinx.coroutines.CoroutineExceptionHandler
-import eu.kanade.tachiyomi.data.backup.models.Backup.VERSION
+import kotlinx.coroutines.GlobalScope
-import eu.kanade.tachiyomi.data.backup.models.DHistory
+import kotlinx.coroutines.launch
-import eu.kanade.tachiyomi.data.database.DatabaseHelper
-import eu.kanade.tachiyomi.data.database.models.*
-import eu.kanade.tachiyomi.data.track.TrackManager
-import eu.kanade.tachiyomi.source.Source
-import eu.kanade.tachiyomi.util.chop
-import eu.kanade.tachiyomi.util.isServiceRunning
-import eu.kanade.tachiyomi.util.sendLocalBroadcast
-import rx.Observable
-import rx.Subscription
-import rx.schedulers.Schedulers
 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
-import java.util.concurrent.ExecutorService
-import java.util.concurrent.Executors
 
 /**
- * Restores backup from json file
+ * Restores backup.
  */
 class BackupRestoreService : Service() {
 
@@ -51,8 +31,8 @@ class BackupRestoreService : Service() {
          * @param context the application context.
          * @return true if the service is running, false otherwise.
          */
-        private fun isRunning(context: Context): Boolean =
+        fun isRunning(context: Context): Boolean =
-                context.isServiceRunning(BackupRestoreService::class.java)
+            context.isServiceRunning(BackupRestoreService::class.java)
 
         /**
          * Starts a service to restore a backup from Json
@@ -60,12 +40,14 @@ class BackupRestoreService : Service() {
          * @param context context of application
          * @param uri path of Uri
          */
-        fun start(context: Context, uri: Uri) {
+        fun start(context: Context, uri: Uri, mode: Int, online: Boolean?) {
             if (!isRunning(context)) {
                 val intent = Intent(context, BackupRestoreService::class.java).apply {
                     putExtra(BackupConst.EXTRA_URI, uri)
+                    putExtra(BackupConst.EXTRA_MODE, mode)
+                    online?.let { putExtra(BackupConst.EXTRA_TYPE, it) }
                 }
-                context.startService(intent)
+                ContextCompat.startForegroundService(context, intent)
             }
         }
 
@@ -76,6 +58,8 @@ class BackupRestoreService : Service() {
          */
         fun stop(context: Context) {
             context.stopService(Intent(context, BackupRestoreService::class.java))
+
+            BackupNotifier(context).showRestoreError(context.getString(R.string.restoring_backup_canceled))
         }
     }
 
@@ -84,66 +68,33 @@ class BackupRestoreService : Service() {
      */
     private lateinit var wakeLock: PowerManager.WakeLock
 
-    /**
+    private var backupRestore: AbstractBackupRestore<*>? = null
-     * Subscription where the update is done.
+    private lateinit var notifier: BackupNotifier
-     */
-    private var subscription: Subscription? = null
 
-    /**
-     * The progress of a backup restore
-     */
-    private var restoreProgress = 0
-
-    /**
-     * Amount of manga in Json file (needed for restore)
-     */
-    private var restoreAmount = 0
-
-    /**
-     * List containing errors
-     */
-    private val errors = mutableListOf<Pair<Date, String>>()
-
-    /**
-     * Backup manager
-     */
-    private lateinit var backupManager: BackupManager
-
-    /**
-     * Database
-     */
-    private val db: DatabaseHelper by injectLazy()
-
-    /**
-     * Tracking manager
-     */
-    internal val trackManager: TrackManager by injectLazy()
-
-
-    private lateinit var executor: ExecutorService
-
-    /**
-     * Method called when the service is created. It injects dependencies and acquire the wake lock.
-     */
     override fun onCreate() {
         super.onCreate()
-        wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager).newWakeLock(
+
-                PowerManager.PARTIAL_WAKE_LOCK, "BackupRestoreService:WakeLock")
+        notifier = BackupNotifier(this)
-        wakeLock.acquire()
+        wakeLock = acquireWakeLock(javaClass.name)
-        executor = Executors.newSingleThreadExecutor()
+
+        startForeground(Notifications.ID_RESTORE_PROGRESS, notifier.showRestoreProgress().build())
+    }
+
+    override fun stopService(name: Intent?): Boolean {
+        destroyJob()
+        return super.stopService(name)
     }
 
-    /**
-     * Method called when the service is destroyed. It destroys the running subscription and
-     * releases the wake lock.
-     */
     override fun onDestroy() {
-        subscription?.unsubscribe()
+        destroyJob()
-        executor.shutdown() // must be called after unsubscribe
+        super.onDestroy()
+    }
+
+    private fun destroyJob() {
+        backupRestore?.job?.cancel()
         if (wakeLock.isHeld) {
             wakeLock.release()
         }
-        super.onDestroy()
     }
 
     /**
@@ -160,286 +111,33 @@ class BackupRestoreService : Service() {
      * @return the start value of the command.
      */
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        if (intent == null) return Service.START_NOT_STICKY
+        val uri = intent?.getParcelableExtra<Uri>(BackupConst.EXTRA_URI) ?: return START_NOT_STICKY
+        val mode = intent.getIntExtra(BackupConst.EXTRA_MODE, BackupConst.BACKUP_TYPE_FULL)
+        val online = intent.getBooleanExtra(BackupConst.EXTRA_TYPE, true)
 
-        val uri = intent.getParcelableExtra<Uri>(BackupConst.EXTRA_URI)
+        // Cancel any previous job if needed.
+        backupRestore?.job?.cancel()
 
-        // Unsubscribe from any previous subscription if needed.
+        backupRestore = when (mode) {
-        subscription?.unsubscribe()
+            BackupConst.BACKUP_TYPE_FULL -> FullBackupRestore(this, notifier, online)
+            else -> LegacyBackupRestore(this, notifier)
+        }
+        val handler = CoroutineExceptionHandler { _, exception ->
+            Timber.e(exception)
+            backupRestore?.writeErrorLog()
 
-        subscription = Observable.using(
+            notifier.showRestoreError(exception.message)
-                { db.lowLevel().beginTransaction() },
+            stopSelf(startId)
-                { getRestoreObservable(uri).doOnNext { db.lowLevel().setTransactionSuccessful() } },
+        }
-                { executor.execute { db.lowLevel().endTransaction() } })
+        backupRestore?.job = GlobalScope.launch(handler) {
-                .doAfterTerminate { stopSelf(startId) }
+            if (backupRestore?.restoreBackup(uri) == false) {
-                .subscribeOn(Schedulers.from(executor))
+                notifier.showRestoreError(getString(R.string.restoring_backup_canceled))
-                .subscribe()
-
-        return Service.START_NOT_STICKY
-    }
-
-    /**
-     * Returns an [Observable] containing restore process.
-     *
-     * @param uri restore file
-     * @return [Observable<Manga>]
-     */
-    private fun getRestoreObservable(uri: Uri): Observable<List<Manga>> {
-        val startTime = System.currentTimeMillis()
-
-        return Observable.just(Unit)
-                .map {
-                    val reader = JsonReader(contentResolver.openInputStream(uri).bufferedReader())
-                    val json = JsonParser().parse(reader).asJsonObject
-
-                    // Get parser version
-                    val version = json.get(VERSION)?.asInt ?: 1
-
-                    // Initialize manager
-                    backupManager = BackupManager(this, version)
-
-                    val mangasJson = json.get(MANGAS).asJsonArray
-
-                    restoreAmount = mangasJson.size() + 1 // +1 for categories
-                    restoreProgress = 0
-                    errors.clear()
-
-                    // Restore categories
-                    json.get(CATEGORIES)?.let {
-                        backupManager.restoreCategories(it.asJsonArray)
-                        restoreProgress += 1
-                        showRestoreProgress(restoreProgress, restoreAmount, "Categories added", errors.size)
-                    }
-
-                    mangasJson
-                }
-                .flatMap { Observable.from(it) }
-                .concatMap {
-                    val obj = it.asJsonObject
-                    val manga = backupManager.parser.fromJson<MangaImpl>(obj.get(MANGA))
-                    val chapters = backupManager.parser.fromJson<List<ChapterImpl>>(obj.get(CHAPTERS) ?: JsonArray())
-                    val categories = backupManager.parser.fromJson<List<String>>(obj.get(CATEGORIES) ?: JsonArray())
-                    val history = backupManager.parser.fromJson<List<DHistory>>(obj.get(HISTORY) ?: JsonArray())
-                    val tracks = backupManager.parser.fromJson<List<TrackImpl>>(obj.get(TRACK) ?: JsonArray())
-
-                    val observable = getMangaRestoreObservable(manga, chapters, categories, history, tracks)
-                    if (observable != null) {
-                        observable
-                    } else {
-                        errors.add(Date() to "${manga.title} - ${getString(R.string.source_not_found)}")
-                        restoreProgress += 1
-                        val content = getString(R.string.dialog_restoring_source_not_found, manga.title.chop(15))
-                        showRestoreProgress(restoreProgress, restoreAmount, manga.title, errors.size, content)
-                        Observable.just(manga)
-                    }
-                }
-                .toList()
-                .doOnNext {
-                    val endTime = System.currentTimeMillis()
-                    val time = endTime - startTime
-                    val logFile = writeErrorLog()
-                    val completeIntent = Intent(BackupConst.INTENT_FILTER).apply {
-                        putExtra(BackupConst.EXTRA_TIME, time)
-                        putExtra(BackupConst.EXTRA_ERRORS, errors.size)
-                        putExtra(BackupConst.EXTRA_ERROR_FILE_PATH, logFile.parent)
-                        putExtra(BackupConst.EXTRA_ERROR_FILE, logFile.name)
-                        putExtra(BackupConst.ACTION, BackupConst.ACTION_RESTORE_COMPLETED_DIALOG)
-                    }
-                    sendLocalBroadcast(completeIntent)
-
-                }
-                .doOnError { error ->
-                    Timber.e(error)
-                    writeErrorLog()
-                    val errorIntent = Intent(BackupConst.INTENT_FILTER).apply {
-                        putExtra(BackupConst.ACTION, BackupConst.ACTION_ERROR_RESTORE_DIALOG)
-                        putExtra(BackupConst.EXTRA_ERROR_MESSAGE, error.message)
-                    }
-                    sendLocalBroadcast(errorIntent)
-                }
-                .onErrorReturn { emptyList() }
-    }
-
-    /**
-     * Write errors to error log
-     */
-    private fun writeErrorLog(): File {
-        try {
-            if (errors.isNotEmpty()) {
-                val destFile = File(externalCacheDir, "tachiyomi_restore.log")
-                val sdf = SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.getDefault())
-
-                destFile.bufferedWriter().use { out ->
-                    errors.forEach { (date, message) ->
-                        out.write("[${sdf.format(date)}] $message\n")
-                    }
-                }
-                return destFile
             }
-        } catch (e: Exception) {
-            // Empty
         }
-        return File("")
+        backupRestore?.job?.invokeOnCompletion {
-    }
+            stopSelf(startId)
-
-    /**
-     * Returns a manga restore observable
-     *
-     * @param manga manga data from json
-     * @param chapters chapters data from json
-     * @param categories categories data from json
-     * @param history history data from json
-     * @param tracks tracking data from json
-     * @return [Observable] containing manga restore information
-     */
-    private fun getMangaRestoreObservable(manga: Manga, chapters: List<Chapter>,
-                                          categories: List<String>, history: List<DHistory>,
-                                          tracks: List<Track>): Observable<Manga>? {
-        // Get source
-        val source = backupManager.sourceManager.getOrStub(manga.source)
-        val dbManga = backupManager.getMangaFromDatabase(manga)
-
-        return if (dbManga == null) {
-            // Manga not in database
-            mangaFetchObservable(source, manga, chapters, categories, history, tracks)
-        } else { // Manga in database
-            // Copy information from manga already in database
-            backupManager.restoreMangaNoFetch(manga, dbManga)
-            // Fetch rest of manga information
-            mangaNoFetchObservable(source, manga, chapters, categories, history, tracks)
         }
+
+        return START_NOT_STICKY
     }
-
-    /**
-     * [Observable] that fetches manga information
-     *
-     * @param manga manga that needs updating
-     * @param chapters chapters of manga that needs updating
-     * @param categories categories that need updating
-     */
-    private fun mangaFetchObservable(source: Source, manga: Manga, chapters: List<Chapter>,
-                                     categories: List<String>, history: List<DHistory>,
-                                     tracks: List<Track>): Observable<Manga> {
-        return backupManager.restoreMangaFetchObservable(source, manga)
-                .onErrorReturn {
-                    errors.add(Date() to "${manga.title} - ${it.message}")
-                    manga
-                }
-                .filter { it.id != null }
-                .flatMap {
-                    chapterFetchObservable(source, it, chapters)
-                            // Convert to the manga that contains new chapters.
-                            .map { manga }
-                }
-                .doOnNext {
-                    restoreExtraForManga(it, categories, history, tracks)
-                }
-                .flatMap {
-                    trackingFetchObservable(it, tracks)
-                            // Convert to the manga that contains new chapters.
-                            .map { manga }
-                }
-                .doOnCompleted {
-                    restoreProgress += 1
-                    showRestoreProgress(restoreProgress, restoreAmount, manga.title, errors.size)
-                }
-    }
-
-    private fun mangaNoFetchObservable(source: Source, backupManga: Manga, chapters: List<Chapter>,
-                                       categories: List<String>, history: List<DHistory>,
-                                       tracks: List<Track>): Observable<Manga> {
-
-        return Observable.just(backupManga)
-                .flatMap { manga ->
-                    if (!backupManager.restoreChaptersForManga(manga, chapters)) {
-                        chapterFetchObservable(source, manga, chapters)
-                                .map { manga }
-                    } else {
-                        Observable.just(manga)
-                    }
-                }
-                .doOnNext {
-                    restoreExtraForManga(it, categories, history, tracks)
-                }
-                .flatMap { manga ->
-                    trackingFetchObservable(manga, tracks)
-                            // Convert to the manga that contains new chapters.
-                            .map { manga }
-                }
-                .doOnCompleted {
-                    restoreProgress += 1
-                    showRestoreProgress(restoreProgress, restoreAmount, backupManga.title, errors.size)
-                }
-    }
-
-    private fun restoreExtraForManga(manga: Manga, categories: List<String>, history: List<DHistory>, tracks: List<Track>) {
-        // Restore categories
-        backupManager.restoreCategoriesForManga(manga, categories)
-
-        // Restore history
-        backupManager.restoreHistoryForManga(history)
-
-        // Restore tracking
-        backupManager.restoreTrackForManga(manga, tracks)
-    }
-
-    /**
-     * [Observable] that fetches chapter information
-     *
-     * @param source source of manga
-     * @param manga manga that needs updating
-     * @return [Observable] that contains manga
-     */
-    private fun chapterFetchObservable(source: Source, manga: Manga, chapters: List<Chapter>): Observable<Pair<List<Chapter>, List<Chapter>>> {
-        return backupManager.restoreChapterFetchObservable(source, manga, chapters)
-                // If there's any error, return empty update and continue.
-                .onErrorReturn {
-                    errors.add(Date() to "${manga.title} - ${it.message}")
-                    Pair(emptyList(), emptyList())
-                }
-    }
-
-    /**
-     * [Observable] that refreshes tracking information
-     * @param manga manga that needs updating.
-     * @param tracks list containing tracks from restore file.
-     * @return [Observable] that contains updated track item
-     */
-    private fun trackingFetchObservable(manga: Manga, tracks: List<Track>): Observable<Track> {
-        return Observable.from(tracks)
-                .concatMap { track ->
-                    val service = trackManager.getService(track.sync_id)
-                    if (service != null && service.isLogged) {
-                        service.refresh(track)
-                                .doOnNext { db.insertTrack(it).executeAsBlocking() }
-                                .onErrorReturn {
-                                    errors.add(Date() to "${manga.title} - ${it.message}")
-                                    track
-                                }
-                    } else {
-                        errors.add(Date() to "${manga.title} - ${service?.name} not logged in")
-                        Observable.empty()
-                    }
-                }
-    }
-
-    /**
-     * Called to update dialog in [BackupConst]
-     *
-     * @param progress restore progress
-     * @param amount total restoreAmount of manga
-     * @param title title of restored manga
-     */
-    private fun showRestoreProgress(progress: Int, amount: Int, title: String, errors: Int,
-                                    content: String = getString(R.string.dialog_restoring_backup, title.chop(15))) {
-        val intent = Intent(BackupConst.INTENT_FILTER).apply {
-            putExtra(BackupConst.EXTRA_PROGRESS, progress)
-            putExtra(BackupConst.EXTRA_AMOUNT, amount)
-            putExtra(BackupConst.EXTRA_CONTENT, content)
-            putExtra(BackupConst.EXTRA_ERRORS, errors)
-            putExtra(BackupConst.ACTION, BackupConst.ACTION_SET_PROGRESS_DIALOG)
-        }
-        sendLocalBroadcast(intent)
-    }
-
 }

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

@@ -0,0 +1,412 @@
+package eu.kanade.tachiyomi.data.backup.full
+
+import android.content.Context
+import android.net.Uri
+import com.hippo.unifile.UniFile
+import eu.kanade.tachiyomi.data.backup.AbstractBackupManager
+import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CATEGORY
+import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CATEGORY_MASK
+import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CHAPTER
+import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CHAPTER_MASK
+import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_HISTORY
+import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_HISTORY_MASK
+import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_TRACK
+import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_TRACK_MASK
+import eu.kanade.tachiyomi.data.backup.full.models.Backup
+import eu.kanade.tachiyomi.data.backup.full.models.BackupCategory
+import eu.kanade.tachiyomi.data.backup.full.models.BackupChapter
+import eu.kanade.tachiyomi.data.backup.full.models.BackupFull
+import eu.kanade.tachiyomi.data.backup.full.models.BackupHistory
+import eu.kanade.tachiyomi.data.backup.full.models.BackupManga
+import eu.kanade.tachiyomi.data.backup.full.models.BackupSerializer
+import eu.kanade.tachiyomi.data.backup.full.models.BackupSource
+import eu.kanade.tachiyomi.data.backup.full.models.BackupTracking
+import eu.kanade.tachiyomi.data.database.models.Chapter
+import eu.kanade.tachiyomi.data.database.models.History
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.models.MangaCategory
+import eu.kanade.tachiyomi.data.database.models.Track
+import eu.kanade.tachiyomi.source.Source
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.protobuf.ProtoBuf
+import okio.buffer
+import okio.gzip
+import okio.sink
+import rx.Observable
+import timber.log.Timber
+import kotlin.math.max
+
+@OptIn(ExperimentalSerializationApi::class)
+class FullBackupManager(context: Context) : AbstractBackupManager(context) {
+
+    val parser = ProtoBuf
+
+    /**
+     * Create backup Json file from database
+     *
+     * @param uri path of Uri
+     * @param isJob backup called from job
+     */
+    override fun createBackup(uri: Uri, flags: Int, isJob: Boolean): String? {
+        // Create root object
+        var backup: Backup? = null
+
+        databaseHelper.inTransaction {
+            val databaseManga = getFavoriteManga()
+
+            backup = Backup(
+                backupManga(databaseManga, flags),
+                backupCategories(),
+                backupExtensionInfo(databaseManga)
+            )
+        }
+
+        try {
+            val file: UniFile = (
+                if (isJob) {
+                    // Get dir of file and create
+                    var dir = UniFile.fromUri(context, uri)
+                    dir = dir.createDirectory("automatic")
+
+                    // Delete older backups
+                    val numberOfBackups = numberOfBackups()
+                    val backupRegex = Regex("""tachiyomi_\d+-\d+-\d+_\d+-\d+.proto.gz""")
+                    dir.listFiles { _, filename -> backupRegex.matches(filename) }
+                        .orEmpty()
+                        .sortedByDescending { it.name }
+                        .drop(numberOfBackups - 1)
+                        .forEach { it.delete() }
+
+                    // Create new file to place backup
+                    dir.createFile(BackupFull.getDefaultFilename())
+                } else {
+                    UniFile.fromUri(context, uri)
+                }
+                )
+                ?: throw Exception("Couldn't create backup file")
+
+            val byteArray = parser.encodeToByteArray(BackupSerializer, backup!!)
+            file.openOutputStream().sink().gzip().buffer().use { it.write(byteArray) }
+            return file.uri.toString()
+        } catch (e: Exception) {
+            Timber.e(e)
+            throw e
+        }
+    }
+
+    private fun backupManga(mangas: List<Manga>, flags: Int): List<BackupManga> {
+        return mangas.map {
+            backupMangaObject(it, flags)
+        }
+    }
+
+    private fun backupExtensionInfo(mangas: List<Manga>): List<BackupSource> {
+        return mangas
+            .asSequence()
+            .map { it.source }
+            .distinct()
+            .map { sourceManager.getOrStub(it) }
+            .map { BackupSource.copyFrom(it) }
+            .toList()
+    }
+
+    /**
+     * Backup the categories of library
+     *
+     * @return list of [BackupCategory] to be backed up
+     */
+    private fun backupCategories(): List<BackupCategory> {
+        return databaseHelper.getCategories()
+            .executeAsBlocking()
+            .map { BackupCategory.copyFrom(it) }
+    }
+
+    /**
+     * Convert a manga to Json
+     *
+     * @param manga manga that gets converted
+     * @param options options for the backup
+     * @return [BackupManga] containing manga in a serializable form
+     */
+    private fun backupMangaObject(manga: Manga, options: Int): BackupManga {
+        // Entry for this manga
+        val mangaObject = BackupManga.copyFrom(manga)
+
+        // Check if user wants chapter information in backup
+        if (options and BACKUP_CHAPTER_MASK == BACKUP_CHAPTER) {
+            // Backup all the chapters
+            val chapters = databaseHelper.getChapters(manga).executeAsBlocking()
+            if (chapters.isNotEmpty()) {
+                mangaObject.chapters = chapters.map { BackupChapter.copyFrom(it) }
+            }
+        }
+
+        // Check if user wants category information in backup
+        if (options and BACKUP_CATEGORY_MASK == BACKUP_CATEGORY) {
+            // Backup categories for this manga
+            val categoriesForManga = databaseHelper.getCategoriesForManga(manga).executeAsBlocking()
+            if (categoriesForManga.isNotEmpty()) {
+                mangaObject.categories = categoriesForManga.mapNotNull { it.order }
+            }
+        }
+
+        // Check if user wants track information in backup
+        if (options and BACKUP_TRACK_MASK == BACKUP_TRACK) {
+            val tracks = databaseHelper.getTracks(manga).executeAsBlocking()
+            if (tracks.isNotEmpty()) {
+                mangaObject.tracking = tracks.map { BackupTracking.copyFrom(it) }
+            }
+        }
+
+        // Check if user wants history information in backup
+        if (options and BACKUP_HISTORY_MASK == BACKUP_HISTORY) {
+            val historyForManga = databaseHelper.getHistoryByMangaId(manga.id!!).executeAsBlocking()
+            if (historyForManga.isNotEmpty()) {
+                val history = historyForManga.mapNotNull { history ->
+                    val url = databaseHelper.getChapter(history.chapter_id).executeAsBlocking()?.url
+                    url?.let { BackupHistory(url, history.last_read) }
+                }
+                if (history.isNotEmpty()) {
+                    mangaObject.history = history
+                }
+            }
+        }
+
+        return mangaObject
+    }
+
+    fun restoreMangaNoFetch(manga: Manga, dbManga: Manga) {
+        manga.id = dbManga.id
+        manga.copyFrom(dbManga)
+        insertManga(manga)
+    }
+
+    /**
+     * [Observable] that fetches manga information
+     *
+     * @param source source of manga
+     * @param manga manga that needs updating
+     * @return [Observable] that contains manga
+     */
+    fun restoreMangaFetchObservable(source: Source?, manga: Manga, online: Boolean): Observable<Manga> {
+        return if (online && source != null) {
+            source.fetchMangaDetails(manga)
+                .map { networkManga ->
+                    manga.copyFrom(networkManga)
+                    manga.favorite = manga.favorite
+                    manga.initialized = true
+                    manga.id = insertManga(manga)
+                    manga
+                }
+        } else {
+            Observable.just(manga)
+                .map {
+                    it.initialized = it.description != null
+                    it.id = insertManga(it)
+                    it
+                }
+        }
+    }
+
+    /**
+     * Restore the categories from Json
+     *
+     * @param backupCategories list containing categories
+     */
+    internal fun restoreCategories(backupCategories: List<BackupCategory>) {
+        // Get categories from file and from db
+        val dbCategories = databaseHelper.getCategories().executeAsBlocking()
+
+        // Iterate over them
+        backupCategories.map { it.getCategoryImpl() }.forEach { category ->
+            // Used to know if the category is already in the db
+            var found = false
+            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.name == dbCategory.name) {
+                    category.id = dbCategory.id
+                    found = true
+                    break
+                }
+            }
+            // If the category isn't in the db, remove the id and insert a new category
+            // Store the inserted id in the category
+            if (!found) {
+                // Let the db assign the id
+                category.id = null
+                val result = databaseHelper.insertCategory(category).executeAsBlocking()
+                category.id = result.insertedId()?.toInt()
+            }
+        }
+    }
+
+    /**
+     * Restores the categories a manga is in.
+     *
+     * @param manga the manga whose categories have to be restored.
+     * @param categories the categories to restore.
+     */
+    internal fun restoreCategoriesForManga(manga: Manga, categories: List<Int>, backupCategories: List<BackupCategory>) {
+        val dbCategories = databaseHelper.getCategories().executeAsBlocking()
+        val mangaCategoriesToUpdate = mutableListOf<MangaCategory>()
+        categories.forEach { backupCategoryOrder ->
+            backupCategories.firstOrNull {
+                it.order == backupCategoryOrder
+            }?.let { backupCategory ->
+                dbCategories.firstOrNull { dbCategory ->
+                    dbCategory.name == backupCategory.name
+                }?.let { dbCategory ->
+                    mangaCategoriesToUpdate += MangaCategory.create(manga, dbCategory)
+                }
+            }
+        }
+
+        // Update database
+        if (mangaCategoriesToUpdate.isNotEmpty()) {
+            databaseHelper.deleteOldMangasCategories(listOf(manga)).executeAsBlocking()
+            databaseHelper.insertMangasCategories(mangaCategoriesToUpdate).executeAsBlocking()
+        }
+    }
+
+    /**
+     * Restore history from Json
+     *
+     * @param history list containing history to be restored
+     */
+    internal fun restoreHistoryForManga(history: List<BackupHistory>) {
+        // List containing history to be updated
+        val historyToBeUpdated = mutableListOf<History>()
+        for ((url, lastRead) in history) {
+            val dbHistory = databaseHelper.getHistoryByChapterUrl(url).executeAsBlocking()
+            // Check if history already in database and update
+            if (dbHistory != null) {
+                dbHistory.apply {
+                    last_read = max(lastRead, dbHistory.last_read)
+                }
+                historyToBeUpdated.add(dbHistory)
+            } else {
+                // If not in database create
+                databaseHelper.getChapter(url).executeAsBlocking()?.let {
+                    val historyToAdd = History.create(it).apply {
+                        last_read = lastRead
+                    }
+                    historyToBeUpdated.add(historyToAdd)
+                }
+            }
+        }
+        databaseHelper.updateHistoryLastRead(historyToBeUpdated).executeAsBlocking()
+    }
+
+    /**
+     * Restores the sync of a manga.
+     *
+     * @param manga the manga whose sync have to be restored.
+     * @param tracks the track list to restore.
+     */
+    internal fun restoreTrackForManga(manga: Manga, tracks: List<Track>) {
+        // Fix foreign keys with the current manga id
+        tracks.map { it.manga_id = manga.id!! }
+
+        // Get tracks from database
+        val dbTracks = databaseHelper.getTracks(manga).executeAsBlocking()
+        val trackToUpdate = mutableListOf<Track>()
+
+        tracks.forEach { track ->
+            val service = trackManager.getService(track.sync_id)
+            if (service != null && service.isLogged) {
+                var isInDatabase = false
+                for (dbTrack in dbTracks) {
+                    if (track.sync_id == dbTrack.sync_id) {
+                        // The sync is already in the db, only update its fields
+                        if (track.media_id != dbTrack.media_id) {
+                            dbTrack.media_id = track.media_id
+                        }
+                        if (track.library_id != dbTrack.library_id) {
+                            dbTrack.library_id = track.library_id
+                        }
+                        dbTrack.last_chapter_read = max(dbTrack.last_chapter_read, track.last_chapter_read)
+                        isInDatabase = true
+                        trackToUpdate.add(dbTrack)
+                        break
+                    }
+                }
+                if (!isInDatabase) {
+                    // Insert new sync. Let the db assign the id
+                    track.id = null
+                    trackToUpdate.add(track)
+                }
+            }
+        }
+        // Update database
+        if (trackToUpdate.isNotEmpty()) {
+            databaseHelper.insertTracks(trackToUpdate).executeAsBlocking()
+        }
+    }
+
+    /**
+     * Restore the chapters for manga if chapters already in database
+     *
+     * @param manga manga of chapters
+     * @param chapters list containing chapters that get restored
+     * @return boolean answering if chapter fetch is not needed
+     */
+    internal fun restoreChaptersForManga(manga: Manga, chapters: List<Chapter>): Boolean {
+        val dbChapters = databaseHelper.getChapters(manga).executeAsBlocking()
+
+        // Return if fetch is needed
+        if (dbChapters.isEmpty() || dbChapters.size < chapters.size) {
+            return false
+        }
+
+        chapters.forEach { chapter ->
+            val pos = dbChapters.indexOfFirst { it.url == chapter.url }
+            if (pos != -1) {
+                val dbChapter = dbChapters[pos]
+                chapter.id = dbChapter.id
+                chapter.copyFrom(dbChapter)
+                if (dbChapter.read && !chapter.read) {
+                    chapter.read = dbChapter.read
+                    chapter.last_page_read = dbChapter.last_page_read
+                } else if (chapter.last_page_read == 0 && dbChapter.last_page_read != 0) {
+                    chapter.last_page_read = dbChapter.last_page_read
+                }
+                if (!chapter.bookmark && dbChapter.bookmark) {
+                    chapter.bookmark = dbChapter.bookmark
+                }
+            }
+        }
+        // Filter the chapters that couldn't be found.
+        chapters.filter { it.id != null }
+        chapters.map { it.manga_id = manga.id }
+
+        updateChapters(chapters)
+        return true
+    }
+
+    internal fun restoreChaptersForMangaOffline(manga: Manga, chapters: List<Chapter>) {
+        val dbChapters = databaseHelper.getChapters(manga).executeAsBlocking()
+
+        chapters.forEach { chapter ->
+            val pos = dbChapters.indexOfFirst { it.url == chapter.url }
+            if (pos != -1) {
+                val dbChapter = dbChapters[pos]
+                chapter.id = dbChapter.id
+                chapter.copyFrom(dbChapter)
+                if (dbChapter.read && !chapter.read) {
+                    chapter.read = dbChapter.read
+                    chapter.last_page_read = dbChapter.last_page_read
+                } else if (chapter.last_page_read == 0 && dbChapter.last_page_read != 0) {
+                    chapter.last_page_read = dbChapter.last_page_read
+                }
+                if (!chapter.bookmark && dbChapter.bookmark) {
+                    chapter.bookmark = dbChapter.bookmark
+                }
+            }
+        }
+        chapters.map { it.manga_id = manga.id }
+
+        updateChapters(chapters.filter { it.id != null })
+        insertChapters(chapters.filter { it.id == null })
+    }
+}

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

@@ -0,0 +1,205 @@
+package eu.kanade.tachiyomi.data.backup.full
+
+import android.content.Context
+import android.net.Uri
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.backup.AbstractBackupRestore
+import eu.kanade.tachiyomi.data.backup.BackupNotifier
+import eu.kanade.tachiyomi.data.backup.full.models.BackupCategory
+import eu.kanade.tachiyomi.data.backup.full.models.BackupHistory
+import eu.kanade.tachiyomi.data.backup.full.models.BackupManga
+import eu.kanade.tachiyomi.data.backup.full.models.BackupSerializer
+import eu.kanade.tachiyomi.data.database.models.Chapter
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.models.Track
+import eu.kanade.tachiyomi.source.Source
+import kotlinx.serialization.ExperimentalSerializationApi
+import okio.buffer
+import okio.gzip
+import okio.source
+import rx.Observable
+import java.util.Date
+
+@OptIn(ExperimentalSerializationApi::class)
+class FullBackupRestore(context: Context, notifier: BackupNotifier, private val online: Boolean) : AbstractBackupRestore<FullBackupManager>(context, notifier) {
+
+    override fun performRestore(uri: Uri): Boolean {
+        backupManager = FullBackupManager(context)
+
+        val backupString = context.contentResolver.openInputStream(uri)!!.source().gzip().buffer().use { it.readByteArray() }
+        val backup = backupManager.parser.decodeFromByteArray(BackupSerializer, backupString)
+
+        restoreAmount = backup.backupManga.size + 1 // +1 for categories
+
+        // Restore categories
+        if (backup.backupCategories.isNotEmpty()) {
+            restoreCategories(backup.backupCategories)
+        }
+
+        // Store source mapping for error messages
+        sourceMapping = backup.backupSources.map { it.sourceId to it.name }.toMap()
+
+        // Restore individual manga
+        backup.backupManga.forEach {
+            if (job?.isActive != true) {
+                return false
+            }
+
+            restoreManga(it, backup.backupCategories, online)
+        }
+
+        return true
+    }
+
+    private fun restoreCategories(backupCategories: List<BackupCategory>) {
+        db.inTransaction {
+            backupManager.restoreCategories(backupCategories)
+        }
+
+        restoreProgress += 1
+        showRestoreProgress(restoreProgress, restoreAmount, context.getString(R.string.categories))
+    }
+
+    private fun restoreManga(backupManga: BackupManga, backupCategories: List<BackupCategory>, online: Boolean) {
+        val manga = backupManga.getMangaImpl()
+        val chapters = backupManga.getChaptersImpl()
+        val categories = backupManga.categories
+        val history = backupManga.history
+        val tracks = backupManga.getTrackingImpl()
+
+        try {
+            val source = backupManager.sourceManager.get(manga.source)
+            if (source != null || !online) {
+                restoreMangaData(manga, source, chapters, categories, history, tracks, backupCategories, online)
+            } else {
+                val sourceName = sourceMapping[manga.source] ?: manga.source.toString()
+                errors.add(Date() to "${manga.title} - ${context.getString(R.string.source_not_found_name, sourceName)}")
+            }
+        } catch (e: Exception) {
+            errors.add(Date() to "${manga.title} - ${e.message}")
+        }
+
+        restoreProgress += 1
+        showRestoreProgress(restoreProgress, restoreAmount, manga.title)
+    }
+
+    /**
+     * Returns a manga restore observable
+     *
+     * @param manga manga data from json
+     * @param source source to get manga data from
+     * @param chapters chapters data from json
+     * @param categories categories data from json
+     * @param history history data from json
+     * @param tracks tracking data from json
+     */
+    private fun restoreMangaData(
+        manga: Manga,
+        source: Source?,
+        chapters: List<Chapter>,
+        categories: List<Int>,
+        history: List<BackupHistory>,
+        tracks: List<Track>,
+        backupCategories: List<BackupCategory>,
+        online: Boolean
+    ) {
+        val dbManga = backupManager.getMangaFromDatabase(manga)
+
+        db.inTransaction {
+            if (dbManga == null) {
+                // Manga not in database
+                restoreMangaFetch(source, manga, chapters, categories, history, tracks, backupCategories, online)
+            } else { // Manga in database
+                // Copy information from manga already in database
+                backupManager.restoreMangaNoFetch(manga, dbManga)
+                // Fetch rest of manga information
+                restoreMangaNoFetch(source, manga, chapters, categories, history, tracks, backupCategories, online)
+            }
+        }
+    }
+
+    /**
+     * [Observable] that fetches manga information
+     *
+     * @param manga manga that needs updating
+     * @param chapters chapters of manga that needs updating
+     * @param categories categories that need updating
+     */
+    private fun restoreMangaFetch(
+        source: Source?,
+        manga: Manga,
+        chapters: List<Chapter>,
+        categories: List<Int>,
+        history: List<BackupHistory>,
+        tracks: List<Track>,
+        backupCategories: List<BackupCategory>,
+        online: Boolean
+    ) {
+        backupManager.restoreMangaFetchObservable(source, manga, online)
+            .doOnError {
+                errors.add(Date() to "${manga.title} - ${it.message}")
+            }
+            .filter { it.id != null }
+            .flatMap {
+                if (online && source != null) {
+                    chapterFetchObservable(source, it, chapters)
+                        // Convert to the manga that contains new chapters.
+                        .map { manga }
+                } else {
+                    backupManager.restoreChaptersForMangaOffline(it, chapters)
+                    Observable.just(manga)
+                }
+            }
+            .doOnNext {
+                restoreExtraForManga(it, categories, history, tracks, backupCategories)
+            }
+            .flatMap {
+                trackingFetchObservable(it, tracks)
+            }
+            .subscribe()
+    }
+
+    private fun restoreMangaNoFetch(
+        source: Source?,
+        backupManga: Manga,
+        chapters: List<Chapter>,
+        categories: List<Int>,
+        history: List<BackupHistory>,
+        tracks: List<Track>,
+        backupCategories: List<BackupCategory>,
+        online: Boolean
+    ) {
+        Observable.just(backupManga)
+            .flatMap { manga ->
+                if (online && source != null) {
+                    if (!backupManager.restoreChaptersForManga(manga, chapters)) {
+                        chapterFetchObservable(source, manga, chapters)
+                            .map { manga }
+                    } else {
+                        Observable.just(manga)
+                    }
+                } else {
+                    backupManager.restoreChaptersForMangaOffline(manga, chapters)
+                    Observable.just(manga)
+                }
+            }
+            .doOnNext {
+                restoreExtraForManga(it, categories, history, tracks, backupCategories)
+            }
+            .flatMap { manga ->
+                trackingFetchObservable(manga, tracks)
+            }
+            .subscribe()
+    }
+
+    private fun restoreExtraForManga(manga: Manga, categories: List<Int>, history: List<BackupHistory>, tracks: List<Track>, backupCategories: List<BackupCategory>) {
+        // Restore categories
+        backupManager.restoreCategoriesForManga(manga, categories, backupCategories)
+
+        // Restore history
+        backupManager.restoreHistoryForManga(history)
+
+        // Restore tracking
+        backupManager.restoreTrackForManga(manga, tracks)
+    }
+}

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

@@ -0,0 +1,49 @@
+package eu.kanade.tachiyomi.data.backup.full
+
+import android.content.Context
+import android.net.Uri
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.backup.AbstractBackupRestoreValidator
+import eu.kanade.tachiyomi.data.backup.full.models.BackupSerializer
+import kotlinx.serialization.ExperimentalSerializationApi
+import okio.buffer
+import okio.gzip
+import okio.source
+
+@OptIn(ExperimentalSerializationApi::class)
+class FullBackupRestoreValidator : AbstractBackupRestoreValidator() {
+    /**
+     * Checks for critical backup file data.
+     *
+     * @throws Exception if manga cannot be found.
+     * @return List of missing sources or missing trackers.
+     */
+    override fun validate(context: Context, uri: Uri): Results {
+        val backupManager = FullBackupManager(context)
+
+        val backupString = context.contentResolver.openInputStream(uri)!!.source().gzip().buffer().use { it.readByteArray() }
+        val backup = backupManager.parser.decodeFromByteArray(BackupSerializer, backupString)
+
+        if (backup.backupManga.isEmpty()) {
+            throw Exception(context.getString(R.string.invalid_backup_file_missing_manga))
+        }
+
+        val sources = backup.backupSources.map { it.sourceId to it.name }.toMap()
+        val missingSources = sources
+            .filter { sourceManager.get(it.key) == null }
+            .values
+            .sorted()
+
+        val trackers = backup.backupManga
+            .flatMap { it.tracking }
+            .map { it.syncId }
+            .distinct()
+        val missingTrackers = trackers
+            .mapNotNull { trackManager.getService(it) }
+            .filter { !it.isLogged }
+            .map { it.name }
+            .sorted()
+
+        return Results(missingSources, missingTrackers)
+    }
+}

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

@@ -0,0 +1,12 @@
+package eu.kanade.tachiyomi.data.backup.full.models
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.protobuf.ProtoNumber
+
+@Serializable
+data class Backup(
+    @ProtoNumber(1) val backupManga: List<BackupManga>,
+    @ProtoNumber(2) var backupCategories: List<BackupCategory> = emptyList(),
+    // Bump by 100 to specify this is a 0.x value
+    @ProtoNumber(100) var backupSources: List<BackupSource> = emptyList(),
+)

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

@@ -0,0 +1,33 @@
+package eu.kanade.tachiyomi.data.backup.full.models
+
+import eu.kanade.tachiyomi.data.database.models.Category
+import eu.kanade.tachiyomi.data.database.models.CategoryImpl
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.protobuf.ProtoNumber
+
+@Serializable
+class BackupCategory(
+    @ProtoNumber(1) var name: String,
+    @ProtoNumber(2) var order: Int = 0,
+    // @ProtoNumber(3) val updateInterval: Int = 0, 1.x value not used in 0.x
+    // Bump by 100 to specify this is a 0.x value
+    @ProtoNumber(100) var flags: Int = 0,
+) {
+    fun getCategoryImpl(): CategoryImpl {
+        return CategoryImpl().apply {
+            name = this@BackupCategory.name
+            flags = this@BackupCategory.flags
+            order = this@BackupCategory.order
+        }
+    }
+
+    companion object {
+        fun copyFrom(category: Category): BackupCategory {
+            return BackupCategory(
+                name = category.name,
+                order = category.order,
+                flags = category.flags
+            )
+        }
+    }
+}

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

@@ -0,0 +1,56 @@
+package eu.kanade.tachiyomi.data.backup.full.models
+
+import eu.kanade.tachiyomi.data.database.models.Chapter
+import eu.kanade.tachiyomi.data.database.models.ChapterImpl
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.protobuf.ProtoNumber
+
+@Serializable
+data class BackupChapter(
+    // in 1.x some of these values have different names
+    // url is called key in 1.x
+    @ProtoNumber(1) var url: String,
+    @ProtoNumber(2) var name: String,
+    @ProtoNumber(3) var scanlator: String? = null,
+    @ProtoNumber(4) var read: Boolean = false,
+    @ProtoNumber(5) var bookmark: Boolean = false,
+    // lastPageRead is called progress in 1.x
+    @ProtoNumber(6) var lastPageRead: Int = 0,
+    @ProtoNumber(7) var dateFetch: Long = 0,
+    @ProtoNumber(8) var dateUpload: Long = 0,
+    // chapterNumber is called number is 1.x
+    @ProtoNumber(9) var chapterNumber: Float = 0F,
+    @ProtoNumber(10) var sourceOrder: Int = 0,
+) {
+    fun toChapterImpl(): ChapterImpl {
+        return ChapterImpl().apply {
+            url = this@BackupChapter.url
+            name = this@BackupChapter.name
+            chapter_number = this@BackupChapter.chapterNumber
+            scanlator = this@BackupChapter.scanlator
+            read = this@BackupChapter.read
+            bookmark = this@BackupChapter.bookmark
+            last_page_read = this@BackupChapter.lastPageRead
+            date_fetch = this@BackupChapter.dateFetch
+            date_upload = this@BackupChapter.dateUpload
+            source_order = this@BackupChapter.sourceOrder
+        }
+    }
+
+    companion object {
+        fun copyFrom(chapter: Chapter): BackupChapter {
+            return BackupChapter(
+                url = chapter.url,
+                name = chapter.name,
+                chapterNumber = chapter.chapter_number,
+                scanlator = chapter.scanlator,
+                read = chapter.read,
+                bookmark = chapter.bookmark,
+                lastPageRead = chapter.last_page_read,
+                dateFetch = chapter.date_fetch,
+                dateUpload = chapter.date_upload,
+                sourceOrder = chapter.source_order
+            )
+        }
+    }
+}

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

@@ -0,0 +1,12 @@
+package eu.kanade.tachiyomi.data.backup.full.models
+
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+object BackupFull {
+    fun getDefaultFilename(): String {
+        val date = SimpleDateFormat("yyyy-MM-dd_HH-mm", Locale.getDefault()).format(Date())
+        return "tachiyomi_$date.proto.gz"
+    }
+}

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

@@ -0,0 +1,10 @@
+package eu.kanade.tachiyomi.data.backup.full.models
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.protobuf.ProtoNumber
+
+@Serializable
+data class BackupHistory(
+    @ProtoNumber(0) var url: String,
+    @ProtoNumber(1) var lastRead: Long
+)

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

@@ -0,0 +1,87 @@
+package eu.kanade.tachiyomi.data.backup.full.models
+
+import eu.kanade.tachiyomi.data.database.models.ChapterImpl
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.models.MangaImpl
+import eu.kanade.tachiyomi.data.database.models.TrackImpl
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.protobuf.ProtoNumber
+
+@Serializable
+data class BackupManga(
+    // in 1.x some of these values have different names
+    @ProtoNumber(1) var source: Long,
+    // url is called key in 1.x
+    @ProtoNumber(2) var url: String,
+    @ProtoNumber(3) var title: String = "",
+    @ProtoNumber(4) var artist: String? = null,
+    @ProtoNumber(5) var author: String? = null,
+    @ProtoNumber(6) var description: String? = null,
+    @ProtoNumber(7) var genre: List<String> = emptyList(),
+    @ProtoNumber(8) var status: Int = 0,
+    // thumbnailUrl is called cover in 1.x
+    @ProtoNumber(9) var thumbnailUrl: String? = null,
+    // @ProtoNumber(10) val customCover: String = "", 1.x value, not used in 0.x
+    // @ProtoNumber(11) val lastUpdate: Long = 0, 1.x value, not used in 0.x
+    // @ProtoNumber(12) val lastInit: Long = 0, 1.x value, not used in 0.x
+    @ProtoNumber(13) var dateAdded: Long = 0,
+    @ProtoNumber(14) var viewer: Int = 0,
+    // @ProtoNumber(15) val flags: Int = 0, 1.x value, not used in 0.x
+    @ProtoNumber(16) var chapters: List<BackupChapter> = emptyList(),
+    @ProtoNumber(17) var categories: List<Int> = emptyList(),
+    @ProtoNumber(18) var tracking: List<BackupTracking> = emptyList(),
+    // Bump by 100 for values that are not saved/implemented in 1.x but are used in 0.x
+    @ProtoNumber(100) var favorite: Boolean = true,
+    @ProtoNumber(101) var chapterFlags: Int = 0,
+    @ProtoNumber(102) var history: List<BackupHistory> = emptyList(),
+) {
+    fun getMangaImpl(): MangaImpl {
+        return MangaImpl().apply {
+            url = this@BackupManga.url
+            title = this@BackupManga.title
+            artist = this@BackupManga.artist
+            author = this@BackupManga.author
+            description = this@BackupManga.description
+            genre = this@BackupManga.genre.joinToString()
+            status = this@BackupManga.status
+            thumbnail_url = this@BackupManga.thumbnailUrl
+            favorite = this@BackupManga.favorite
+            source = this@BackupManga.source
+            date_added = this@BackupManga.dateAdded
+            viewer = this@BackupManga.viewer
+            chapter_flags = this@BackupManga.chapterFlags
+        }
+    }
+
+    fun getChaptersImpl(): List<ChapterImpl> {
+        return chapters.map {
+            it.toChapterImpl()
+        }
+    }
+
+    fun getTrackingImpl(): List<TrackImpl> {
+        return tracking.map {
+            it.getTrackingImpl()
+        }
+    }
+
+    companion object {
+        fun copyFrom(manga: Manga): BackupManga {
+            return BackupManga(
+                url = manga.url,
+                title = manga.title,
+                artist = manga.artist,
+                author = manga.author,
+                description = manga.description,
+                genre = manga.getGenres() ?: emptyList(),
+                status = manga.status,
+                thumbnailUrl = manga.thumbnail_url,
+                favorite = manga.favorite,
+                source = manga.source,
+                dateAdded = manga.date_added,
+                viewer = manga.viewer,
+                chapterFlags = manga.chapter_flags
+            )
+        }
+    }
+}

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

@@ -0,0 +1,6 @@
+package eu.kanade.tachiyomi.data.backup.full.models
+
+import kotlinx.serialization.Serializer
+
+@Serializer(forClass = Backup::class)
+object BackupSerializer

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

@@ -0,0 +1,20 @@
+package eu.kanade.tachiyomi.data.backup.full.models
+
+import eu.kanade.tachiyomi.source.Source
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.protobuf.ProtoNumber
+
+@Serializable
+data class BackupSource(
+    @ProtoNumber(0) var name: String = "",
+    @ProtoNumber(1) var sourceId: Long
+) {
+    companion object {
+        fun copyFrom(source: Source): BackupSource {
+            return BackupSource(
+                name = source.name,
+                sourceId = source.id
+            )
+        }
+    }
+}

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

@@ -0,0 +1,65 @@
+package eu.kanade.tachiyomi.data.backup.full.models
+
+import eu.kanade.tachiyomi.data.database.models.Track
+import eu.kanade.tachiyomi.data.database.models.TrackImpl
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.protobuf.ProtoNumber
+
+@Serializable
+data class BackupTracking(
+    // in 1.x some of these values have different types or names
+    // syncId is called siteId in 1,x
+    @ProtoNumber(1) var syncId: Int,
+    // LibraryId is not null in 1.x
+    @ProtoNumber(2) var libraryId: Long,
+    @ProtoNumber(3) var mediaId: Int = 0,
+    // trackingUrl is called mediaUrl in 1.x
+    @ProtoNumber(4) var trackingUrl: String = "",
+    @ProtoNumber(5) var title: String = "",
+    // lastChapterRead is called last read, and it has been changed to a float in 1.x
+    @ProtoNumber(6) var lastChapterRead: Float = 0F,
+    @ProtoNumber(7) var totalChapters: Int = 0,
+    @ProtoNumber(8) var score: Float = 0F,
+    @ProtoNumber(9) var status: Int = 0,
+    // startedReadingDate is called startReadTime in 1.x
+    @ProtoNumber(10) var startedReadingDate: Long = 0,
+    // finishedReadingDate is called endReadTime in 1.x
+    @ProtoNumber(11) var finishedReadingDate: Long = 0,
+) {
+    fun getTrackingImpl(): TrackImpl {
+        return TrackImpl().apply {
+            sync_id = this@BackupTracking.syncId
+            media_id = this@BackupTracking.mediaId
+            library_id = this@BackupTracking.libraryId
+            title = this@BackupTracking.title
+            // convert from float to int because of 1.x types
+            last_chapter_read = this@BackupTracking.lastChapterRead.toInt()
+            total_chapters = this@BackupTracking.totalChapters
+            score = this@BackupTracking.score
+            status = this@BackupTracking.status
+            started_reading_date = this@BackupTracking.startedReadingDate
+            finished_reading_date = this@BackupTracking.finishedReadingDate
+            tracking_url = this@BackupTracking.trackingUrl
+        }
+    }
+
+    companion object {
+        fun copyFrom(track: Track): BackupTracking {
+            return BackupTracking(
+                syncId = track.sync_id,
+                mediaId = track.media_id,
+                // forced not null so its compatible with 1.x backup system
+                libraryId = track.library_id!!,
+                title = track.title,
+                // convert to float for 1.x
+                lastChapterRead = track.last_chapter_read.toFloat(),
+                totalChapters = track.total_chapters,
+                score = track.score,
+                status = track.status,
+                startedReadingDate = track.started_reading_date,
+                finishedReadingDate = track.finished_reading_date,
+                trackingUrl = track.tracking_url
+            )
+        }
+    }
+}

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

@@ -1,11 +1,18 @@
-package eu.kanade.tachiyomi.data.backup
+package eu.kanade.tachiyomi.data.backup.legacy
 
 import android.content.Context
-import android.content.Intent
 import android.net.Uri
-import com.github.salomonbrys.kotson.*
+import com.github.salomonbrys.kotson.fromJson
-import com.google.gson.*
+import com.github.salomonbrys.kotson.registerTypeAdapter
+import com.github.salomonbrys.kotson.registerTypeHierarchyAdapter
+import com.github.salomonbrys.kotson.set
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonArray
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
 import com.hippo.unifile.UniFile
+import eu.kanade.tachiyomi.data.backup.AbstractBackupManager
 import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CATEGORY
 import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CATEGORY_MASK
 import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CHAPTER
@@ -14,81 +21,62 @@ import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_HIST
 import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_HISTORY_MASK
 import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_TRACK
 import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_TRACK_MASK
-import eu.kanade.tachiyomi.data.backup.models.Backup
+import eu.kanade.tachiyomi.data.backup.legacy.models.Backup
-import eu.kanade.tachiyomi.data.backup.models.Backup.CATEGORIES
+import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.CATEGORIES
-import eu.kanade.tachiyomi.data.backup.models.Backup.CHAPTERS
+import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.CHAPTERS
-import eu.kanade.tachiyomi.data.backup.models.Backup.CURRENT_VERSION
+import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.CURRENT_VERSION
-import eu.kanade.tachiyomi.data.backup.models.Backup.HISTORY
+import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.EXTENSIONS
-import eu.kanade.tachiyomi.data.backup.models.Backup.MANGA
+import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.HISTORY
-import eu.kanade.tachiyomi.data.backup.models.Backup.TRACK
+import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.MANGA
-import eu.kanade.tachiyomi.data.backup.models.DHistory
+import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.TRACK
-import eu.kanade.tachiyomi.data.backup.serializer.*
+import eu.kanade.tachiyomi.data.backup.legacy.models.DHistory
-import eu.kanade.tachiyomi.data.database.DatabaseHelper
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.CategoryTypeAdapter
-import eu.kanade.tachiyomi.data.database.models.*
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.ChapterTypeAdapter
-import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.HistoryTypeAdapter
-import eu.kanade.tachiyomi.data.preference.getOrDefault
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.MangaTypeAdapter
-import eu.kanade.tachiyomi.data.track.TrackManager
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.TrackTypeAdapter
+import eu.kanade.tachiyomi.data.database.models.CategoryImpl
+import eu.kanade.tachiyomi.data.database.models.Chapter
+import eu.kanade.tachiyomi.data.database.models.ChapterImpl
+import eu.kanade.tachiyomi.data.database.models.History
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.models.MangaCategory
+import eu.kanade.tachiyomi.data.database.models.MangaImpl
+import eu.kanade.tachiyomi.data.database.models.Track
+import eu.kanade.tachiyomi.data.database.models.TrackImpl
+import eu.kanade.tachiyomi.source.LocalSource
 import eu.kanade.tachiyomi.source.Source
-import eu.kanade.tachiyomi.source.SourceManager
-import eu.kanade.tachiyomi.util.sendLocalBroadcast
-import eu.kanade.tachiyomi.util.syncChaptersWithSource
 import rx.Observable
 import timber.log.Timber
-import uy.kohesive.injekt.injectLazy
+import kotlin.math.max
 
-class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
+class LegacyBackupManager(context: Context, version: Int = CURRENT_VERSION) : AbstractBackupManager(context) {
 
-    /**
+    var parserVersion: Int = version
-     * Database.
-     */
-    internal val databaseHelper: DatabaseHelper by injectLazy()
-
-    /**
-     * Source manager.
-     */
-    internal val sourceManager: SourceManager by injectLazy()
-
-    /**
-     * Tracking manager
-     */
-    internal val trackManager: TrackManager by injectLazy()
-
-    /**
-     * Version of parser
-     */
-    var version: Int = version
         private set
 
-    /**
-     * Json Parser
-     */
     var parser: Gson = initParser()
 
-    /**
-     * Preferences
-     */
-    private val preferences: PreferencesHelper by injectLazy()
-
     /**
      * Set version of parser
      *
      * @param version version of parser
      */
     internal fun setVersion(version: Int) {
-        this.version = version
+        this.parserVersion = version
         parser = initParser()
     }
 
-    private fun initParser(): Gson = when (version) {
+    private fun initParser(): Gson = when (parserVersion) {
-        1 -> GsonBuilder().create()
+        2 ->
-        2 -> GsonBuilder()
+            GsonBuilder()
                 .registerTypeAdapter<MangaImpl>(MangaTypeAdapter.build())
                 .registerTypeHierarchyAdapter<ChapterImpl>(ChapterTypeAdapter.build())
                 .registerTypeAdapter<CategoryImpl>(CategoryTypeAdapter.build())
                 .registerTypeAdapter<DHistory>(HistoryTypeAdapter.build())
                 .registerTypeHierarchyAdapter<TrackImpl>(TrackTypeAdapter.build())
                 .create()
-        else -> throw Exception("Json version unknown")
+        else -> throw Exception("Unknown backup version")
     }
 
     /**
@@ -97,7 +85,7 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
      * @param uri path of Uri
      * @param isJob backup called from job
      */
-    fun createBackup(uri: Uri, flags: Int, isJob: Boolean) {
+    override fun createBackup(uri: Uri, flags: Int, isJob: Boolean): String? {
         // Create root object
         val root = JsonObject()
 
@@ -107,73 +95,78 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
         // Create category array
         val categoryEntries = JsonArray()
 
+        // Create extension ID/name mapping
+        val extensionEntries = JsonArray()
+
         // Add value's to root
-        root[Backup.VERSION] = Backup.CURRENT_VERSION
+        root[Backup.VERSION] = CURRENT_VERSION
         root[Backup.MANGAS] = mangaEntries
         root[CATEGORIES] = categoryEntries
+        root[EXTENSIONS] = extensionEntries
 
         databaseHelper.inTransaction {
-            // Get manga from database
             val mangas = getFavoriteManga()
 
+            val extensions: MutableSet<String> = mutableSetOf()
+
             // Backup library manga and its dependencies
             mangas.forEach { manga ->
                 mangaEntries.add(backupMangaObject(manga, flags))
+
+                // Maintain set of extensions/sources used (excludes local source)
+                if (manga.source != LocalSource.ID) {
+                    sourceManager.get(manga.source)?.let {
+                        extensions.add("${manga.source}:${it.name}")
+                    }
+                }
             }
 
             // Backup categories
             if ((flags and BACKUP_CATEGORY_MASK) == BACKUP_CATEGORY) {
                 backupCategories(categoryEntries)
             }
+
+            // Backup extension ID/name mapping
+            backupExtensionInfo(extensionEntries, extensions)
         }
 
         try {
-            // When BackupCreatorJob
+            val file: UniFile = (
-            if (isJob) {
+                if (isJob) {
-                // Get dir of file and create
+                    // Get dir of file and create
-                var dir = UniFile.fromUri(context, uri)
+                    var dir = UniFile.fromUri(context, uri)
-                dir = dir.createDirectory("automatic")
+                    dir = dir.createDirectory("automatic")
 
-                // Delete older backups
+                    // Delete older backups
-                val numberOfBackups = numberOfBackups()
+                    val numberOfBackups = numberOfBackups()
-                val backupRegex = Regex("""tachiyomi_\d+-\d+-\d+_\d+-\d+.json""")
+                    val backupRegex = Regex("""tachiyomi_\d+-\d+-\d+_\d+-\d+.json""")
-                dir.listFiles { _, filename -> backupRegex.matches(filename) }
+                    dir.listFiles { _, filename -> backupRegex.matches(filename) }
                         .orEmpty()
                         .sortedByDescending { it.name }
                         .drop(numberOfBackups - 1)
                         .forEach { it.delete() }
 
-                // Create new file to place backup
+                    // Create new file to place backup
-                val newFile = dir.createFile(Backup.getDefaultFilename())
+                    dir.createFile(Backup.getDefaultFilename())
-                        ?: throw Exception("Couldn't create backup file")
+                } else {
+                    UniFile.fromUri(context, uri)
+                }
+                )
+                ?: throw Exception("Couldn't create backup file")
 
-                newFile.openOutputStream().bufferedWriter().use {
+            file.openOutputStream().bufferedWriter().use {
-                    parser.toJson(root, it)
+                parser.toJson(root, it)
-                }
-            } else {
-                val file = UniFile.fromUri(context, uri)
-                        ?: throw Exception("Couldn't create backup file")
-                file.openOutputStream().bufferedWriter().use {
-                    parser.toJson(root, it)
-                }
-
-                // Show completed dialog
-                val intent = Intent(BackupConst.INTENT_FILTER).apply {
-                    putExtra(BackupConst.ACTION, BackupConst.ACTION_BACKUP_COMPLETED_DIALOG)
-                    putExtra(BackupConst.EXTRA_URI, file.uri.toString())
-                }
-                context.sendLocalBroadcast(intent)
             }
+            return file.uri.toString()
         } catch (e: Exception) {
             Timber.e(e)
-            if (!isJob) {
+            throw e
-                // Show error dialog
+        }
-                val intent = Intent(BackupConst.INTENT_FILTER).apply {
+    }
-                    putExtra(BackupConst.ACTION, BackupConst.ACTION_ERROR_BACKUP_DIALOG)
+
-                    putExtra(BackupConst.EXTRA_ERROR_MESSAGE, e.message)
+    private fun backupExtensionInfo(root: JsonArray, extensions: Set<String>) {
-                }
+        extensions.sorted().forEach {
-                context.sendLocalBroadcast(intent)
+            root.add(it)
-            }
         }
     }
 
@@ -204,7 +197,7 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
         if (options and BACKUP_CHAPTER_MASK == BACKUP_CHAPTER) {
             // Backup all the chapters
             val chapters = databaseHelper.getChapters(manga).executeAsBlocking()
-            if (!chapters.isEmpty()) {
+            if (chapters.isNotEmpty()) {
                 val chaptersJson = parser.toJsonTree(chapters)
                 if (chaptersJson.asJsonArray.size() > 0) {
                     entry[CHAPTERS] = chaptersJson
@@ -216,7 +209,7 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
         if (options and BACKUP_CATEGORY_MASK == BACKUP_CATEGORY) {
             // Backup categories for this manga
             val categoriesForManga = databaseHelper.getCategoriesForManga(manga).executeAsBlocking()
-            if (!categoriesForManga.isEmpty()) {
+            if (categoriesForManga.isNotEmpty()) {
                 val categoriesNames = categoriesForManga.map { it.name }
                 entry[CATEGORIES] = parser.toJsonTree(categoriesNames)
             }
@@ -225,7 +218,7 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
         // Check if user wants track information in backup
         if (options and BACKUP_TRACK_MASK == BACKUP_TRACK) {
             val tracks = databaseHelper.getTracks(manga).executeAsBlocking()
-            if (!tracks.isEmpty()) {
+            if (tracks.isNotEmpty()) {
                 entry[TRACK] = parser.toJsonTree(tracks)
             }
         }
@@ -233,7 +226,7 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
         // Check if user wants history information in backup
         if (options and BACKUP_HISTORY_MASK == BACKUP_HISTORY) {
             val historyForManga = databaseHelper.getHistoryByMangaId(manga.id!!).executeAsBlocking()
-            if (!historyForManga.isEmpty()) {
+            if (historyForManga.isNotEmpty()) {
                 val historyData = historyForManga.mapNotNull { history ->
                     val url = databaseHelper.getChapter(history.chapter_id).executeAsBlocking()?.url
                     url?.let { DHistory(url, history.last_read) }
@@ -264,31 +257,13 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
      */
     fun restoreMangaFetchObservable(source: Source, manga: Manga): Observable<Manga> {
         return source.fetchMangaDetails(manga)
-                .map { networkManga ->
+            .map { networkManga ->
-                    manga.copyFrom(networkManga)
+                manga.copyFrom(networkManga)
-                    manga.favorite = true
+                manga.favorite = true
-                    manga.initialized = true
+                manga.initialized = true
-                    manga.id = insertManga(manga)
+                manga.id = insertManga(manga)
-                    manga
+                manga
-                }
+            }
-    }
-
-    /**
-     * [Observable] that fetches chapter information
-     *
-     * @param source source of manga
-     * @param manga manga that needs updating
-     * @return [Observable] that contains manga
-     */
-    fun restoreChapterFetchObservable(source: Source, manga: Manga, chapters: List<Chapter>): Observable<Pair<List<Chapter>, List<Chapter>>> {
-        return source.fetchChapterList(manga)
-                .map { syncChaptersWithSource(databaseHelper, it, manga, source) }
-                .doOnNext {
-                    if (it.first.isNotEmpty()) {
-                        chapters.forEach { it.manga_id = manga.id }
-                        insertChapters(chapters)
-                    }
-                }
     }
 
     /**
@@ -308,7 +283,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
@@ -333,10 +308,10 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
      */
     internal fun restoreCategoriesForManga(manga: Manga, categories: List<String>) {
         val dbCategories = databaseHelper.getCategories().executeAsBlocking()
-        val mangaCategoriesToUpdate = ArrayList<MangaCategory>()
+        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
                 }
@@ -344,10 +319,8 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
         }
 
         // Update database
-        if (!mangaCategoriesToUpdate.isEmpty()) {
+        if (mangaCategoriesToUpdate.isNotEmpty()) {
-            val mangaAsList = ArrayList<Manga>()
+            databaseHelper.deleteOldMangasCategories(listOf(manga)).executeAsBlocking()
-            mangaAsList.add(manga)
-            databaseHelper.deleteOldMangasCategories(mangaAsList).executeAsBlocking()
             databaseHelper.insertMangasCategories(mangaCategoriesToUpdate).executeAsBlocking()
         }
     }
@@ -359,13 +332,13 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
      */
     internal fun restoreHistoryForManga(history: List<DHistory>) {
         // List containing history to be updated
-        val historyToBeUpdated = ArrayList<History>()
+        val historyToBeUpdated = mutableListOf<History>()
         for ((url, lastRead) in history) {
             val dbHistory = databaseHelper.getHistoryByChapterUrl(url).executeAsBlocking()
             // Check if history already in database and update
             if (dbHistory != null) {
                 dbHistory.apply {
-                    last_read = Math.max(lastRead, dbHistory.last_read)
+                    last_read = max(lastRead, dbHistory.last_read)
                 }
                 historyToBeUpdated.add(dbHistory)
             } else {
@@ -393,9 +366,9 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
 
         // Get tracks from database
         val dbTracks = databaseHelper.getTracks(manga).executeAsBlocking()
-        val trackToUpdate = ArrayList<Track>()
+        val trackToUpdate = mutableListOf<Track>()
 
-        for (track in tracks) {
+        tracks.forEach { track ->
             val service = trackManager.getService(track.sync_id)
             if (service != null && service.isLogged) {
                 var isInDatabase = false
@@ -408,7 +381,7 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
                         if (track.library_id != dbTrack.library_id) {
                             dbTrack.library_id = track.library_id
                         }
-                        dbTrack.last_chapter_read = Math.max(dbTrack.last_chapter_read, track.last_chapter_read)
+                        dbTrack.last_chapter_read = max(dbTrack.last_chapter_read, track.last_chapter_read)
                         isInDatabase = true
                         trackToUpdate.add(dbTrack)
                         break
@@ -422,7 +395,7 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
             }
         }
         // Update database
-        if (!trackToUpdate.isEmpty()) {
+        if (trackToUpdate.isNotEmpty()) {
             databaseHelper.insertTracks(trackToUpdate).executeAsBlocking()
         }
     }
@@ -438,8 +411,9 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
         val dbChapters = databaseHelper.getChapters(manga).executeAsBlocking()
 
         // Return if fetch is needed
-        if (dbChapters.isEmpty() || dbChapters.size < chapters.size)
+        if (dbChapters.isEmpty() || dbChapters.size < chapters.size) {
             return false
+        }
 
         for (chapter in chapters) {
             val pos = dbChapters.indexOf(chapter)
@@ -454,45 +428,7 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
         chapters.filter { it.id != null }
         chapters.map { it.manga_id = manga.id }
 
-        insertChapters(chapters)
+        updateChapters(chapters)
         return true
     }
-
-    /**
-     * Returns manga
-     *
-     * @return [Manga], null if not found
-     */
-    internal fun getMangaFromDatabase(manga: Manga): Manga? =
-            databaseHelper.getManga(manga.url, manga.source).executeAsBlocking()
-
-    /**
-     * Returns list containing manga from library
-     *
-     * @return [Manga] from library
-     */
-    internal fun getFavoriteManga(): List<Manga> =
-            databaseHelper.getFavoriteMangas().executeAsBlocking()
-
-    /**
-     * Inserts manga and returns id
-     *
-     * @return id of [Manga], null if not found
-     */
-    internal fun insertManga(manga: Manga): Long? =
-            databaseHelper.insertManga(manga).executeAsBlocking().insertedId()
-
-    /**
-     * Inserts list of chapters
-     */
-    private fun insertChapters(chapters: List<Chapter>) {
-        databaseHelper.updateChaptersBackup(chapters).executeAsBlocking()
-    }
-
-    /**
-     * Return number of backups.
-     *
-     * @return number of backups selected by user
-     */
-    fun numberOfBackups(): Int = preferences.numberOfBackups().getOrDefault()
 }

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

@@ -0,0 +1,209 @@
+package eu.kanade.tachiyomi.data.backup.legacy
+
+import android.content.Context
+import android.net.Uri
+import com.github.salomonbrys.kotson.fromJson
+import com.google.gson.JsonArray
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import com.google.gson.JsonParser
+import com.google.gson.stream.JsonReader
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.backup.AbstractBackupRestore
+import eu.kanade.tachiyomi.data.backup.BackupNotifier
+import eu.kanade.tachiyomi.data.backup.legacy.models.Backup
+import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.MANGAS
+import eu.kanade.tachiyomi.data.backup.legacy.models.DHistory
+import eu.kanade.tachiyomi.data.database.models.Chapter
+import eu.kanade.tachiyomi.data.database.models.ChapterImpl
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.models.MangaImpl
+import eu.kanade.tachiyomi.data.database.models.Track
+import eu.kanade.tachiyomi.data.database.models.TrackImpl
+import eu.kanade.tachiyomi.source.Source
+import rx.Observable
+import java.util.Date
+
+class LegacyBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBackupRestore<LegacyBackupManager>(context, notifier) {
+
+    override fun performRestore(uri: Uri): Boolean {
+        val reader = JsonReader(context.contentResolver.openInputStream(uri)!!.bufferedReader())
+        val json = JsonParser.parseReader(reader).asJsonObject
+
+        val version = json.get(Backup.VERSION)?.asInt ?: 1
+        backupManager = LegacyBackupManager(context, version)
+
+        val mangasJson = json.get(MANGAS).asJsonArray
+        restoreAmount = mangasJson.size() + 1 // +1 for categories
+
+        // Restore categories
+        json.get(Backup.CATEGORIES)?.let { restoreCategories(it) }
+
+        // Store source mapping for error messages
+        sourceMapping = LegacyBackupRestoreValidator.getSourceMapping(json)
+
+        // Restore individual manga
+        mangasJson.forEach {
+            if (job?.isActive != true) {
+                return false
+            }
+
+            restoreManga(it.asJsonObject)
+        }
+
+        return true
+    }
+
+    private fun restoreCategories(categoriesJson: JsonElement) {
+        db.inTransaction {
+            backupManager.restoreCategories(categoriesJson.asJsonArray)
+        }
+
+        restoreProgress += 1
+        showRestoreProgress(restoreProgress, restoreAmount, context.getString(R.string.categories))
+    }
+
+    private fun restoreManga(mangaJson: JsonObject) {
+        val manga = backupManager.parser.fromJson<MangaImpl>(
+            mangaJson.get(
+                Backup.MANGA
+            )
+        )
+        val chapters = backupManager.parser.fromJson<List<ChapterImpl>>(
+            mangaJson.get(Backup.CHAPTERS)
+                ?: JsonArray()
+        )
+        val categories = backupManager.parser.fromJson<List<String>>(
+            mangaJson.get(Backup.CATEGORIES)
+                ?: JsonArray()
+        )
+        val history = backupManager.parser.fromJson<List<DHistory>>(
+            mangaJson.get(Backup.HISTORY)
+                ?: JsonArray()
+        )
+        val tracks = backupManager.parser.fromJson<List<TrackImpl>>(
+            mangaJson.get(Backup.TRACK)
+                ?: JsonArray()
+        )
+
+        try {
+            val source = backupManager.sourceManager.get(manga.source)
+            if (source != null) {
+                restoreMangaData(manga, source, chapters, categories, history, tracks)
+            } else {
+                val sourceName = sourceMapping[manga.source] ?: manga.source.toString()
+                errors.add(Date() to "${manga.title} - ${context.getString(R.string.source_not_found_name, sourceName)}")
+            }
+        } catch (e: Exception) {
+            errors.add(Date() to "${manga.title} - ${e.message}")
+        }
+
+        restoreProgress += 1
+        showRestoreProgress(restoreProgress, restoreAmount, manga.title)
+    }
+
+    /**
+     * Returns a manga restore observable
+     *
+     * @param manga manga data from json
+     * @param source source to get manga data from
+     * @param chapters chapters data from json
+     * @param categories categories data from json
+     * @param history history data from json
+     * @param tracks tracking data from json
+     */
+    private fun restoreMangaData(
+        manga: Manga,
+        source: Source,
+        chapters: List<Chapter>,
+        categories: List<String>,
+        history: List<DHistory>,
+        tracks: List<Track>
+    ) {
+        val dbManga = backupManager.getMangaFromDatabase(manga)
+
+        db.inTransaction {
+            if (dbManga == null) {
+                // Manga not in database
+                restoreMangaFetch(source, manga, chapters, categories, history, tracks)
+            } else { // Manga in database
+                // Copy information from manga already in database
+                backupManager.restoreMangaNoFetch(manga, dbManga)
+                // Fetch rest of manga information
+                restoreMangaNoFetch(source, manga, chapters, categories, history, tracks)
+            }
+        }
+    }
+
+    /**
+     * [Observable] that fetches manga information
+     *
+     * @param manga manga that needs updating
+     * @param chapters chapters of manga that needs updating
+     * @param categories categories that need updating
+     */
+    private fun restoreMangaFetch(
+        source: Source,
+        manga: Manga,
+        chapters: List<Chapter>,
+        categories: List<String>,
+        history: List<DHistory>,
+        tracks: List<Track>
+    ) {
+        backupManager.restoreMangaFetchObservable(source, manga)
+            .onErrorReturn {
+                errors.add(Date() to "${manga.title} - ${it.message}")
+                manga
+            }
+            .filter { it.id != null }
+            .flatMap {
+                chapterFetchObservable(source, it, chapters)
+                    // Convert to the manga that contains new chapters.
+                    .map { manga }
+            }
+            .doOnNext {
+                restoreExtraForManga(it, categories, history, tracks)
+            }
+            .flatMap {
+                trackingFetchObservable(it, tracks)
+            }
+            .subscribe()
+    }
+
+    private fun restoreMangaNoFetch(
+        source: Source,
+        backupManga: Manga,
+        chapters: List<Chapter>,
+        categories: List<String>,
+        history: List<DHistory>,
+        tracks: List<Track>
+    ) {
+        Observable.just(backupManga)
+            .flatMap { manga ->
+                if (!backupManager.restoreChaptersForManga(manga, chapters)) {
+                    chapterFetchObservable(source, manga, chapters)
+                        .map { manga }
+                } else {
+                    Observable.just(manga)
+                }
+            }
+            .doOnNext {
+                restoreExtraForManga(it, categories, history, tracks)
+            }
+            .flatMap { manga ->
+                trackingFetchObservable(manga, tracks)
+            }
+            .subscribe()
+    }
+
+    private fun restoreExtraForManga(manga: Manga, categories: List<String>, history: List<DHistory>, tracks: List<Track>) {
+        // Restore categories
+        backupManager.restoreCategoriesForManga(manga, categories)
+
+        // Restore history
+        backupManager.restoreHistoryForManga(history)
+
+        // Restore tracking
+        backupManager.restoreTrackForManga(manga, tracks)
+    }
+}

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

@@ -0,0 +1,66 @@
+package eu.kanade.tachiyomi.data.backup.legacy
+
+import android.content.Context
+import android.net.Uri
+import com.google.gson.JsonObject
+import com.google.gson.JsonParser
+import com.google.gson.stream.JsonReader
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.backup.AbstractBackupRestoreValidator
+import eu.kanade.tachiyomi.data.backup.legacy.models.Backup
+
+class LegacyBackupRestoreValidator : AbstractBackupRestoreValidator() {
+    /**
+     * Checks for critical backup file data.
+     *
+     * @throws Exception if version or manga cannot be found.
+     * @return List of missing sources or missing trackers.
+     */
+    override fun validate(context: Context, uri: Uri): Results {
+        val reader = JsonReader(context.contentResolver.openInputStream(uri)!!.bufferedReader())
+        val json = JsonParser.parseReader(reader).asJsonObject
+
+        val version = json.get(Backup.VERSION)
+        val mangasJson = json.get(Backup.MANGAS)
+        if (version == null || mangasJson == null) {
+            throw Exception(context.getString(R.string.invalid_backup_file_missing_data))
+        }
+
+        val mangas = mangasJson.asJsonArray
+        if (mangas.size() == 0) {
+            throw Exception(context.getString(R.string.invalid_backup_file_missing_manga))
+        }
+
+        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)
+    }
+
+    companion object {
+        fun getSourceMapping(json: JsonObject): Map<Long, String> {
+            val extensionsMapping = json.get(Backup.EXTENSIONS) ?: return emptyMap()
+
+            return extensionsMapping.asJsonArray
+                .map {
+                    val items = it.asString.split(":")
+                    items[0].toLong() to items[1]
+                }
+                .toMap()
+        }
+    }
+}

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

@@ -1,7 +1,8 @@
-package eu.kanade.tachiyomi.data.backup.models
+package eu.kanade.tachiyomi.data.backup.legacy.models
 
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Date
+import java.util.Locale
 
 /**
  * Json values
@@ -13,6 +14,7 @@ object Backup {
     const val TRACK = "track"
     const val CHAPTERS = "chapters"
     const val CATEGORIES = "categories"
+    const val EXTENSIONS = "extensions"
     const val HISTORY = "history"
     const val VERSION = "version"
 

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

@@ -0,0 +1,3 @@
+package eu.kanade.tachiyomi.data.backup.legacy.models
+
+data class DHistory(val url: String, val lastRead: Long)

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

@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.data.backup.serializer
+package eu.kanade.tachiyomi.data.backup.legacy.serializer
 
 import com.github.salomonbrys.kotson.typeAdapter
 import com.google.gson.TypeAdapter

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

@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.data.backup.serializer
+package eu.kanade.tachiyomi.data.backup.legacy.serializer
 
 import com.github.salomonbrys.kotson.typeAdapter
 import com.google.gson.TypeAdapter
@@ -43,9 +43,7 @@ object ChapterTypeAdapter {
                 beginObject()
                 while (hasNext()) {
                     if (peek() == JsonToken.NAME) {
-                        val name = nextName()
+                        when (nextName()) {
-
-                        when (name) {
                             URL -> chapter.url = nextString()
                             READ -> chapter.read = nextInt() == 1
                             BOOKMARK -> chapter.bookmark = nextInt() == 1

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

@@ -1,8 +1,8 @@
-package eu.kanade.tachiyomi.data.backup.serializer
+package eu.kanade.tachiyomi.data.backup.legacy.serializer
 
 import com.github.salomonbrys.kotson.typeAdapter
 import com.google.gson.TypeAdapter
-import eu.kanade.tachiyomi.data.backup.models.DHistory
+import eu.kanade.tachiyomi.data.backup.legacy.models.DHistory
 
 /**
  * JSON Serializer used to write / read [DHistory] to / from json

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

@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.data.backup.serializer
+package eu.kanade.tachiyomi.data.backup.legacy.serializer
 
 import com.github.salomonbrys.kotson.typeAdapter
 import com.google.gson.TypeAdapter

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

@@ -1,6 +1,5 @@
-package eu.kanade.tachiyomi.data.backup.serializer
+package eu.kanade.tachiyomi.data.backup.legacy.serializer
 
-import android.telecom.DisconnectCause.REMOTE
 import com.github.salomonbrys.kotson.typeAdapter
 import com.google.gson.TypeAdapter
 import com.google.gson.stream.JsonToken
@@ -42,9 +41,7 @@ object TrackTypeAdapter {
                 beginObject()
                 while (hasNext()) {
                     if (peek() == JsonToken.NAME) {
-                        val name = nextName()
+                        when (nextName()) {
-
-                        when (name) {
                             TITLE -> track.title = nextString()
                             SYNC -> track.sync_id = nextInt()
                             MEDIA -> track.media_id = nextInt()

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

@@ -1,3 +0,0 @@
-package eu.kanade.tachiyomi.data.backup.models
-
-data class DHistory(val url: String,val lastRead: Long)

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

@@ -7,10 +7,11 @@ import com.google.gson.Gson
 import com.jakewharton.disklrucache.DiskLruCache
 import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.source.model.Page
-import eu.kanade.tachiyomi.util.DiskUtil
+import eu.kanade.tachiyomi.util.storage.DiskUtil
-import eu.kanade.tachiyomi.util.saveTo
+import eu.kanade.tachiyomi.util.storage.saveTo
 import okhttp3.Response
-import okio.Okio
+import okio.buffer
+import okio.sink
 import rx.Observable
 import uy.kohesive.injekt.injectLazy
 import java.io.File
@@ -38,17 +39,19 @@ class ChapterCache(private val context: Context) {
         const val PARAMETER_VALUE_COUNT = 1
 
         /** The maximum number of bytes this cache should use to store.  */
-        const val PARAMETER_CACHE_SIZE = 75L * 1024 * 1024
+        const val PARAMETER_CACHE_SIZE = 100L * 1024 * 1024
     }
 
     /** Google Json class used for parsing JSON files.  */
     private val gson: Gson by injectLazy()
 
     /** Cache class used for cache management.  */
-    private val diskCache = DiskLruCache.open(File(context.cacheDir, PARAMETER_CACHE_DIRECTORY),
+    private val diskCache = DiskLruCache.open(
-            PARAMETER_APP_VERSION,
+        File(context.cacheDir, PARAMETER_CACHE_DIRECTORY),
-            PARAMETER_VALUE_COUNT,
+        PARAMETER_APP_VERSION,
-            PARAMETER_CACHE_SIZE)
+        PARAMETER_VALUE_COUNT,
+        PARAMETER_CACHE_SIZE
+    )
 
     /**
      * Returns directory of cache.
@@ -76,16 +79,17 @@ class ChapterCache(private val context: Context) {
      */
     fun removeFileFromCache(file: String): Boolean {
         // Make sure we don't delete the journal file (keeps track of cache).
-        if (file == "journal" || file.startsWith("journal."))
+        if (file == "journal" || file.startsWith("journal.")) {
             return false
+        }
 
-        try {
+        return try {
             // Remove the extension from the file to get the key of the cache
             val key = file.substringBeforeLast(".")
             // Remove file from cache.
-            return diskCache.remove(key)
+            diskCache.remove(key)
         } catch (e: Exception) {
-            return false
+            false
         }
     }
 
@@ -126,7 +130,7 @@ class ChapterCache(private val context: Context) {
             editor = diskCache.edit(key) ?: return
 
             // Write chapter urls to cache.
-            Okio.buffer(Okio.sink(editor.newOutputStream(0))).use {
+            editor.newOutputStream(0).sink().buffer().use {
                 it.write(cachedValue.toByteArray())
                 it.flush()
             }
@@ -134,7 +138,6 @@ class ChapterCache(private val context: Context) {
             diskCache.flush()
             editor.commit()
             editor.abortUnlessCommitted()
-
         } catch (e: Exception) {
             // Ignore.
         } finally {
@@ -149,10 +152,10 @@ class ChapterCache(private val context: Context) {
      * @return true if in cache otherwise false.
      */
     fun isImageInCache(imageUrl: String): Boolean {
-        try {
+        return try {
-            return diskCache.get(DiskUtil.hashKeyForDisk(imageUrl)) != null
+            diskCache.get(DiskUtil.hashKeyForDisk(imageUrl)) != null
         } catch (e: IOException) {
-            return false
+            false
         }
     }
 
@@ -186,12 +189,12 @@ class ChapterCache(private val context: Context) {
             editor = diskCache.edit(key) ?: throw IOException("Unable to edit key")
 
             // Get OutputStream and write image with Okio.
-            response.body()!!.source().saveTo(editor.newOutputStream(0))
+            response.body!!.source().saveTo(editor.newOutputStream(0))
 
             diskCache.flush()
             editor.commit()
         } finally {
-            response.body()?.close()
+            response.body?.close()
             editor?.abortUnlessCommitted()
         }
     }
@@ -200,4 +203,3 @@ class ChapterCache(private val context: Context) {
         return "${chapter.manga_id}${chapter.url}"
     }
 }
-

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

@@ -1,7 +1,8 @@
 package eu.kanade.tachiyomi.data.cache
 
 import android.content.Context
-import eu.kanade.tachiyomi.util.DiskUtil
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.util.storage.DiskUtil
 import java.io.File
 import java.io.IOException
 import java.io.InputStream
@@ -17,51 +18,89 @@ import java.io.InputStream
  */
 class CoverCache(private val context: Context) {
 
+    companion object {
+        private const val COVERS_DIR = "covers"
+        private const val CUSTOM_COVERS_DIR = "covers/custom"
+    }
+
     /**
      * Cache directory used for cache management.
      */
-    private val cacheDir = context.getExternalFilesDir("covers") ?:
+    private val cacheDir = getCacheDir(COVERS_DIR)
-            File(context.filesDir, "covers").also { it.mkdirs() }
+
+    private val customCoverCacheDir = getCacheDir(CUSTOM_COVERS_DIR)
 
     /**
      * Returns the cover from cache.
      *
-     * @param thumbnailUrl the thumbnail url.
+     * @param manga the manga.
      * @return cover image.
      */
-    fun getCoverFile(thumbnailUrl: String): File {
+    fun getCoverFile(manga: Manga): File? {
-        return File(cacheDir, DiskUtil.hashKeyForDisk(thumbnailUrl))
+        return manga.thumbnail_url?.let {
+            File(cacheDir, DiskUtil.hashKeyForDisk(it))
+        }
     }
 
     /**
-     * Copy the given stream to this cache.
+     * Returns the custom cover from cache.
      *
-     * @param thumbnailUrl url of the thumbnail.
+     * @param manga the manga.
-     * @param inputStream  the stream to copy.
+     * @return cover image.
+     */
+    fun getCustomCoverFile(manga: Manga): File {
+        return File(customCoverCacheDir, DiskUtil.hashKeyForDisk(manga.id.toString()))
+    }
+
+    /**
+     * Saves the given stream as the manga's custom cover to cache.
+     *
+     * @param manga the manga.
+     * @param inputStream the stream to copy.
      * @throws IOException if there's any error.
      */
     @Throws(IOException::class)
-    fun copyToCache(thumbnailUrl: String, inputStream: InputStream) {
+    fun setCustomCoverToCache(manga: Manga, inputStream: InputStream) {
-        // Get destination file.
+        getCustomCoverFile(manga).outputStream().use {
-        val destFile = getCoverFile(thumbnailUrl)
+            inputStream.copyTo(it)
-
+        }
-        destFile.outputStream().use { inputStream.copyTo(it) }
     }
 
     /**
-     * Delete the cover file from the cache.
+     * Delete the cover files of the manga from the cache.
      *
-     * @param thumbnailUrl the thumbnail url.
+     * @param manga the manga.
-     * @return status of deletion.
+     * @param deleteCustomCover whether the custom cover should be deleted.
+     * @return number of files that were deleted.
      */
-    fun deleteFromCache(thumbnailUrl: String?): Boolean {
+    fun deleteFromCache(manga: Manga, deleteCustomCover: Boolean = false): Int {
-        // Check if url is empty.
+        var deleted = 0
-        if (thumbnailUrl.isNullOrEmpty())
-            return false
 
-        // Remove file.
+        getCoverFile(manga)?.let {
-        val file = getCoverFile(thumbnailUrl!!)
+            if (it.exists() && it.delete()) ++deleted
-        return file.exists() && file.delete()
+        }
+
+        if (deleteCustomCover) {
+            if (deleteCustomCover(manga)) ++deleted
+        }
+
+        return deleted
     }
 
+    /**
+     * Delete custom cover of the manga from the cache
+     *
+     * @param manga the manga.
+     * @return whether the cover was deleted.
+     */
+    fun deleteCustomCover(manga: Manga): Boolean {
+        return getCustomCoverFile(manga).let {
+            it.exists() && it.delete()
+        }
+    }
+
+    private fun getCacheDir(dir: String): File {
+        return context.getExternalFilesDir(dir)
+            ?: File(context.filesDir, dir).also { it.mkdirs() }
+    }
 }

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

@@ -1,18 +1,33 @@
 package eu.kanade.tachiyomi.data.database
 
-import android.arch.persistence.db.SupportSQLiteOpenHelper
 import android.content.Context
+import androidx.sqlite.db.SupportSQLiteOpenHelper
 import com.pushtorefresh.storio.sqlite.impl.DefaultStorIOSQLite
-import eu.kanade.tachiyomi.data.database.mappers.*
+import eu.kanade.tachiyomi.data.database.mappers.CategoryTypeMapping
-import eu.kanade.tachiyomi.data.database.models.*
+import eu.kanade.tachiyomi.data.database.mappers.ChapterTypeMapping
-import eu.kanade.tachiyomi.data.database.queries.*
+import eu.kanade.tachiyomi.data.database.mappers.HistoryTypeMapping
+import eu.kanade.tachiyomi.data.database.mappers.MangaCategoryTypeMapping
+import eu.kanade.tachiyomi.data.database.mappers.MangaTypeMapping
+import eu.kanade.tachiyomi.data.database.mappers.TrackTypeMapping
+import eu.kanade.tachiyomi.data.database.models.Category
+import eu.kanade.tachiyomi.data.database.models.Chapter
+import eu.kanade.tachiyomi.data.database.models.History
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.models.MangaCategory
+import eu.kanade.tachiyomi.data.database.models.Track
+import eu.kanade.tachiyomi.data.database.queries.CategoryQueries
+import eu.kanade.tachiyomi.data.database.queries.ChapterQueries
+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 io.requery.android.database.sqlite.RequerySQLiteOpenHelperFactory
 
 /**
  * This class provides operations to manage the database through its interfaces.
  */
-open class DatabaseHelper(context: Context)
+open class DatabaseHelper(context: Context) :
-: MangaQueries, ChapterQueries, TrackQueries, CategoryQueries, MangaCategoryQueries, HistoryQueries {
+    MangaQueries, ChapterQueries, TrackQueries, CategoryQueries, MangaCategoryQueries, HistoryQueries {
 
     private val configuration = SupportSQLiteOpenHelper.Configuration.builder(context)
         .name(DbOpenCallback.DATABASE_NAME)
@@ -20,17 +35,14 @@ open class DatabaseHelper(context: Context)
         .build()
 
     override val db = DefaultStorIOSQLite.builder()
-            .sqliteOpenHelper(RequerySQLiteOpenHelperFactory().create(configuration))
+        .sqliteOpenHelper(RequerySQLiteOpenHelperFactory().create(configuration))
-            .addTypeMapping(Manga::class.java, MangaTypeMapping())
+        .addTypeMapping(Manga::class.java, MangaTypeMapping())
-            .addTypeMapping(Chapter::class.java, ChapterTypeMapping())
+        .addTypeMapping(Chapter::class.java, ChapterTypeMapping())
-            .addTypeMapping(Track::class.java, TrackTypeMapping())
+        .addTypeMapping(Track::class.java, TrackTypeMapping())
-            .addTypeMapping(Category::class.java, CategoryTypeMapping())
+        .addTypeMapping(Category::class.java, CategoryTypeMapping())
-            .addTypeMapping(MangaCategory::class.java, MangaCategoryTypeMapping())
+        .addTypeMapping(MangaCategory::class.java, MangaCategoryTypeMapping())
-            .addTypeMapping(History::class.java, HistoryTypeMapping())
+        .addTypeMapping(History::class.java, HistoryTypeMapping())
-            .build()
+        .build()
 
     inline fun inTransaction(block: () -> Unit) = db.inTransaction(block)
-
-    fun lowLevel() = db.lowLevel()
-
 }

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

@@ -22,4 +22,3 @@ inline fun <T> StorIOSQLite.inTransactionReturn(block: () -> T): T {
         lowLevel().endTransaction()
     }
 }
-

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

@@ -1,11 +1,13 @@
 package eu.kanade.tachiyomi.data.database
 
-import android.arch.persistence.db.SupportSQLiteDatabase
+import androidx.sqlite.db.SupportSQLiteDatabase
-import android.arch.persistence.db.SupportSQLiteOpenHelper
+import androidx.sqlite.db.SupportSQLiteOpenHelper
-import android.content.Context
+import eu.kanade.tachiyomi.data.database.tables.CategoryTable
-import android.database.sqlite.SQLiteDatabase
+import eu.kanade.tachiyomi.data.database.tables.ChapterTable
-import android.database.sqlite.SQLiteOpenHelper
+import eu.kanade.tachiyomi.data.database.tables.HistoryTable
-import eu.kanade.tachiyomi.data.database.tables.*
+import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable
+import eu.kanade.tachiyomi.data.database.tables.MangaTable
+import eu.kanade.tachiyomi.data.database.tables.TrackTable
 
 class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
 
@@ -18,7 +20,7 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
         /**
          * Version of the database.
          */
-        const val DATABASE_VERSION = 8
+        const val DATABASE_VERSION = 11
     }
 
     override fun onCreate(db: SupportSQLiteDatabase) = with(db) {
@@ -42,8 +44,10 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
             db.execSQL(ChapterTable.sourceOrderUpdateQuery)
 
             // Fix kissmanga covers after supporting cloudflare
-            db.execSQL("""UPDATE mangas SET thumbnail_url =
+            db.execSQL(
-                    REPLACE(thumbnail_url, '93.174.95.110', 'kissmanga.com') WHERE source = 4""")
+                """UPDATE mangas SET thumbnail_url =
+                    REPLACE(thumbnail_url, '93.174.95.110', 'kissmanga.com') WHERE source = 4"""
+            )
         }
         if (oldVersion < 3) {
             // Initialize history tables
@@ -67,10 +71,20 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
             db.execSQL(MangaTable.createLibraryIndexQuery)
             db.execSQL(ChapterTable.createUnreadChaptersIndexQuery)
         }
+        if (oldVersion < 9) {
+            db.execSQL(TrackTable.addStartDate)
+            db.execSQL(TrackTable.addFinishDate)
+        }
+        if (oldVersion < 10) {
+            db.execSQL(MangaTable.addCoverLastModified)
+        }
+        if (oldVersion < 11) {
+            db.execSQL(MangaTable.addDateAdded)
+            db.execSQL(MangaTable.backfillDateAdded)
+        }
     }
 
     override fun onConfigure(db: SupportSQLiteDatabase) {
         db.setForeignKeyConstraintsEnabled(true)
     }
-
 }

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

@@ -5,5 +5,4 @@ import com.pushtorefresh.storio.sqlite.impl.DefaultStorIOSQLite
 interface DbProvider {
 
     val db: DefaultStorIOSQLite
-
 }

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

@@ -18,22 +18,22 @@ import eu.kanade.tachiyomi.data.database.tables.CategoryTable.COL_ORDER
 import eu.kanade.tachiyomi.data.database.tables.CategoryTable.TABLE
 
 class CategoryTypeMapping : SQLiteTypeMapping<Category>(
-        CategoryPutResolver(),
+    CategoryPutResolver(),
-        CategoryGetResolver(),
+    CategoryGetResolver(),
-        CategoryDeleteResolver()
+    CategoryDeleteResolver()
 )
 
 class CategoryPutResolver : DefaultPutResolver<Category>() {
 
     override fun mapToInsertQuery(obj: Category) = InsertQuery.builder()
-            .table(TABLE)
+        .table(TABLE)
-            .build()
+        .build()
 
     override fun mapToUpdateQuery(obj: Category) = UpdateQuery.builder()
-            .table(TABLE)
+        .table(TABLE)
-            .where("$COL_ID = ?")
+        .where("$COL_ID = ?")
-            .whereArgs(obj.id)
+        .whereArgs(obj.id)
-            .build()
+        .build()
 
     override fun mapToContentValues(obj: Category) = ContentValues(4).apply {
         put(COL_ID, obj.id)
@@ -56,8 +56,8 @@ class CategoryGetResolver : DefaultGetResolver<Category>() {
 class CategoryDeleteResolver : DefaultDeleteResolver<Category>() {
 
     override fun mapToDeleteQuery(obj: Category) = DeleteQuery.builder()
-            .table(TABLE)
+        .table(TABLE)
-            .where("$COL_ID = ?")
+        .where("$COL_ID = ?")
-            .whereArgs(obj.id)
+        .whereArgs(obj.id)
-            .build()
+        .build()
 }

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

@@ -26,22 +26,22 @@ import eu.kanade.tachiyomi.data.database.tables.ChapterTable.COL_URL
 import eu.kanade.tachiyomi.data.database.tables.ChapterTable.TABLE
 
 class ChapterTypeMapping : SQLiteTypeMapping<Chapter>(
-        ChapterPutResolver(),
+    ChapterPutResolver(),
-        ChapterGetResolver(),
+    ChapterGetResolver(),
-        ChapterDeleteResolver()
+    ChapterDeleteResolver()
 )
 
 class ChapterPutResolver : DefaultPutResolver<Chapter>() {
 
     override fun mapToInsertQuery(obj: Chapter) = InsertQuery.builder()
-            .table(TABLE)
+        .table(TABLE)
-            .build()
+        .build()
 
     override fun mapToUpdateQuery(obj: Chapter) = UpdateQuery.builder()
-            .table(TABLE)
+        .table(TABLE)
-            .where("$COL_ID = ?")
+        .where("$COL_ID = ?")
-            .whereArgs(obj.id)
+        .whereArgs(obj.id)
-            .build()
+        .build()
 
     override fun mapToContentValues(obj: Chapter) = ContentValues(11).apply {
         put(COL_ID, obj.id)
@@ -80,9 +80,8 @@ class ChapterGetResolver : DefaultGetResolver<Chapter>() {
 class ChapterDeleteResolver : DefaultDeleteResolver<Chapter>() {
 
     override fun mapToDeleteQuery(obj: Chapter) = DeleteQuery.builder()
-            .table(TABLE)
+        .table(TABLE)
-            .where("$COL_ID = ?")
+        .where("$COL_ID = ?")
-            .whereArgs(obj.id)
+        .whereArgs(obj.id)
-            .build()
+        .build()
 }
-

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

@@ -18,22 +18,22 @@ import eu.kanade.tachiyomi.data.database.tables.HistoryTable.COL_TIME_READ
 import eu.kanade.tachiyomi.data.database.tables.HistoryTable.TABLE
 
 class HistoryTypeMapping : SQLiteTypeMapping<History>(
-        HistoryPutResolver(),
+    HistoryPutResolver(),
-        HistoryGetResolver(),
+    HistoryGetResolver(),
-        HistoryDeleteResolver()
+    HistoryDeleteResolver()
 )
 
 open class HistoryPutResolver : DefaultPutResolver<History>() {
 
     override fun mapToInsertQuery(obj: History) = InsertQuery.builder()
-            .table(TABLE)
+        .table(TABLE)
-            .build()
+        .build()
 
     override fun mapToUpdateQuery(obj: History) = UpdateQuery.builder()
-            .table(TABLE)
+        .table(TABLE)
-            .where("$COL_ID = ?")
+        .where("$COL_ID = ?")
-            .whereArgs(obj.id)
+        .whereArgs(obj.id)
-            .build()
+        .build()
 
     override fun mapToContentValues(obj: History) = ContentValues(4).apply {
         put(COL_ID, obj.id)
@@ -56,8 +56,8 @@ class HistoryGetResolver : DefaultGetResolver<History>() {
 class HistoryDeleteResolver : DefaultDeleteResolver<History>() {
 
     override fun mapToDeleteQuery(obj: History) = DeleteQuery.builder()
-            .table(TABLE)
+        .table(TABLE)
-            .where("$COL_ID = ?")
+        .where("$COL_ID = ?")
-            .whereArgs(obj.id)
+        .whereArgs(obj.id)
-            .build()
+        .build()
 }

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

@@ -16,22 +16,22 @@ import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable.COL_MANGA_ID
 import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable.TABLE
 
 class MangaCategoryTypeMapping : SQLiteTypeMapping<MangaCategory>(
-        MangaCategoryPutResolver(),
+    MangaCategoryPutResolver(),
-        MangaCategoryGetResolver(),
+    MangaCategoryGetResolver(),
-        MangaCategoryDeleteResolver()
+    MangaCategoryDeleteResolver()
 )
 
 class MangaCategoryPutResolver : DefaultPutResolver<MangaCategory>() {
 
     override fun mapToInsertQuery(obj: MangaCategory) = InsertQuery.builder()
-            .table(TABLE)
+        .table(TABLE)
-            .build()
+        .build()
 
     override fun mapToUpdateQuery(obj: MangaCategory) = UpdateQuery.builder()
-            .table(TABLE)
+        .table(TABLE)
-            .where("$COL_ID = ?")
+        .where("$COL_ID = ?")
-            .whereArgs(obj.id)
+        .whereArgs(obj.id)
-            .build()
+        .build()
 
     override fun mapToContentValues(obj: MangaCategory) = ContentValues(3).apply {
         put(COL_ID, obj.id)
@@ -52,8 +52,8 @@ class MangaCategoryGetResolver : DefaultGetResolver<MangaCategory>() {
 class MangaCategoryDeleteResolver : DefaultDeleteResolver<MangaCategory>() {
 
     override fun mapToDeleteQuery(obj: MangaCategory) = DeleteQuery.builder()
-            .table(TABLE)
+        .table(TABLE)
-            .where("$COL_ID = ?")
+        .where("$COL_ID = ?")
-            .whereArgs(obj.id)
+        .whereArgs(obj.id)
-            .build()
+        .build()
 }

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

@@ -14,6 +14,8 @@ import eu.kanade.tachiyomi.data.database.models.MangaImpl
 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
@@ -29,24 +31,24 @@ import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_VIEWER
 import eu.kanade.tachiyomi.data.database.tables.MangaTable.TABLE
 
 class MangaTypeMapping : SQLiteTypeMapping<Manga>(
-        MangaPutResolver(),
+    MangaPutResolver(),
-        MangaGetResolver(),
+    MangaGetResolver(),
-        MangaDeleteResolver()
+    MangaDeleteResolver()
 )
 
 class MangaPutResolver : DefaultPutResolver<Manga>() {
 
     override fun mapToInsertQuery(obj: Manga) = InsertQuery.builder()
-            .table(TABLE)
+        .table(TABLE)
-            .build()
+        .build()
 
     override fun mapToUpdateQuery(obj: Manga) = UpdateQuery.builder()
-            .table(TABLE)
+        .table(TABLE)
-            .where("$COL_ID = ?")
+        .where("$COL_ID = ?")
-            .whereArgs(obj.id)
+        .whereArgs(obj.id)
-            .build()
+        .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)
@@ -62,6 +64,8 @@ class MangaPutResolver : DefaultPutResolver<Manga>() {
         put(COL_INITIALIZED, obj.initialized)
         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)
     }
 }
 
@@ -82,6 +86,8 @@ interface BaseMangaGetResolver {
         initialized = cursor.getInt(cursor.getColumnIndex(COL_INITIALIZED)) == 1
         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))
     }
 }
 
@@ -95,8 +101,8 @@ open class MangaGetResolver : DefaultGetResolver<Manga>(), BaseMangaGetResolver
 class MangaDeleteResolver : DefaultDeleteResolver<Manga>() {
 
     override fun mapToDeleteQuery(obj: Manga) = DeleteQuery.builder()
-            .table(TABLE)
+        .table(TABLE)
-            .where("$COL_ID = ?")
+        .where("$COL_ID = ?")
-            .whereArgs(obj.id)
+        .whereArgs(obj.id)
-            .build()
+        .build()
 }

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

@@ -11,12 +11,14 @@ import com.pushtorefresh.storio.sqlite.queries.InsertQuery
 import com.pushtorefresh.storio.sqlite.queries.UpdateQuery
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.database.models.TrackImpl
+import eu.kanade.tachiyomi.data.database.tables.TrackTable.COL_FINISH_DATE
 import eu.kanade.tachiyomi.data.database.tables.TrackTable.COL_ID
 import eu.kanade.tachiyomi.data.database.tables.TrackTable.COL_LAST_CHAPTER_READ
 import eu.kanade.tachiyomi.data.database.tables.TrackTable.COL_LIBRARY_ID
 import eu.kanade.tachiyomi.data.database.tables.TrackTable.COL_MANGA_ID
 import eu.kanade.tachiyomi.data.database.tables.TrackTable.COL_MEDIA_ID
 import eu.kanade.tachiyomi.data.database.tables.TrackTable.COL_SCORE
+import eu.kanade.tachiyomi.data.database.tables.TrackTable.COL_START_DATE
 import eu.kanade.tachiyomi.data.database.tables.TrackTable.COL_STATUS
 import eu.kanade.tachiyomi.data.database.tables.TrackTable.COL_SYNC_ID
 import eu.kanade.tachiyomi.data.database.tables.TrackTable.COL_TITLE
@@ -25,22 +27,22 @@ import eu.kanade.tachiyomi.data.database.tables.TrackTable.COL_TRACKING_URL
 import eu.kanade.tachiyomi.data.database.tables.TrackTable.TABLE
 
 class TrackTypeMapping : SQLiteTypeMapping<Track>(
-        TrackPutResolver(),
+    TrackPutResolver(),
-        TrackGetResolver(),
+    TrackGetResolver(),
-        TrackDeleteResolver()
+    TrackDeleteResolver()
 )
 
 class TrackPutResolver : DefaultPutResolver<Track>() {
 
     override fun mapToInsertQuery(obj: Track) = InsertQuery.builder()
-            .table(TABLE)
+        .table(TABLE)
-            .build()
+        .build()
 
     override fun mapToUpdateQuery(obj: Track) = UpdateQuery.builder()
-            .table(TABLE)
+        .table(TABLE)
-            .where("$COL_ID = ?")
+        .where("$COL_ID = ?")
-            .whereArgs(obj.id)
+        .whereArgs(obj.id)
-            .build()
+        .build()
 
     override fun mapToContentValues(obj: Track) = ContentValues(10).apply {
         put(COL_ID, obj.id)
@@ -54,7 +56,8 @@ class TrackPutResolver : DefaultPutResolver<Track>() {
         put(COL_STATUS, obj.status)
         put(COL_TRACKING_URL, obj.tracking_url)
         put(COL_SCORE, obj.score)
-
+        put(COL_START_DATE, obj.started_reading_date)
+        put(COL_FINISH_DATE, obj.finished_reading_date)
     }
 }
 
@@ -72,14 +75,16 @@ class TrackGetResolver : DefaultGetResolver<Track>() {
         status = cursor.getInt(cursor.getColumnIndex(COL_STATUS))
         score = cursor.getFloat(cursor.getColumnIndex(COL_SCORE))
         tracking_url = cursor.getString(cursor.getColumnIndex(COL_TRACKING_URL))
+        started_reading_date = cursor.getLong(cursor.getColumnIndex(COL_START_DATE))
+        finished_reading_date = cursor.getLong(cursor.getColumnIndex(COL_FINISH_DATE))
     }
 }
 
 class TrackDeleteResolver : DefaultDeleteResolver<Track>() {
 
     override fun mapToDeleteQuery(obj: Track) = DeleteQuery.builder()
-            .table(TABLE)
+        .table(TABLE)
-            .where("$COL_ID = ?")
+        .where("$COL_ID = ?")
-            .whereArgs(obj.id)
+        .whereArgs(obj.id)
-            .build()
+        .build()
 }

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

@@ -12,9 +12,6 @@ interface Category : Serializable {
 
     var flags: Int
 
-    val nameLower: String
-        get() = name.toLowerCase()
-
     companion object {
 
         fun create(name: String): Category = CategoryImpl().apply {
@@ -23,5 +20,4 @@ interface Category : Serializable {
 
         fun createDefault(): Category = create("Default").apply { id = 0 }
     }
-
 }

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

@@ -15,12 +15,10 @@ class CategoryImpl : Category {
         if (other == null || javaClass != other.javaClass) return false
 
         val category = other as Category
-
         return name == category.name
     }
 
     override fun hashCode(): Int {
         return name.hashCode()
     }
-
 }

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

@@ -31,11 +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()
     }
-
 }

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

@@ -35,7 +35,7 @@ interface History : Serializable {
          * @param chapter chapter object
          * @return history object
          */
-        fun create(chapter: Chapter): History =  HistoryImpl().apply {
+        fun create(chapter: Chapter): History = HistoryImpl().apply {
             this.chapter_id = chapter.id!!
         }
     }

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

@@ -5,5 +5,4 @@ class LibraryManga : MangaImpl() {
     var unread: Int = 0
 
     var category: Int = 0
-
 }

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

@@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi.data.database.models
 
 import eu.kanade.tachiyomi.source.model.SManga
+import tachiyomi.source.model.MangaInfo
 
 interface Manga : SManga {
 
@@ -12,22 +13,30 @@ interface Manga : SManga {
 
     var last_update: Long
 
+    var date_added: Long
+
     var viewer: Int
 
     var chapter_flags: Int
 
+    var cover_last_modified: Long
+
     fun setChapterOrder(order: Int) {
         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
     }
 
+    fun getGenres(): List<String>? {
+        return genre?.split(", ")?.map { it.trim() }
+    }
+
+    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
@@ -72,7 +81,8 @@ interface Manga : SManga {
 
         const val SORTING_SOURCE = 0x00000000
         const val SORTING_NUMBER = 0x00000100
-        const val SORTING_MASK = 0x00000100
+        const val SORTING_UPLOAD_DATE = 0x00000200
+        const val SORTING_MASK = 0x00000300
 
         const val DISPLAY_NAME = 0x00000000
         const val DISPLAY_NUMBER = 0x00100000
@@ -88,5 +98,17 @@ interface Manga : SManga {
             this.source = source
         }
     }
-
+}
+
+fun Manga.toMangaInfo(): MangaInfo {
+    return MangaInfo(
+        artist = this.artist ?: "",
+        author = this.author ?: "",
+        cover = this.thumbnail_url ?: "",
+        description = this.description ?: "",
+        genres = this.getGenres() ?: emptyList(),
+        key = this.url,
+        status = this.status,
+        title = this.title
+    )
 }

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

@@ -17,5 +17,4 @@ class MangaCategory {
             return mc
         }
     }
-
 }

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

@@ -5,6 +5,6 @@ package eu.kanade.tachiyomi.data.database.models
  *
  * @param manga object containing manga
  * @param chapter object containing chater
- * @param history      object containing history
+ * @param history object containing history
  */
 data class MangaChapterHistory(val manga: Manga, val chapter: Chapter, val history: History)

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

@@ -26,24 +26,26 @@ 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
 
     override var chapter_flags: Int = 0
 
+    override var cover_last_modified: Long = 0
+
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (other == null || javaClass != other.javaClass) return false
 
         val manga = other as Manga
-
+        if (url != manga.url) return false
-        return url == manga.url
+        return id == manga.id
-
     }
 
     override fun hashCode(): Int {
-        return url.hashCode()
+        return url.hashCode() + id.hashCode()
     }
-
 }

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

@@ -24,12 +24,18 @@ interface Track : Serializable {
 
     var status: Int
 
+    var started_reading_date: Long
+
+    var finished_reading_date: Long
+
     var tracking_url: String
 
     fun copyPersonalFrom(other: Track) {
         last_chapter_read = other.last_chapter_read
         score = other.score
         status = other.status
+        started_reading_date = other.started_reading_date
+        finished_reading_date = other.finished_reading_date
     }
 
     companion object {
@@ -37,5 +43,4 @@ interface Track : Serializable {
             sync_id = serviceId
         }
     }
-
 }

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

@@ -22,6 +22,10 @@ class TrackImpl : Track {
 
     override var status: Int = 0
 
+    override var started_reading_date: Long = 0
+
+    override var finished_reading_date: Long = 0
+
     override var tracking_url: String = ""
 
     override fun equals(other: Any?): Boolean {
@@ -41,5 +45,4 @@ class TrackImpl : Track {
         result = 31 * result + media_id
         return result
     }
-
 }

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

@@ -10,20 +10,24 @@ import eu.kanade.tachiyomi.data.database.tables.CategoryTable
 interface CategoryQueries : DbProvider {
 
     fun getCategories() = db.get()
-            .listOfObjects(Category::class.java)
+        .listOfObjects(Category::class.java)
-            .withQuery(Query.builder()
+        .withQuery(
-                    .table(CategoryTable.TABLE)
+            Query.builder()
-                    .orderBy(CategoryTable.COL_ORDER)
+                .table(CategoryTable.TABLE)
-                    .build())
+                .orderBy(CategoryTable.COL_ORDER)
-            .prepare()
+                .build()
+        )
+        .prepare()
 
     fun getCategoriesForManga(manga: Manga) = db.get()
-            .listOfObjects(Category::class.java)
+        .listOfObjects(Category::class.java)
-            .withQuery(RawQuery.builder()
+        .withQuery(
-                    .query(getCategoriesForMangaQuery())
+            RawQuery.builder()
-                    .args(manga.id)
+                .query(getCategoriesForMangaQuery())
-                    .build())
+                .args(manga.id)
-            .prepare()
+                .build()
+        )
+        .prepare()
 
     fun insertCategory(category: Category) = db.put().`object`(category).prepare()
 
@@ -32,5 +36,4 @@ interface CategoryQueries : DbProvider {
     fun deleteCategory(category: Category) = db.delete().`object`(category).prepare()
 
     fun deleteCategories(categories: List<Category>) = db.delete().objects(categories).prepare()
-
 }

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

@@ -11,47 +11,65 @@ import eu.kanade.tachiyomi.data.database.resolvers.ChapterProgressPutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.ChapterSourceOrderPutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.MangaChapterGetResolver
 import eu.kanade.tachiyomi.data.database.tables.ChapterTable
-import java.util.*
+import java.util.Date
 
 interface ChapterQueries : DbProvider {
 
     fun getChapters(manga: Manga) = db.get()
-            .listOfObjects(Chapter::class.java)
+        .listOfObjects(Chapter::class.java)
-            .withQuery(Query.builder()
+        .withQuery(
-                    .table(ChapterTable.TABLE)
+            Query.builder()
-                    .where("${ChapterTable.COL_MANGA_ID} = ?")
+                .table(ChapterTable.TABLE)
-                    .whereArgs(manga.id)
+                .where("${ChapterTable.COL_MANGA_ID} = ?")
-                    .build())
+                .whereArgs(manga.id)
-            .prepare()
+                .build()
+        )
+        .prepare()
 
     fun getRecentChapters(date: Date) = db.get()
-            .listOfObjects(MangaChapter::class.java)
+        .listOfObjects(MangaChapter::class.java)
-            .withQuery(RawQuery.builder()
+        .withQuery(
-                    .query(getRecentsQuery())
+            RawQuery.builder()
-                    .args(date.time)
+                .query(getRecentsQuery())
-                    .observesTables(ChapterTable.TABLE)
+                .args(date.time)
-                    .build())
+                .observesTables(ChapterTable.TABLE)
-            .withGetResolver(MangaChapterGetResolver.INSTANCE)
+                .build()
-            .prepare()
+        )
+        .withGetResolver(MangaChapterGetResolver.INSTANCE)
+        .prepare()
 
     fun getChapter(id: Long) = db.get()
-            .`object`(Chapter::class.java)
+        .`object`(Chapter::class.java)
-            .withQuery(Query.builder()
+        .withQuery(
-                    .table(ChapterTable.TABLE)
+            Query.builder()
-                    .where("${ChapterTable.COL_ID} = ?")
+                .table(ChapterTable.TABLE)
-                    .whereArgs(id)
+                .where("${ChapterTable.COL_ID} = ?")
-                    .build())
+                .whereArgs(id)
-            .prepare()
+                .build()
+        )
+        .prepare()
 
     fun getChapter(url: String) = db.get()
-            .`object`(Chapter::class.java)
+        .`object`(Chapter::class.java)
-            .withQuery(Query.builder()
+        .withQuery(
-                    .table(ChapterTable.TABLE)
+            Query.builder()
-                    .where("${ChapterTable.COL_URL} = ?")
+                .table(ChapterTable.TABLE)
-                    .whereArgs(url)
+                .where("${ChapterTable.COL_URL} = ?")
-                    .build())
+                .whereArgs(url)
-            .prepare()
+                .build()
+        )
+        .prepare()
 
+    fun getChapter(url: String, mangaId: Long) = db.get()
+        .`object`(Chapter::class.java)
+        .withQuery(
+            Query.builder()
+                .table(ChapterTable.TABLE)
+                .where("${ChapterTable.COL_URL} = ? AND ${ChapterTable.COL_MANGA_ID} = ?")
+                .whereArgs(url, mangaId)
+                .build()
+        )
+        .prepare()
 
     fun insertChapter(chapter: Chapter) = db.put().`object`(chapter).prepare()
 
@@ -62,23 +80,22 @@ interface ChapterQueries : DbProvider {
     fun deleteChapters(chapters: List<Chapter>) = db.delete().objects(chapters).prepare()
 
     fun updateChaptersBackup(chapters: List<Chapter>) = db.put()
-            .objects(chapters)
+        .objects(chapters)
-            .withPutResolver(ChapterBackupPutResolver())
+        .withPutResolver(ChapterBackupPutResolver())
-            .prepare()
+        .prepare()
 
     fun updateChapterProgress(chapter: Chapter) = db.put()
-            .`object`(chapter)
+        .`object`(chapter)
-            .withPutResolver(ChapterProgressPutResolver())
+        .withPutResolver(ChapterProgressPutResolver())
-            .prepare()
+        .prepare()
 
     fun updateChaptersProgress(chapters: List<Chapter>) = db.put()
-            .objects(chapters)
+        .objects(chapters)
-            .withPutResolver(ChapterProgressPutResolver())
+        .withPutResolver(ChapterProgressPutResolver())
-            .prepare()
+        .prepare()
 
     fun fixChaptersSourceOrder(chapters: List<Chapter>) = db.put()
-            .objects(chapters)
+        .objects(chapters)
-            .withPutResolver(ChapterSourceOrderPutResolver())
+        .withPutResolver(ChapterSourceOrderPutResolver())
-            .prepare()
+        .prepare()
-
 }

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

@@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.data.database.models.MangaChapterHistory
 import eu.kanade.tachiyomi.data.database.resolvers.HistoryLastReadPutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.MangaChapterHistoryGetResolver
 import eu.kanade.tachiyomi.data.database.tables.HistoryTable
-import java.util.*
+import java.util.Date
 
 interface HistoryQueries : DbProvider {
 
@@ -21,34 +21,43 @@ interface HistoryQueries : DbProvider {
     /**
      * Returns history of recent manga containing last read chapter
      * @param date recent date range
+     * @param limit the limit of manga to grab
+     * @param offset offset the db by
+     * @param search what to search in the db history
      */
-    fun getRecentManga(date: Date) = db.get()
+    fun getRecentManga(date: Date, limit: Int = 25, offset: Int = 0, search: String = "") = db.get()
-            .listOfObjects(MangaChapterHistory::class.java)
+        .listOfObjects(MangaChapterHistory::class.java)
-            .withQuery(RawQuery.builder()
+        .withQuery(
-                    .query(getRecentMangasQuery())
+            RawQuery.builder()
-                    .args(date.time)
+                .query(getRecentMangasQuery(search))
-                    .observesTables(HistoryTable.TABLE)
+                .args(date.time, limit, offset)
-                    .build())
+                .observesTables(HistoryTable.TABLE)
-            .withGetResolver(MangaChapterHistoryGetResolver.INSTANCE)
+                .build()
-            .prepare()
+        )
+        .withGetResolver(MangaChapterHistoryGetResolver.INSTANCE)
+        .prepare()
 
     fun getHistoryByMangaId(mangaId: Long) = db.get()
-            .listOfObjects(History::class.java)
+        .listOfObjects(History::class.java)
-            .withQuery(RawQuery.builder()
+        .withQuery(
-                    .query(getHistoryByMangaId())
+            RawQuery.builder()
-                    .args(mangaId)
+                .query(getHistoryByMangaId())
-                    .observesTables(HistoryTable.TABLE)
+                .args(mangaId)
-                    .build())
+                .observesTables(HistoryTable.TABLE)
-            .prepare()
+                .build()
+        )
+        .prepare()
 
     fun getHistoryByChapterUrl(chapterUrl: String) = db.get()
-            .`object`(History::class.java)
+        .`object`(History::class.java)
-            .withQuery(RawQuery.builder()
+        .withQuery(
-                    .query(getHistoryByChapterUrl())
+            RawQuery.builder()
-                    .args(chapterUrl)
+                .query(getHistoryByChapterUrl())
-                    .observesTables(HistoryTable.TABLE)
+                .args(chapterUrl)
-                    .build())
+                .observesTables(HistoryTable.TABLE)
-            .prepare()
+                .build()
+        )
+        .prepare()
 
     /**
      * Updates the history last read.
@@ -56,9 +65,9 @@ interface HistoryQueries : DbProvider {
      * @param history history object
      */
     fun updateHistoryLastRead(history: History) = db.put()
-            .`object`(history)
+        .`object`(history)
-            .withPutResolver(HistoryLastReadPutResolver())
+        .withPutResolver(HistoryLastReadPutResolver())
-            .prepare()
+        .prepare()
 
     /**
      * Updates the history last read.
@@ -66,21 +75,25 @@ interface HistoryQueries : DbProvider {
      * @param historyList history object list
      */
     fun updateHistoryLastRead(historyList: List<History>) = db.put()
-            .objects(historyList)
+        .objects(historyList)
-            .withPutResolver(HistoryLastReadPutResolver())
+        .withPutResolver(HistoryLastReadPutResolver())
-            .prepare()
+        .prepare()
 
     fun deleteHistory() = db.delete()
-            .byQuery(DeleteQuery.builder()
+        .byQuery(
-                    .table(HistoryTable.TABLE)
+            DeleteQuery.builder()
-                    .build())
+                .table(HistoryTable.TABLE)
-            .prepare()
+                .build()
+        )
+        .prepare()
 
     fun deleteHistoryNoLastRead() = db.delete()
-            .byQuery(DeleteQuery.builder()
+        .byQuery(
-                    .table(HistoryTable.TABLE)
+            DeleteQuery.builder()
-                    .where("${HistoryTable.COL_LAST_READ} = ?")
+                .table(HistoryTable.TABLE)
-                    .whereArgs(0)
+                .where("${HistoryTable.COL_LAST_READ} = ?")
-                    .build())
+                .whereArgs(0)
-            .prepare()
+                .build()
+        )
+        .prepare()
 }

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

@@ -15,12 +15,14 @@ interface MangaCategoryQueries : DbProvider {
     fun insertMangasCategories(mangasCategories: List<MangaCategory>) = db.put().objects(mangasCategories).prepare()
 
     fun deleteOldMangasCategories(mangas: List<Manga>) = db.delete()
-            .byQuery(DeleteQuery.builder()
+        .byQuery(
-                    .table(MangaCategoryTable.TABLE)
+            DeleteQuery.builder()
-                    .where("${MangaCategoryTable.COL_MANGA_ID} IN (${Queries.placeholders(mangas.size)})")
+                .table(MangaCategoryTable.TABLE)
-                    .whereArgs(*mangas.map { it.id }.toTypedArray())
+                .where("${MangaCategoryTable.COL_MANGA_ID} IN (${Queries.placeholders(mangas.size)})")
-                    .build())
+                .whereArgs(*mangas.map { it.id }.toTypedArray())
-            .prepare()
+                .build()
+        )
+        .prepare()
 
     fun setMangaCategories(mangasCategories: List<MangaCategory>, mangas: List<Manga>) {
         db.inTransaction {
@@ -28,5 +30,4 @@ interface MangaCategoryQueries : DbProvider {
             insertMangasCategories(mangasCategories).executeAsBlocking()
         }
     }
-
 }

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

@@ -6,7 +6,13 @@ import com.pushtorefresh.storio.sqlite.queries.RawQuery
 import eu.kanade.tachiyomi.data.database.DbProvider
 import eu.kanade.tachiyomi.data.database.models.LibraryManga
 import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.database.resolvers.*
+import eu.kanade.tachiyomi.data.database.resolvers.LibraryMangaGetResolver
+import eu.kanade.tachiyomi.data.database.resolvers.MangaCoverLastModifiedPutResolver
+import eu.kanade.tachiyomi.data.database.resolvers.MangaFavoritePutResolver
+import eu.kanade.tachiyomi.data.database.resolvers.MangaFlagsPutResolver
+import eu.kanade.tachiyomi.data.database.resolvers.MangaLastUpdatedPutResolver
+import eu.kanade.tachiyomi.data.database.resolvers.MangaTitlePutResolver
+import eu.kanade.tachiyomi.data.database.resolvers.MangaViewerPutResolver
 import eu.kanade.tachiyomi.data.database.tables.CategoryTable
 import eu.kanade.tachiyomi.data.database.tables.ChapterTable
 import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable
@@ -15,99 +21,147 @@ import eu.kanade.tachiyomi.data.database.tables.MangaTable
 interface MangaQueries : DbProvider {
 
     fun getMangas() = db.get()
-            .listOfObjects(Manga::class.java)
+        .listOfObjects(Manga::class.java)
-            .withQuery(Query.builder()
+        .withQuery(
-                    .table(MangaTable.TABLE)
+            Query.builder()
-                    .build())
+                .table(MangaTable.TABLE)
-            .prepare()
+                .build()
+        )
+        .prepare()
 
     fun getLibraryMangas() = db.get()
-            .listOfObjects(LibraryManga::class.java)
+        .listOfObjects(LibraryManga::class.java)
-            .withQuery(RawQuery.builder()
+        .withQuery(
-                    .query(libraryQuery)
+            RawQuery.builder()
-                    .observesTables(MangaTable.TABLE, ChapterTable.TABLE, MangaCategoryTable.TABLE, CategoryTable.TABLE)
+                .query(libraryQuery)
-                    .build())
+                .observesTables(MangaTable.TABLE, ChapterTable.TABLE, MangaCategoryTable.TABLE, CategoryTable.TABLE)
-            .withGetResolver(LibraryMangaGetResolver.INSTANCE)
+                .build()
-            .prepare()
+        )
+        .withGetResolver(LibraryMangaGetResolver.INSTANCE)
+        .prepare()
 
     fun getFavoriteMangas() = db.get()
-            .listOfObjects(Manga::class.java)
+        .listOfObjects(Manga::class.java)
-            .withQuery(Query.builder()
+        .withQuery(
-                    .table(MangaTable.TABLE)
+            Query.builder()
-                    .where("${MangaTable.COL_FAVORITE} = ?")
+                .table(MangaTable.TABLE)
-                    .whereArgs(1)
+                .where("${MangaTable.COL_FAVORITE} = ?")
-                    .orderBy(MangaTable.COL_TITLE)
+                .whereArgs(1)
-                    .build())
+                .orderBy(MangaTable.COL_TITLE)
-            .prepare()
+                .build()
+        )
+        .prepare()
 
     fun getManga(url: String, sourceId: Long) = db.get()
-            .`object`(Manga::class.java)
+        .`object`(Manga::class.java)
-            .withQuery(Query.builder()
+        .withQuery(
-                    .table(MangaTable.TABLE)
+            Query.builder()
-                    .where("${MangaTable.COL_URL} = ? AND ${MangaTable.COL_SOURCE} = ?")
+                .table(MangaTable.TABLE)
-                    .whereArgs(url, sourceId)
+                .where("${MangaTable.COL_URL} = ? AND ${MangaTable.COL_SOURCE} = ?")
-                    .build())
+                .whereArgs(url, sourceId)
-            .prepare()
+                .build()
+        )
+        .prepare()
 
     fun getManga(id: Long) = db.get()
-            .`object`(Manga::class.java)
+        .`object`(Manga::class.java)
-            .withQuery(Query.builder()
+        .withQuery(
-                    .table(MangaTable.TABLE)
+            Query.builder()
-                    .where("${MangaTable.COL_ID} = ?")
+                .table(MangaTable.TABLE)
-                    .whereArgs(id)
+                .where("${MangaTable.COL_ID} = ?")
-                    .build())
+                .whereArgs(id)
-            .prepare()
+                .build()
+        )
+        .prepare()
 
     fun insertManga(manga: Manga) = db.put().`object`(manga).prepare()
 
     fun insertMangas(mangas: List<Manga>) = db.put().objects(mangas).prepare()
 
     fun updateFlags(manga: Manga) = db.put()
-            .`object`(manga)
+        .`object`(manga)
-            .withPutResolver(MangaFlagsPutResolver())
+        .withPutResolver(MangaFlagsPutResolver())
-            .prepare()
+        .prepare()
+
+    fun updateFlags(mangas: List<Manga>) = db.put()
+        .objects(mangas)
+        .withPutResolver(MangaFlagsPutResolver(true))
+        .prepare()
 
     fun updateLastUpdated(manga: Manga) = db.put()
-            .`object`(manga)
+        .`object`(manga)
-            .withPutResolver(MangaLastUpdatedPutResolver())
+        .withPutResolver(MangaLastUpdatedPutResolver())
-            .prepare()
+        .prepare()
 
     fun updateMangaFavorite(manga: Manga) = db.put()
-            .`object`(manga)
+        .`object`(manga)
-            .withPutResolver(MangaFavoritePutResolver())
+        .withPutResolver(MangaFavoritePutResolver())
-            .prepare()
+        .prepare()
 
     fun updateMangaViewer(manga: Manga) = db.put()
-            .`object`(manga)
+        .`object`(manga)
-            .withPutResolver(MangaViewerPutResolver())
+        .withPutResolver(MangaViewerPutResolver())
-            .prepare()
+        .prepare()
+
+    fun updateMangaTitle(manga: Manga) = db.put()
+        .`object`(manga)
+        .withPutResolver(MangaTitlePutResolver())
+        .prepare()
+
+    fun updateMangaCoverLastModified(manga: Manga) = db.put()
+        .`object`(manga)
+        .withPutResolver(MangaCoverLastModifiedPutResolver())
+        .prepare()
 
     fun deleteManga(manga: Manga) = db.delete().`object`(manga).prepare()
 
     fun deleteMangas(mangas: List<Manga>) = db.delete().objects(mangas).prepare()
 
     fun deleteMangasNotInLibrary() = db.delete()
-            .byQuery(DeleteQuery.builder()
+        .byQuery(
-                    .table(MangaTable.TABLE)
+            DeleteQuery.builder()
-                    .where("${MangaTable.COL_FAVORITE} = ?")
+                .table(MangaTable.TABLE)
-                    .whereArgs(0)
+                .where("${MangaTable.COL_FAVORITE} = ?")
-                    .build())
+                .whereArgs(0)
-            .prepare()
+                .build()
+        )
+        .prepare()
 
     fun deleteMangas() = db.delete()
-            .byQuery(DeleteQuery.builder()
+        .byQuery(
-                    .table(MangaTable.TABLE)
+            DeleteQuery.builder()
-                    .build())
+                .table(MangaTable.TABLE)
-            .prepare()
+                .build()
+        )
+        .prepare()
 
     fun getLastReadManga() = db.get()
-            .listOfObjects(Manga::class.java)
+        .listOfObjects(Manga::class.java)
-            .withQuery(RawQuery.builder()
+        .withQuery(
-                    .query(getLastReadMangaQuery())
+            RawQuery.builder()
-                    .observesTables(MangaTable.TABLE)
+                .query(getLastReadMangaQuery())
-                    .build())
+                .observesTables(MangaTable.TABLE)
-            .prepare()
+                .build()
+        )
+        .prepare()
 
-    fun getTotalChapterManga() = db.get().listOfObjects(Manga::class.java)
+    fun getTotalChapterManga() = db.get()
-            .withQuery(RawQuery.builder().query(getTotalChapterMangaQuery()).observesTables(MangaTable.TABLE).build()).prepare();
+        .listOfObjects(Manga::class.java)
+        .withQuery(
+            RawQuery.builder()
+                .query(getTotalChapterMangaQuery())
+                .observesTables(MangaTable.TABLE)
+                .build()
+        )
+        .prepare()
+
+    fun getLatestChapterManga() = db.get()
+        .listOfObjects(Manga::class.java)
+        .withQuery(
+            RawQuery.builder()
+                .query(getLatestChapterMangaQuery())
+                .observesTables(MangaTable.TABLE)
+                .build()
+        )
+        .prepare()
 }

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

@@ -9,7 +9,8 @@ import eu.kanade.tachiyomi.data.database.tables.MangaTable as Manga
 /**
  * Query to get the manga from the library, with their categories and unread count.
  */
-val libraryQuery = """
+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}
@@ -33,10 +34,13 @@ val libraryQuery = """
 /**
  * Query to get the recent chapters of manga from the library up to a date.
  */
-fun getRecentsQuery() = """
+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
 """
 
@@ -45,9 +49,9 @@ fun getRecentsQuery() = """
  * The max_last_read table contains the most recent chapters grouped by manga
  * The select statement returns all information of chapters that have the same id as the chapter in max_last_read
  * and are read after the given time period
- * @return return limit is 25
  */
-fun getRecentMangasQuery() = """
+fun getRecentMangasQuery(search: String = "") =
+    """
     SELECT ${Manga.TABLE}.${Manga.COL_URL} as mangaUrl, ${Manga.TABLE}.*, ${Chapter.TABLE}.*, ${History.TABLE}.*
     FROM ${Manga.TABLE}
     JOIN ${Chapter.TABLE}
@@ -60,12 +64,15 @@ fun getRecentMangasQuery() = """
     ON ${Chapter.TABLE}.${Chapter.COL_ID} = ${History.TABLE}.${History.COL_CHAPTER_ID}
     GROUP BY ${Chapter.TABLE}.${Chapter.COL_MANGA_ID}) AS max_last_read
     ON ${Chapter.TABLE}.${Chapter.COL_MANGA_ID} = max_last_read.${Chapter.COL_MANGA_ID}
-    WHERE ${History.TABLE}.${History.COL_LAST_READ} > ? AND max_last_read.${History.COL_CHAPTER_ID} = ${History.TABLE}.${History.COL_CHAPTER_ID}
+    WHERE ${History.TABLE}.${History.COL_LAST_READ} > ?
+    AND max_last_read.${History.COL_CHAPTER_ID} = ${History.TABLE}.${History.COL_CHAPTER_ID}
+    AND lower(${Manga.TABLE}.${Manga.COL_TITLE}) LIKE '%$search%'
     ORDER BY max_last_read.${History.COL_LAST_READ} DESC
-    LIMIT 25
+    LIMIT ? OFFSET ?
 """
 
-fun getHistoryByMangaId() = """
+fun getHistoryByMangaId() =
+    """
     SELECT ${History.TABLE}.*
     FROM ${History.TABLE}
     JOIN ${Chapter.TABLE}
@@ -73,7 +80,8 @@ fun getHistoryByMangaId() = """
     WHERE ${Chapter.TABLE}.${Chapter.COL_MANGA_ID} = ? AND ${History.TABLE}.${History.COL_CHAPTER_ID} = ${Chapter.TABLE}.${Chapter.COL_ID}
 """
 
-fun getHistoryByChapterUrl() = """
+fun getHistoryByChapterUrl() =
+    """
     SELECT ${History.TABLE}.*
     FROM ${History.TABLE}
     JOIN ${Chapter.TABLE}
@@ -81,7 +89,8 @@ fun getHistoryByChapterUrl() = """
     WHERE ${Chapter.TABLE}.${Chapter.COL_URL} = ? AND ${History.TABLE}.${History.COL_CHAPTER_ID} = ${Chapter.TABLE}.${Chapter.COL_ID}
 """
 
-fun getLastReadMangaQuery() = """
+fun getLastReadMangaQuery() =
+    """
     SELECT ${Manga.TABLE}.*, MAX(${History.TABLE}.${History.COL_LAST_READ}) AS max
     FROM ${Manga.TABLE}
     JOIN ${Chapter.TABLE}
@@ -93,7 +102,8 @@ fun getLastReadMangaQuery() = """
     ORDER BY max DESC
 """
 
-fun getTotalChapterMangaQuery()= """
+fun getTotalChapterMangaQuery() =
+    """
     SELECT ${Manga.TABLE}.*
     FROM ${Manga.TABLE}
     JOIN ${Chapter.TABLE}
@@ -102,10 +112,21 @@ fun getTotalChapterMangaQuery()= """
     ORDER by COUNT(*)
 """
 
+fun getLatestChapterMangaQuery() =
+    """
+    SELECT ${Manga.TABLE}.*, MAX(${Chapter.TABLE}.${Chapter.COL_DATE_UPLOAD}) AS max
+    FROM ${Manga.TABLE}
+    JOIN ${Chapter.TABLE}
+    ON ${Manga.TABLE}.${Manga.COL_ID} = ${Chapter.TABLE}.${Chapter.COL_MANGA_ID}
+    GROUP BY ${Manga.TABLE}.${Manga.COL_ID}
+    ORDER by max DESC
+"""
+
 /**
  * Query to get the categories for a manga.
  */
-fun getCategoriesForMangaQuery() = """
+fun getCategoriesForMangaQuery() =
+    """
     SELECT ${Category.TABLE}.* FROM ${Category.TABLE}
     JOIN ${MangaCategory.TABLE} ON ${Category.TABLE}.${Category.COL_ID} =
     ${MangaCategory.TABLE}.${MangaCategory.COL_CATEGORY_ID}