Release 0.10.5

Currently translated at 99.4% (574 of 577 strings)

Translated using Weblate (Filipino)

Currently translated at 100.0% (577 of 577 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (577 of 577 strings)

Translated using Weblate (French)

Currently translated at 100.0% (577 of 577 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (577 of 577 strings)

Translated using Weblate (Romanian)

Currently translated at 100.0% (577 of 577 strings)

Translated using Weblate (Croatian)

Currently translated at 100.0% (577 of 577 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (577 of 577 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (577 of 577 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (577 of 577 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (577 of 577 strings)

Translated using Weblate (Sardinian)

Currently translated at 100.0% (577 of 577 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (577 of 577 strings)

Translated using Weblate (Dutch)

Currently translated at 100.0% (577 of 577 strings)

Translated using Weblate (Finnish)

Currently translated at 100.0% (577 of 577 strings)

Translated using Weblate (Chuvash)

Currently translated at 100.0% (577 of 577 strings)

Translated using Weblate (Catalan)

Currently translated at 100.0% (577 of 577 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (577 of 577 strings)

Translated using Weblate (Greek)

Currently translated at 100.0% (577 of 577 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (577 of 577 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (577 of 577 strings)

Translated using Weblate (Malay)

Currently translated at 100.0% (577 of 577 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (577 of 577 strings)

Translated using Weblate (German)

Currently translated at 100.0% (577 of 577 strings)

Translated using Weblate (Catalan)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Hindi)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (French)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Finnish)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Malay)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (German)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (576 of 576 strings)

Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translated using Weblate (Italian)

Currently translated at 98.9% (570 of 576 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (French)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Yakut)

Currently translated at 87.3% (503 of 576 strings)

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sah/

Translated using Weblate (Bulgarian)

Currently translated at 96.7% (557 of 576 strings)

Translated using Weblate (Chuvash)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Vietnamese)

Currently translated at 86.2% (497 of 576 strings)

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/vi/

Translated using Weblate (Japanese)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (German)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Arabic)

Currently translated at 95.4% (550 of 576 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Hindi)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Romanian)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Yakut)

Currently translated at 85.2% (491 of 576 strings)

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sah/

Translated using Weblate (Croatian)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Sardinian)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Catalan)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 99.6% (574 of 576 strings)

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hant/

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Finnish)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Chuvash)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Hindi)

Currently translated at 99.3% (572 of 576 strings)

Translated using Weblate (German)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Filipino)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Spanish (Latin America))

Currently translated at 100.0% (576 of 576 strings)

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es_419/

Translated using Weblate (Greek)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Malay)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese)

Currently translated at 99.8% (575 of 576 strings)

Translated using Weblate (French)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Latvian)

Currently translated at 33.6% (194 of 576 strings)

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/lv/

Translated using Weblate (Arabic)

Currently translated at 91.8% (529 of 576 strings)

Translated using Weblate (Latvian)

Currently translated at 33.3% (192 of 576 strings)

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/lv/

Translated using Weblate (Latvian)

Currently translated at 33.3% (192 of 576 strings)

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/lv/

Translated using Weblate (French)

Currently translated at 99.8% (575 of 576 strings)

Translated using Weblate (Croatian)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 98.7% (569 of 576 strings)

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hant/

Translated using Weblate (Indonesian)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Croatian)

Currently translated at 99.4% (573 of 576 strings)

Translated using Weblate (Finnish)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Catalan)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Bengali (Bangladesh))

Currently translated at 0.5% (3 of 576 strings)

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/bn_BD/

Translated using Weblate (Filipino)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Japanese)

Currently translated at 97.7% (563 of 576 strings)

Translated using Weblate (Swedish)

Currently translated at 100.0% (576 of 576 strings)

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sv/

Translated using Weblate (Turkish)

Currently translated at 99.8% (575 of 576 strings)

Translated using Weblate (Greek)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Finnish)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Dutch)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Chuvash)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Hindi)

Currently translated at 99.1% (571 of 576 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Polish)

Currently translated at 96.8% (558 of 576 strings)

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pl/

Translated using Weblate (Malay)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Bengali)

Currently translated at 57.6% (332 of 576 strings)

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/bn/

Translated using Weblate (Bengali)

Currently translated at 57.6% (332 of 576 strings)

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/bn/

Added translation using Weblate (Bengali (Bangladesh))

Translated using Weblate (Yakut)

Currently translated at 80.2% (462 of 576 strings)

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sah/

Translated using Weblate (Russian)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Bengali)

Currently translated at 58.3% (336 of 576 strings)

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/bn/

Translated using Weblate (Sardinian)

Currently translated at 99.6% (574 of 576 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 98.0% (565 of 576 strings)

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hant/

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Greek)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Chuvash)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Filipino)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Spanish (Latin America))

Currently translated at 100.0% (576 of 576 strings)

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es_419/

Translated using Weblate (Spanish (Latin America))

Currently translated at 100.0% (576 of 576 strings)

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es_419/

Translated using Weblate (Finnish)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Dutch)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Indonesian)

Currently translated at 98.9% (570 of 576 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Chuvash)

Currently translated at 99.6% (574 of 576 strings)

Translated using Weblate (Malay)

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 90.4% (521 of 576 strings)

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/nb_NO/

Translated using Weblate (Malay)

Currently translated at 99.8% (575 of 576 strings)

Translated using Weblate (Swedish)

Currently translated at 100.0% (576 of 576 strings)

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sv/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (576 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.8% (575 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.8% (575 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.6% (574 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.6% (574 of 576 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.4% (573 of 576 strings)

Translated using Weblate (German)

Currently translated at 100.0% (576 of 576 strings)

Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: Alessandro Zangrandi <alessandro@mzit.it>
Co-authored-by: Alex <linuxrf@gmail.com>
Co-authored-by: Ava <Sasu.ruotsalainen@live.fi>
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: Gabriel Lebis <gableb@hotmail.fr>
Co-authored-by: George <georgeramzy37@gmail.com>
Co-authored-by: Hara Desu <aqjbgr09@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Huang Zhiyi <hzy980512@126.com>
Co-authored-by: Kurocon <weblate@kurocon.nl>
Co-authored-by: Marco Santos <enum.scima@gmail.com>
Co-authored-by: Matteo Gaeta <matteo.gaeta.1998@gmail.com>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Paulo Pinho <kebrus@gmail.com>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: RealKC <mitrut.e.super@gmail.com>
Co-authored-by: Rostyslav <info@ubilling.net.ua>
Co-authored-by: Samuel Carvalho de Araújo <samuelnegro12345@gmail.com>
Co-authored-by: Whod <whodizhod@gmail.com>
Co-authored-by: Yassin El Aoud <yassinelaoud@gmail.com>
Co-authored-by: darkbeast13 <nikhil15mps@gmail.com>
Co-authored-by: monolifed <monolifed@protonmail.com>
Co-authored-by: İlle <derasetad@gmail.com>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ar/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/bg/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ca/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/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/fi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fil/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hi/
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/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/uk/
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: Alessandro Zangrandi <alessandro@mzit.it>
Co-authored-by: Alex <linuxrf@gmail.com>
Co-authored-by: Ava <Sasu.ruotsalainen@live.fi>
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: Gabriel Lebis <gableb@hotmail.fr>
Co-authored-by: George <georgeramzy37@gmail.com>
Co-authored-by: Hara Desu <aqjbgr09@gmail.com>
Co-authored-by: Huang Zhiyi <hzy980512@126.com>
Co-authored-by: Kurocon <weblate@kurocon.nl>
Co-authored-by: Marco Santos <enum.scima@gmail.com>
Co-authored-by: Matteo Gaeta <matteo.gaeta.1998@gmail.com>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Paulo Pinho <kebrus@gmail.com>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: RealKC <mitrut.e.super@gmail.com>
Co-authored-by: Rostyslav <info@ubilling.net.ua>
Co-authored-by: Samuel Carvalho de Araújo <samuelnegro12345@gmail.com>
Co-authored-by: Whod <whodizhod@gmail.com>
Co-authored-by: Yassin El Aoud <yassinelaoud@gmail.com>
Co-authored-by: darkbeast13 <nikhil15mps@gmail.com>
Co-authored-by: monolifed <monolifed@protonmail.com>
Co-authored-by: İlle <derasetad@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/WrBkRk4)
+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 +1,26 @@
-**Please read https://github.com/inorichi/tachiyomi/blob/master/.github/CONTRIBUTING.md before posting**
+**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
+
+## 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/workflows/gradle-wrapper-validation.yml

@@ -0,0 +1,11 @@
+name: Validate Gradle Wrapper
+on: [push, pull_request]
+
+jobs:
+  validation:
+    name: Validation
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1

.github/workflows/issue_closer.yml

@@ -0,0 +1,35 @@
+name: Issue closer
+on: [issues]
+
+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."

.github/workflows/pr_build_check.yml

@@ -0,0 +1,18 @@
+name: Pull request build check
+on: [pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone repo
+        uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Install NDK
+        run: sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.0.6113669"
+      - name: Build project
+        run: ./gradlew assembleDebug

.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,41 +1,81 @@
+dist: trusty
 language: android
+
 android:
   components:
-    - platform-tools
     - tools
-
+    - platform-tools
-    # The BuildTools version used by your project
+    - build-tools-29.0.3
-    - build-tools-25.0.1
+    - android-29
-    - android-25
     - extra-android-m2repository
     - extra-google-m2repository
     - extra-android-support
     - extra-google-google_play_services
 
   licenses:
-    - android-sdk-license-.+
+    - 'android-sdk-license-.+'
-    - '.+'
+    - 'android-sdk-preview-license-.+'
-
-jdk:
-  - oraclejdk8
-
-before_script:
-  - chmod +x gradlew
 
 before_install:
+  - yes | sdkmanager "platforms;android-29" # 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
   - mkdir "$ANDROID_HOME/licenses" || true
-  - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
+  - echo -e "\n24333f8a63b6825ea9c5514f83c2829b004d1fee" > "$ANDROID_HOME/licenses/android-sdk-license"
   - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
 
-#Build, and run tests
+install:
-script: "./gradlew clean buildStandardDebug"
+  - echo y | sdkmanager "ndk-bundle"
-sudo: false
+
+before_script:
+  - export ANDROID_NDK_HOME=$ANDROID_HOME/ndk-bundle
+
+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/caches/"
-    - $HOME/.gradle/wrapper/
+    - "$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
+  - provider: script
+    script: ".travis/deploy.sh"
+    skip_cleanup: true
+    on:
+      branch: dev
+      condition: "-z $TRAVIS_TAG"
+      repo: inorichi/tachiyomi
+
 env:
-  - GRADLE_OPTS="-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
+  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

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+git fetch --unshallow #required for commit count
+
+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

@@ -0,0 +1,15 @@
+#!/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,25 +1,70 @@
-| Build | Download | F-Droid | Contribute | Contact |
+| Build | Stable | Weekly Preview | Contribute | Support Server |
 |-------|----------|---------|------------|---------|
-| [![TeamCity (simple build status)](https://img.shields.io/teamcity/https/teamcity.kanade.eu/s/tachiyomi_Build.svg)](https://teamcity.kanade.eu/project.html?projectId=tachiyomi) [![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=stable)](https://github.com/inorichi/tachiyomi/releases) [![latest dev build](https://img.shields.io/badge/dev-latest%20build-blue.svg)](http://tachiyomi.kanade.eu/latest/app-debug.apk) | [![fdroid release](https://img.shields.io/badge/stable-f--droid.org-blue.svg)](https://f-droid.org/repository/browse/?fdid=eu.kanade.tachiyomi) [![fdroid dev](https://img.shields.io/badge/dev-wiki-blue.svg)](//github.com/inorichi/tachiyomi/wiki/FDroid-for-dev-versions) | [![Translation status](http://weblate.j2ghz.com/widgets/tachiyomi/-/svg-badge.svg)](https://github.com/inorichi/tachiyomi/wiki/Translation) | [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/WrBkRk4) |
+| [![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)](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) |
 
-### **Contact us on [Discord](https://discord.gg/WrBkRk4)**
-If you want to open an issue, please read [contributing guidelines](https://github.com/inorichi/tachiyomi/blob/master/.github/CONTRIBUTING.md). Your issue may be closed otherwise.
 
-***
+# ![app icon](./.github/readme-images/app-icon.png)Tachiyomi
+Tachiyomi is a free and open source manga reader for Android 5.0 and above.
 
-Tachiyomi is a free and open source manga reader for Android.
+![screenshots of app](./.github/readme-images/screens.png)
 
-Keep in mind it's still a beta, so expect it to crash sometimes.
+## Features
 
-# Features
+Features include:
-
+* Online reading from sources such as MangaDex, MangaSee, Mangakakalot, [and more](https://github.com/inorichi/tachiyomi-extensions)
-* Online and offline reading
+* Local reading of downloaded manga
-* Configurable reader with multiple viewers and settings
+* A configurable reader with multiple viewers, reading directions and other settings.
-* MyAnimeList support
+* [MyAnimeList](https://myanimelist.net/), [AniList](https://anilist.co/), [Kitsu](https://kitsu.io/), [Shikimori](https://shikimori.one), and [Bangumi](https://bgm.tv/) support
-* Resume from the next unread chapter
-* Chapter filtering
-* Schedule searching for updates
 * Categories to organize your library
+* Light and dark themes
+* Schedule updating your library for new chapters
+* Create backups locally to read offline or to your desired cloud service
+
+## 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 preview version [here](https://github.com/tachiyomiorg/android-app-preview/releases).
+
+## Issues, Feature Requests and Contributing
+
+Please make sure to read the full guidelines. Your issue may be closed without warning if you do not.
+
+<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).**
+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 (More > About > Version)
+ * If not latest, try updating, it may have already been solved
+ * Preview version is equal to the number of commits as seen in the main page
+* Include steps to reproduce (if not obvious from description)
+* Include screenshot (if needed)
+* If it could be device-dependent, try reproducing on another device (if possible)
+* For large logs use http://pastebin.com/ (or similar)
+* Don't group unrelated requests into one issue
+
+DO: https://github.com/inorichi/tachiyomi/issues/24 https://github.com/inorichi/tachiyomi/issues/71
+
+DON'T: https://github.com/inorichi/tachiyomi/issues/75
+
+</details>
+
+<details><summary>Feature Requests</summary>
+
+* 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.
+</details>
+
+## FAQ
+
+[See our website.](https://tachiyomi.org/)
+You can also reach out to us on [Discord](https://discord.gg/tachiyomi).
 
 ## License
 

app/build.gradle

@@ -1,12 +1,15 @@
+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: 'com.github.zellius.shortcut-helper'
 
-if (file("custom.gradle").exists()) {
+shortcutHelper.filePath = './shortcuts.xml'
-    apply from: "custom.gradle"
-}
 
 ext {
     // Git is needed in your system PATH for these commands to work.
@@ -29,53 +32,62 @@ ext {
 }
 
 android {
-    compileSdkVersion 25
+    compileSdkVersion AndroidConfig.compileSdk
-    buildToolsVersion "25.0.2"
+    buildToolsVersion AndroidConfig.buildTools
-    publishNonDefault true
 
     defaultConfig {
         applicationId "eu.kanade.tachiyomi"
-        minSdkVersion 16
+        minSdkVersion AndroidConfig.minSdk
-        targetSdkVersion 25
+        targetSdkVersion AndroidConfig.targetSdk
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        versionCode 25
+        versionCode 51
-        versionName "0.6.2"
+        versionName "0.10.5"
 
         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 {
             abiFilters "armeabi-v7a", "arm64-v8a", "x86"
         }
     }
 
+    buildFeatures {
+        viewBinding = true
+    }
+
     buildTypes {
         debug {
             versionNameSuffix "-${getCommitCount()}"
             applicationIdSuffix ".debug"
-            multiDexEnabled true
         }
         release {
-            minifyEnabled true
+            postprocessing {
-            shrinkResources true
+                obfuscate false
-            multiDexEnabled false
+                optimizeCode true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+                removeUnusedCode false
+                removeUnusedResources true
+                proguardFiles 'proguard-rules.pro'
             }
         }
+    }
+
+    flavorDimensions "default"
 
     productFlavors {
         standard {
             buildConfigField "boolean", "INCLUDE_UPDATER", "true"
+            dimension "default"
         }
         fdroid {
+            dimension "default"
         }
         dev {
-            minSdkVersion 21
             resConfigs "en", "xxhdpi"
+            dimension "default"
         }
     }
 
@@ -87,142 +99,194 @@ 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
+    // AndroidX libraries
-    compile 'com.github.inorichi:subsampling-scale-image-view:01e5385'
+    implementation 'androidx.annotation:annotation:1.1.0'
-    compile 'com.github.inorichi:tachimage:68cd311'
+    implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
-    compile 'com.github.inorichi:junrar-android:634c1f5'
+    implementation 'androidx.biometric:biometric:1.1.0-alpha02'
+    implementation 'androidx.browser:browser:1.2.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
+    implementation 'androidx.core:core-ktx:1.4.0-alpha01'
+    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha05'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01'
 
-    // Android support library
+    final lifecycle_version = '2.3.0-alpha07'
-    final support_library_version = '25.4.0'
+    implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
-    compile "com.android.support:support-v4:$support_library_version"
+    implementation "androidx.lifecycle:lifecycle-process:$lifecycle_version"
-    compile "com.android.support:appcompat-v7:$support_library_version"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
-    compile "com.android.support:cardview-v7:$support_library_version"
-    compile "com.android.support:design:$support_library_version"
-    compile "com.android.support:recyclerview-v7:$support_library_version"
-    compile "com.android.support:support-annotations:$support_library_version"
-    compile "com.android.support:customtabs:$support_library_version"
-
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
-
-    compile 'com.android.support:multidex:1.0.1'
-
-    // ReactiveX
-    compile 'io.reactivex:rxandroid:1.2.1'
-    compile 'io.reactivex:rxjava:1.3.0'
-    compile 'com.jakewharton.rxrelay:rxrelay:1.2.0'
-    compile 'com.f2prateek.rx.preferences:rx-preferences:1.0.2'
-    compile 'com.github.pwittchen:reactivenetwork:0.7.0'
-
-    // Network client
-    compile "com.squareup.okhttp3:okhttp:3.8.1"
-    compile 'com.squareup.okio:okio:1.13.0'
-
-    // REST
-    final retrofit_version = '2.3.0'
-    compile "com.squareup.retrofit2:retrofit:$retrofit_version"
-    compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
-    compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
-
-    // JSON
-    compile 'com.google.code.gson:gson:2.8.1'
-    compile 'com.github.salomonbrys.kotson:kotson:2.5.0'
-
-    // YAML
-    compile 'com.github.bmoliveira:snake-yaml:v1.18-android'
-
-    // JavaScript engine
-    compile 'com.squareup.duktape:duktape-android:1.1.0'
-
-    // Disk
-    compile 'com.jakewharton:disklrucache:2.0.2'
-    compile 'com.github.seven332:unifile:1.0.0'
-
-    // HTML parser
-    compile 'org.jsoup:jsoup:1.10.2'
 
     // Job scheduling
-    compile 'com.evernote:android-job:1.1.11'
+    final work_version = '2.5.0-alpha01'
-    compile 'com.google.android.gms:play-services-gcm:11.0.1'
+    implementation "androidx.work:work-runtime:$work_version"
+    implementation "androidx.work:work-runtime-ktx:$work_version"
 
-    // Changelog
+    // UI library
-    compile 'com.github.gabrielemariotti.changeloglib:changelog:2.1.0'
+    implementation 'com.google.android.material:material:1.3.0-alpha02'
+
+    standardImplementation 'com.google.firebase:firebase-core:17.5.0'
+
+    // ReactiveX
+    implementation 'io.reactivex:rxandroid:1.2.1'
+    implementation 'io.reactivex:rxjava:1.3.8'
+    implementation 'com.jakewharton.rxrelay:rxrelay:1.2.0'
+    implementation 'com.github.pwittchen:reactivenetwork:0.13.0'
+
+    // Network client
+    final okhttp_version = '4.9.0'
+    implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
+    implementation "com.squareup.okhttp3:logging-interceptor:$okhttp_version"
+    implementation "com.squareup.okhttp3:okhttp-dnsoverhttps:$okhttp_version"
+    implementation 'com.squareup.okio:okio:2.8.0'
+
+    // TLS 1.3 support for Android < 10
+    implementation 'org.conscrypt:conscrypt-android:2.5.1'
+
+    // REST
+    final retrofit_version = '2.9.0'
+    implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
+    implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
+    implementation "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
+
+    // JSON
+    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.github.salomonbrys.kotson:kotson:2.5.0'
+
+    // JavaScript engine
+    implementation 'com.squareup.duktape:duktape-android:1.3.0'
+
+    // Disk
+    implementation 'com.jakewharton:disklrucache:2.0.2'
+    implementation 'com.github.inorichi:unifile:e9ee588'
+    implementation 'com.github.inorichi:junrar-android:634c1f5'
+
+    // HTML parser
+    implementation 'org.jsoup:jsoup:1.13.1'
 
     // Database
-    compile "com.pushtorefresh.storio:sqlite:1.13.0"
+    implementation 'androidx.sqlite:sqlite:2.1.0'
+    implementation 'com.github.inorichi.storio:storio-common:8be19de@aar'
+    implementation 'com.github.inorichi.storio:storio-sqlite:8be19de@aar'
+    implementation 'io.requery:sqlite-android:3.32.2'
+
+    // Preferences
+    implementation 'com.github.tfcporciuncula:flow-preferences:1.3.1'
 
     // Model View Presenter
     final nucleus_version = '3.0.0'
-    compile "info.android15.nucleus:nucleus:$nucleus_version"
+    implementation "info.android15.nucleus:nucleus:$nucleus_version"
-    compile "info.android15.nucleus:nucleus-support-v7:$nucleus_version"
+    implementation "info.android15.nucleus:nucleus-support-v7:$nucleus_version"
 
     // Dependency injection
-    compile "uy.kohesive.injekt:injekt-core:1.16.1"
+    implementation "com.github.inorichi.injekt:injekt-core:65b0440"
 
     // Image library
-    compile 'com.github.bumptech.glide:glide:3.8.0'
+    final glide_version = '4.11.0'
-    compile 'com.github.bumptech.glide:okhttp3-integration:1.5.0@aar'
+    implementation "com.github.bumptech.glide:glide:$glide_version"
-    // Transformations
+    implementation "com.github.bumptech.glide:okhttp3-integration:$glide_version"
-    compile 'jp.wasabeef:glide-transformations:2.0.2'
+    kapt "com.github.bumptech.glide:compiler:$glide_version"
+
+    implementation 'com.github.tachiyomiorg:subsampling-scale-image-view:bff2806'
 
     // Logging
-    compile 'com.jakewharton.timber:timber:4.5.1'
+    implementation 'com.jakewharton.timber:timber:4.7.1'
 
     // Crash reports
-    compile 'ch.acra:acra:4.9.2'
+    implementation 'ch.acra:acra-http:5.7.0'
 
     // Sort
-    compile 'com.github.gpanther:java-nat-sort:natural-comparator-1.1'
+    implementation 'com.github.gpanther:java-nat-sort:natural-comparator-1.1'
 
     // UI
-    compile 'com.dmitrymalkovich.android:material-design-dimens:1.4'
+    implementation 'com.dmitrymalkovich.android:material-design-dimens:1.4'
-    compile 'com.github.dmytrodanylyk.android-process-button:library:1.0.4'
+    implementation 'com.github.dmytrodanylyk.android-process-button:library:1.0.4'
-    compile 'eu.davidea:flexible-adapter:5.0.0-rc1'
+    implementation 'eu.davidea:flexible-adapter:5.1.0'
-    compile 'com.nononsenseapps:filepicker:2.5.2'
+    implementation 'eu.davidea:flexible-adapter-ui:1.0.0'
-    compile 'com.github.amulyakhare:TextDrawable:558677e'
+    implementation 'com.nononsenseapps:filepicker:2.5.2'
-    compile 'com.afollestad.material-dialogs:core:0.9.4.5'
+    implementation 'com.nightlynexus.viewstatepageradapter:viewstatepageradapter:1.1.0'
-    compile 'me.zhanghai.android.systemuihelper:library:1.0.0'
+    implementation 'com.github.mthli:Slice:v1.3'
-    compile 'com.nightlynexus.viewstatepageradapter:viewstatepageradapter:1.0.4'
+    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
+    implementation 'com.github.carlosesco:DirectionalViewPager:a844dbca0a'
+
+    // 3.2.0+ introduces weird UI blinking or cut off issues on some devices
+    final material_dialogs_version = '3.1.1'
+    implementation "com.afollestad.material-dialogs:core:$material_dialogs_version"
+    implementation "com.afollestad.material-dialogs:input:$material_dialogs_version"
+    implementation "com.afollestad.material-dialogs:datetime:$material_dialogs_version"
 
     // Conductor
-    compile "com.bluelinelabs:conductor:2.1.4"
+    implementation 'com.bluelinelabs:conductor:2.1.5'
-    compile 'com.github.inorichi:conductor-support-preference:9e36460'
+    implementation("com.bluelinelabs:conductor-support:2.1.5") {
+        exclude group: "com.android.support"
+    }
+    implementation 'com.github.tachiyomiorg:conductor-support-preference:1.1.1'
 
-    // RxBindings
+    // FlowBinding
-    final rxbindings_version = '1.0.1'
+    final flowbinding_version = '0.12.0'
-    compile "com.jakewharton.rxbinding:rxbinding-kotlin:$rxbindings_version"
+    implementation "io.github.reactivecircus.flowbinding:flowbinding-android:$flowbinding_version"
-    compile "com.jakewharton.rxbinding:rxbinding-appcompat-v7-kotlin:$rxbindings_version"
+    implementation "io.github.reactivecircus.flowbinding:flowbinding-appcompat:$flowbinding_version"
-    compile "com.jakewharton.rxbinding:rxbinding-support-v4-kotlin:$rxbindings_version"
+    implementation "io.github.reactivecircus.flowbinding:flowbinding-recyclerview:$flowbinding_version"
-    compile "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
+    // NOTE: REMEMBER TO UPDATE GRADLE PLUGIN
+    implementation 'com.mikepenz:aboutlibraries:8.3.0'
 
     // Tests
-    testCompile 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
-    testCompile 'org.assertj:assertj-core:1.7.1'
+    testImplementation 'org.assertj:assertj-core:3.16.1'
-    testCompile 'org.mockito:mockito-core:1.10.19'
+    testImplementation 'org.mockito:mockito-core:1.10.19'
 
     final robolectric_version = '3.1.4'
-    testCompile "org.robolectric:robolectric:$robolectric_version"
+    testImplementation "org.robolectric:robolectric:$robolectric_version"
-    testCompile "org.robolectric:shadows-multidex:$robolectric_version"
+    testImplementation "org.robolectric:shadows-multidex:$robolectric_version"
-    testCompile "org.robolectric:shadows-play-services:$robolectric_version"
+    testImplementation "org.robolectric:shadows-play-services:$robolectric_version"
 
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    final coroutines_version = '1.3.9'
+    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.1.4'
     repositories {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$BuildPluginsVersion.KOTLIN"
     }
 }
 
@@ -230,49 +294,20 @@ repositories {
     mavenCentral()
 }
 
-// Workaround to force a support lib version
+// See https://kotlinlang.org/docs/reference/experimental.html#experimental-status-of-experimental-api-markers
-configurations.all {
+tasks.withType(AbstractKotlinCompile).all {
-    resolutionStrategy.eachDependency { details ->
+    kotlinOptions.freeCompilerArgs += ["-Xopt-in=kotlin.Experimental"]
-        def requested = details.requested
-        if (requested.group == 'com.android.support') {
-            if (!requested.name.startsWith("multidex")) {
-                details.useVersion '25.4.0'
-            }
-        }
-    }
 }
 
-// add support for placeholders in resource files
+// Duplicating Hebrew string assets due to some locale code issues on different devices
-//https://code.google.com/p/android/issues/detail?id=69224
+task copyResources(type: Copy) {
-def replacePlaceholdersInFile(basePath, fileName, placeholders) {
+    from './src/main/res/values-he'
-    def file = new File(basePath, fileName);
+    into './src/main/res/values-iw'
-
+    include '**/*'
-    if (!file.exists()) {
-        logger.quiet("Unable to replace placeholders in " + file.toString() + ". File cannot be found.")
-        return;
 }
 
-    logger.debug("Replacing placeholders in " + file.toString())
+preBuild.dependsOn(formatKotlin, copyResources)
-    logger.debug("Placeholders: " + placeholders.toString())
 
-    def content = file.getText('UTF-8')
+if (getGradle().getStartParameter().getTaskRequests().toString().contains("Standard")) {
-
+    apply plugin: 'com.google.gms.google-services'
-    placeholders.each { entry ->
-        content = content.replaceAll("\\\$\\{${entry.key}\\}", entry.value)
-    }
-
-    file.write(content, 'UTF-8')
-}
-
-afterEvaluate {
-    android.applicationVariants.all { variant ->
-        variant.outputs.each { output ->
-            output.processResources.doFirst {
-                // prepare placeholder map from manifestPlaceholders including applicationId placeholder
-                def placeholders = variant.mergedFlavor.manifestPlaceholders + [applicationId: variant.applicationId]
-
-                replacePlaceholdersInFile(resDir, 'xml-v25/shortcuts.xml', placeholders)
-            }
-        }
-    }
 }

app/proguard-rules.pro

@@ -1,31 +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.** { *; }
-
 # 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 enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
+    <init>();
-    **[] $VALUES;
-    public *;
 }
 
 # RxJava 1.1.0
@@ -44,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.**
 
@@ -81,10 +56,3 @@
 -keep class * implements com.google.gson.TypeAdapterFactory
 -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
--keep class com.squareup.duktape.** { *; }

app/shortcuts.xml

@@ -2,50 +2,46 @@
 
     <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"
         android:shortcutShortLabel="@string/label_library">
         <intent
             android:action="eu.kanade.tachiyomi.SHOW_LIBRARY"
-            android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity"
+            android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
-            android:targetPackage="${applicationId}" />
     </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"
         android:shortcutShortLabel="@string/short_recent_updates">
         <intent
             android:action="eu.kanade.tachiyomi.SHOW_RECENTLY_UPDATED"
-            android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity"
+            android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
-            android:targetPackage="${applicationId}" />
     </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"
         android:shortcutShortLabel="@string/label_recent_manga">
         <intent
             android:action="eu.kanade.tachiyomi.SHOW_RECENTLY_READ"
-            android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity"
+            android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
-            android:targetPackage="${applicationId}" />
     </shortcut>
     <shortcut
         android:enabled="true"
         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"
+            android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
-            android:targetPackage="${applicationId}" />
     </shortcut>
 </shortcuts>

app/src/debug/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="108.0"
+        android:viewportHeight="108.0">
+    <path
+        android:pathData="M14.5,7L86.5,7A7,7 0,0 1,93.5 14L93.5,95A7,7 0,0 1,86.5 102L14.5,102A7,7 0,0 1,7.5 95L7.5,14A7,7 0,0 1,14.5 7z"
+        android:fillType="evenOdd"
+        android:fillColor="#000"/>
+    <path
+        android:pathData="M14.5,7L86.5,7A7,7 0,0 1,93.5 14L93.5,95A7,7 0,0 1,86.5 102L14.5,102A7,7 0,0 1,7.5 95L7.5,14A7,7 0,0 1,14.5 7z"
+        android:fillType="evenOdd"
+        android:fillColor="#455A64"/>
+    <path
+        android:pathData="M7.5,12.01C7.5,9.24 9.74,7 12.5,7L17.5,7L17.5,102L12.5,102C9.74,102 7.5,99.77 7.5,96.99L7.5,12.01Z"
+        android:fillType="evenOdd"
+        android:fillColor="#607D8B"/>
+    <path
+        android:pathData="M54,54.5m-25.5,0a25.5,25.5 0,1 1,51 0a25.5,25.5 0,1 1,-51 0"
+        android:fillType="evenOdd"
+        android:fillColor="#000"/>
+    <path
+        android:pathData="M54,54.5m-25.5,0a25.5,25.5 0,1 1,51 0a25.5,25.5 0,1 1,-51 0"
+        android:fillType="evenOdd"
+        android:fillColor="#CE2828"/>
+    <path
+        android:pathData="M54,54.5m-19.94,0a19.94,19.94 0,1 1,39.87 0a19.94,19.94 0,1 1,-39.87 0"
+        android:fillType="evenOdd"
+        android:fillColor="#FFF"/>
+    <path
+        android:pathData="M52.04,46.3L47.42,46.3C46.14,46.3 44.93,46.23 44.2,46.14L44.2,49.76C45,49.65 46.16,49.6 47.42,49.6L60.58,49.6C61.86,49.6 63.02,49.65 63.82,49.76L63.82,46.14C63.09,46.23 61.86,46.3 60.58,46.3L55.69,46.3L55.69,45.07C55.69,44.43 55.73,43.95 55.82,43.45L51.9,43.45C51.99,44 52.04,44.43 52.04,45.07L52.04,46.3ZM46.78,60.68C45.46,60.68 44.29,60.63 43.45,60.52L43.45,64.14C44.34,64.03 45.46,63.98 46.78,63.98L61.29,63.98C62.57,63.98 63.71,64.03 64.57,64.14L64.57,60.52C63.73,60.63 62.57,60.68 61.29,60.68L58.24,60.68C59.33,58.06 59.99,56.23 60.7,53.91C61.34,51.81 61.34,51.81 61.56,51.13L57.58,50.06C57.51,50.93 57.37,51.52 56.89,53.41C56.19,56.14 55.32,58.74 54.5,60.68L46.78,60.68ZM46.48,51.36C47.55,54.02 48.28,56.53 49.03,60.15L52.66,58.9C51.65,54.98 50.92,52.66 49.94,50.11L46.48,51.36Z"
+        android:fillType="evenOdd"
+        android:fillColor="#000"/>
+</vector>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@android:color/transparent"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@android:color/transparent"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/main/AndroidManifest.xml

@@ -8,37 +8,71 @@
     <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="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <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:usesCleartextTraffic="true">
         <activity
             android:name=".ui.main.MainActivity"
-            android:launchMode="singleTop">
+            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>
-            <meta-data android:name="android.app.shortcuts"
+            <!--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">
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+                <action android:name="com.google.android.gms.actions.SEARCH_ACTION" />
+
+                <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" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable" />
+        </activity>
         <activity
             android:name=".ui.reader.ReaderActivity"
-            android:theme="@style/Theme.Reader" />
+            android:launchMode="singleTask" />
+        <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" />
@@ -51,9 +85,41 @@
                     android:scheme="tachiyomi" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".ui.setting.track.ShikimoriLoginActivity"
+            android:label="Shikimori">
+            <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="shikimori-auth"
+                    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" />
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true">
@@ -62,16 +128,6 @@
                 android:resource="@xml/provider_paths" />
         </provider>
 
-        <provider
-            android:name="eu.kanade.tachiyomi.util.ZipContentProvider"
-            android:authorities="${applicationId}.zip-provider"
-            android:exported="false" />
-
-        <provider
-            android:name="eu.kanade.tachiyomi.util.RarContentProvider"
-            android:authorities="${applicationId}.rar-provider"
-            android:exported="false" />
-
         <receiver
             android:name=".data.notification.NotificationReceiver"
             android:exported="false" />
@@ -85,7 +141,7 @@
             android:exported="false" />
 
         <service
-            android:name=".data.updater.UpdateDownloaderService"
+            android:name=".data.updater.UpdaterService"
             android:exported="false" />
 
         <service
@@ -96,10 +152,6 @@
             android:name=".data.backup.BackupRestoreService"
             android:exported="false" />
 
-        <meta-data
-            android:name="eu.kanade.tachiyomi.data.glide.AppGlideModule"
-            android:value="GlideModule" />
-
     </application>
 
 </manifest>

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

@@ -3,66 +3,91 @@ 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 eu.kanade.tachiyomi.data.updater.UpdateCheckerJob
+import androidx.lifecycle.ProcessLifecycleOwner
-import eu.kanade.tachiyomi.util.LocaleHelper
+import androidx.multidex.MultiDex
+import eu.kanade.tachiyomi.data.notification.Notifications
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+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",
-        reportType = org.acra.sender.HttpSender.Type.JSON,
-        httpMethod = org.acra.sender.HttpSender.Method.PUT,
     buildConfigClass = BuildConfig::class,
-        excludeMatchingSharedPreferencesKeys = arrayOf(".*username.*", ".*password.*", ".*token.*")
+    excludeMatchingSharedPreferencesKeys = [".*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))
 
-        if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree())
-
         setupAcra()
-        setupJobManager()
+        setupNotificationChannels()
 
         LocaleHelper.updateConfiguration(this, resources.configuration)
+
+        ProcessLifecycleOwner.get().lifecycle.addObserver(this)
     }
 
     override fun attachBaseContext(base: Context) {
         super.attachBaseContext(base)
-        if (BuildConfig.DEBUG) {
         MultiDex.install(this)
     }
-    }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
         LocaleHelper.updateConfiguration(this, newConfig, true)
     }
 
+    @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
+    @Suppress("unused")
+    fun onAppBackgrounded() {
+        val preferences: PreferencesHelper by injectLazy()
+        if (preferences.lockAppAfter().get() >= 0) {
+            SecureActivityDelegate.locked = true
+        }
+    }
+
     protected open fun setupAcra() {
         ACRA.init(this)
     }
 
-    protected open fun setupJobManager() {
+    protected open fun setupNotificationChannels() {
-        JobManager.create(this).addJobCreator { tag ->
+        Notifications.createChannels(this)
-            when (tag) {
-                LibraryUpdateJob.TAG -> LibraryUpdateJob()
-                UpdateCheckerJob.TAG -> UpdateCheckerJob()
-                BackupCreatorJob.TAG -> BackupCreatorJob()
-                else -> null
     }
 }
-    }
-
-}

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

@@ -8,15 +8,21 @@ import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.download.DownloadManager
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.track.TrackManager
+import eu.kanade.tachiyomi.extension.ExtensionManager
 import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.source.SourceManager
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 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) }
 
@@ -28,7 +34,9 @@ class AppModule(val app: Application) : InjektModule {
 
         addSingletonFactory { NetworkHelper(app) }
 
-            addSingletonFactory { SourceManager(app) }
+        addSingletonFactory { SourceManager(app).also { get<ExtensionManager>().init(it) } }
+
+        addSingletonFactory { ExtensionManager(app) }
 
         addSingletonFactory { DownloadManager(app) }
 
@@ -36,6 +44,16 @@ class AppModule(val app: Application) : InjektModule {
 
         addSingletonFactory { Gson() }
 
-    }
+        // Asynchronously init expensive components for a faster cold start
 
+        GlobalScope.launch { get<PreferencesHelper>() }
+
+        GlobalScope.launch { get<NetworkHelper>() }
+
+        GlobalScope.launch { get<SourceManager>() }
+
+        GlobalScope.launch { get<DatabaseHelper>() }
+
+        GlobalScope.launch { get<DownloadManager>() }
+    }
 }

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

@@ -1,10 +0,0 @@
-package eu.kanade.tachiyomi
-
-object Constants {
-    const val NOTIFICATION_LIBRARY_PROGRESS_ID = 1
-    const val NOTIFICATION_LIBRARY_RESULT_ID = 2
-    const val NOTIFICATION_UPDATER_ID = 3
-    const val NOTIFICATION_DOWNLOAD_CHAPTER_ID = 4
-    const val NOTIFICATION_DOWNLOAD_CHAPTER_ERROR_ID = 5
-    const val NOTIFICATION_DOWNLOAD_IMAGE_ID = 6
-}

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

@@ -1,9 +1,11 @@
 package eu.kanade.tachiyomi
 
+import eu.kanade.tachiyomi.data.backup.BackupCreatorJob
 import eu.kanade.tachiyomi.data.library.LibraryUpdateJob
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.data.preference.getOrDefault
+import eu.kanade.tachiyomi.data.updater.UpdaterJob
-import eu.kanade.tachiyomi.data.updater.UpdateCheckerJob
+import eu.kanade.tachiyomi.extension.ExtensionUpdateJob
+import eu.kanade.tachiyomi.ui.library.LibrarySort
 import java.io.File
 
 object Migrations {
@@ -16,18 +18,33 @@ object Migrations {
      */
     fun upgrade(preferences: PreferencesHelper): Boolean {
         val context = preferences.context
-        val oldVersion = preferences.lastVersionCode().getOrDefault()
+        val oldVersion = preferences.lastVersionCode().get()
+
+        // Cancel app updater job for debug builds that don't include it
+        if (BuildConfig.DEBUG && !BuildConfig.INCLUDE_UPDATER) {
+            UpdaterJob.cancelTask(context)
+        }
+
         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) {
-                    UpdateCheckerJob.setupTask()
+                    UpdaterJob.setupTask(context)
                 }
-                LibraryUpdateJob.setupTask()
+                LibraryUpdateJob.setupTask(context)
             }
             if (oldVersion < 15) {
                 // Delete internal chapter cache dir.
@@ -39,15 +56,41 @@ 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))
                         }
                     }
                 }
             }
+            if (oldVersion < 26) {
+                // Delete external chapter cache dir.
+                val extCache = context.externalCacheDir
+                if (extCache != null) {
+                    val chapterCache = File(extCache, "chapter_disk_cache")
+                    if (chapterCache.exists()) {
+                        chapterCache.deleteRecursively()
+                    }
+                }
+            }
+            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)
+                }
+            }
             return true
         }
         return false
     }
-
 }

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

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

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

@@ -1,23 +1,10 @@
 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 ACTION_ERROR_RESTORE_DIALOG = "$ID.$INTENT_FILTER.ACTION_ERROR_RESTORE_DIALOG"
-    const val ACTION_RESTORE_COMPLETED_DIALOG = "$ID.$INTENT_FILTER.ACTION_RESTORE_COMPLETED_DIALOG"
-    const val ACTION = "$ID.$INTENT_FILTER.ACTION"
-    const val EXTRA_PROGRESS = "$ID.$INTENT_FILTER.EXTRA_PROGRESS"
-    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,36 +1,24 @@
 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.github.salomonbrys.kotson.set
+import android.os.Build
-import com.google.gson.JsonArray
+import android.os.IBinder
-import com.google.gson.JsonObject
+import android.os.PowerManager
+import androidx.core.net.toUri
 import com.hippo.unifile.UniFile
-import eu.kanade.tachiyomi.data.backup.models.Backup
+import eu.kanade.tachiyomi.data.notification.Notifications
-import eu.kanade.tachiyomi.data.backup.models.Backup.CATEGORIES
+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.VERSION
-import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.util.sendLocalBroadcast
-import timber.log.Timber
-import eu.kanade.tachiyomi.BuildConfig.APPLICATION_ID as ID
 
 /**
- * [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"
-
-        // Backup called from job
-        private const val EXTRA_IS_JOB = "$ID.$NAME.EXTRA_IS_JOB"
-        // 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
@@ -42,123 +30,91 @@ 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
          *
          * @param context context of application
-         * @param path path of Uri
+         * @param uri path of Uri
          * @param flags determines what to backup
-         * @param isJob backup called from job
          */
-        fun makeBackup(context: Context, uri: Uri, flags: Int, isJob: Boolean = false) {
+        fun start(context: Context, uri: Uri, flags: Int) {
+            if (!isRunning(context)) {
                 val intent = Intent(context, BackupCreateService::class.java).apply {
                     putExtra(BackupConst.EXTRA_URI, uri)
-                putExtra(EXTRA_IS_JOB, isJob)
+                    putExtra(BackupConst.EXTRA_FLAGS, flags)
-                putExtra(EXTRA_FLAGS, flags)
                 }
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
                     context.startService(intent)
+                } else {
+                    context.startForegroundService(intent)
+                }
             }
-
         }
-
-    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 isJob = intent.getBooleanExtra(EXTRA_IS_JOB, false)
-        val flags = intent.getIntExtra(EXTRA_FLAGS, 0)
-        // Create backup
-        createBackupFromApp(uri, flags, isJob)
     }
 
     /**
-     * Create backup Json file from database
+     * Wake lock that will be held until the service is destroyed.
-     *
-     * @param uri path of Uri
-     * @param isJob backup called from job
      */
-    fun createBackupFromApp(uri: Uri, flags: Int, isJob: Boolean) {
+    private lateinit var wakeLock: PowerManager.WakeLock
-        // Create root object
-        val root = JsonObject()
 
-        // Create information object
+    private lateinit var backupManager: BackupManager
-        val information = JsonObject()
+    private lateinit var notifier: BackupNotifier
 
-        // Create manga array
+    override fun onCreate() {
-        val mangaEntries = JsonArray()
+        super.onCreate()
 
-        // Create category array
+        notifier = BackupNotifier(this)
-        val categoryEntries = JsonArray()
+        wakeLock = acquireWakeLock(javaClass.name)
 
-        // Add value's to root
+        startForeground(Notifications.ID_BACKUP_PROGRESS, notifier.showBackupProgress().build())
-        root[VERSION] = Backup.CURRENT_VERSION
-        root[MANGAS] = mangaEntries
-        root[CATEGORIES] = categoryEntries
-
-        backupManager.databaseHelper.inTransaction {
-            // Get manga from database
-            val mangas = backupManager.getFavoriteManga()
-
-            // Backup library manga and its dependencies
-            mangas.forEach { manga ->
-                mangaEntries.add(backupManager.backupMangaObject(manga, flags))
     }
 
-            // Backup categories
+    override fun stopService(name: Intent?): Boolean {
-            if ((flags and BACKUP_CATEGORY_MASK) == BACKUP_CATEGORY) {
+        destroyJob()
-                backupManager.backupCategories(categoryEntries)
+        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 {
-            // When BackupCreatorJob
+            val uri = intent.getParcelableExtra<Uri>(BackupConst.EXTRA_URI)
-            if (isJob) {
+            val backupFlags = intent.getIntExtra(BackupConst.EXTRA_FLAGS, 0)
-                // Get dir of file
+            backupManager = BackupManager(this)
-                val dir = UniFile.fromUri(this, uri)
 
-                // Delete older backups
+            val backupFileUri = backupManager.createBackup(uri, backupFlags, false)?.toUri()
-                val numberOfBackups = backupManager.numberOfBackups()
+            val unifile = UniFile.fromUri(this, backupFileUri)
-                val backupRegex = Regex("""tachiyomi_\d+-\d+-\d+_\d+-\d+.json""")
+            notifier.showBackupComplete(unifile)
-                dir.listFiles { _, filename -> backupRegex.matches(filename) }
-                        .orEmpty()
-                        .sortedByDescending { it.name }
-                        .drop(numberOfBackups - 1)
-                        .forEach { it.delete() }
-
-                // Create new file to place backup
-                val newFile = dir.createFile(Backup.getDefaultFilename())
-                        ?: throw Exception("Couldn't create backup file")
-
-                newFile.openOutputStream().bufferedWriter().use {
-                    backupManager.parser.toJson(root, it)
-                }
-            } else {
-                val file = UniFile.fromUri(this, uri)
-                        ?: throw Exception("Couldn't create backup file")
-                file.openOutputStream().bufferedWriter().use {
-                    backupManager.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())
-                }
-                sendLocalBroadcast(intent)
-            }
         } catch (e: Exception) {
-            Timber.e(e)
+            notifier.showBackupError(e.message)
-            if (!isJob) {
-                // 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)
-                }
-                sendLocalBroadcast(intent)
-            }
         }
+
+        stopSelf(startId)
+        return START_NOT_STICKY
     }
 }

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

@@ -1,43 +1,53 @@
 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.preference.PreferencesHelper
-import eu.kanade.tachiyomi.data.preference.getOrDefault
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
-import java.io.File
+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 uri = Uri.fromFile(File(preferences.backupsDirectory().getOrDefault()))
+        val backupManager = BackupManager(context)
+        val uri = preferences.backupsDirectory().get().toUri()
         val flags = BackupCreateService.BACKUP_ALL
-        BackupCreateService.makeBackup(context, uri, flags, true)
+        return try {
-        return Result.SUCCESS
+            backupManager.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(),
-                        .setPersisted(true)
+                    TimeUnit.HOURS,
-                        .setUpdateCurrent(true)
+                    10,
+                    TimeUnit.MINUTES
+                )
+                    .addTag(TAG)
                     .build()
-                        .schedule()
-            }
-        }
 
-        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/BackupManager.kt

@@ -1,8 +1,17 @@
 package eu.kanade.tachiyomi.data.backup
 
 import android.content.Context
-import com.github.salomonbrys.kotson.*
+import android.net.Uri
-import com.google.gson.*
+import com.github.salomonbrys.kotson.fromJson
+import com.github.salomonbrys.kotson.registerTypeAdapter
+import com.github.salomonbrys.kotson.registerTypeHierarchyAdapter
+import com.github.salomonbrys.kotson.set
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonArray
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.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
@@ -11,35 +20,47 @@ 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.models.Backup.CATEGORIES
 import eu.kanade.tachiyomi.data.backup.models.Backup.CHAPTERS
 import eu.kanade.tachiyomi.data.backup.models.Backup.CURRENT_VERSION
+import eu.kanade.tachiyomi.data.backup.models.Backup.EXTENSIONS
 import eu.kanade.tachiyomi.data.backup.models.Backup.HISTORY
 import eu.kanade.tachiyomi.data.backup.models.Backup.MANGA
 import eu.kanade.tachiyomi.data.backup.models.Backup.TRACK
 import eu.kanade.tachiyomi.data.backup.models.DHistory
-import eu.kanade.tachiyomi.data.backup.serializer.*
+import eu.kanade.tachiyomi.data.backup.serializer.CategoryTypeAdapter
+import eu.kanade.tachiyomi.data.backup.serializer.ChapterTypeAdapter
+import eu.kanade.tachiyomi.data.backup.serializer.HistoryTypeAdapter
+import eu.kanade.tachiyomi.data.backup.serializer.MangaTypeAdapter
+import eu.kanade.tachiyomi.data.backup.serializer.TrackTypeAdapter
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
-import eu.kanade.tachiyomi.data.database.models.*
+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.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.data.preference.getOrDefault
+import eu.kanade.tachiyomi.data.track.TrackManager
+import eu.kanade.tachiyomi.source.LocalSource
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
-import eu.kanade.tachiyomi.util.syncChaptersWithSource
+import eu.kanade.tachiyomi.util.chapter.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) {
 
-    /**
-     * Database.
-     */
     internal val databaseHelper: DatabaseHelper by injectLazy()
-
-    /**
-     * Source manager.
-     */
     internal val sourceManager: SourceManager by injectLazy()
+    internal val trackManager: TrackManager by injectLazy()
+    private val preferences: PreferencesHelper by injectLazy()
 
     /**
      * Version of parser
@@ -52,11 +73,6 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
      */
     var parser: Gson = initParser()
 
-    /**
-     * Preferences
-     */
-    private val preferences: PreferencesHelper by injectLazy()
-
     /**
      * Set version of parser
      *
@@ -67,10 +83,10 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
         parser = initParser()
     }
 
-    private fun initParser(): Gson {
+    private fun initParser(): Gson = when (version) {
-        return when (version) {
         1 -> GsonBuilder().create()
-            2 -> GsonBuilder()
+        2 ->
+            GsonBuilder()
                 .registerTypeAdapter<MangaImpl>(MangaTypeAdapter.build())
                 .registerTypeHierarchyAdapter<ChapterImpl>(ChapterTypeAdapter.build())
                 .registerTypeAdapter<CategoryImpl>(CategoryTypeAdapter.build())
@@ -79,6 +95,103 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
                 .create()
         else -> throw Exception("Json version unknown")
     }
+
+    /**
+     * Create backup Json file from database
+     *
+     * @param uri path of Uri
+     * @param isJob backup called from job
+     */
+    fun createBackup(uri: Uri, flags: Int, isJob: Boolean): String? {
+        // Create root object
+        val root = JsonObject()
+
+        // Create manga array
+        val mangaEntries = JsonArray()
+
+        // Create category array
+        val categoryEntries = JsonArray()
+
+        // Create extension ID/name mapping
+        val extensionEntries = JsonArray()
+
+        // Add value's to root
+        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
+            if (isJob) {
+                // Get dir of file and create
+                var dir = UniFile.fromUri(context, uri)
+                dir = dir.createDirectory("automatic")
+
+                // Delete older backups
+                val numberOfBackups = numberOfBackups()
+                val backupRegex = Regex("""tachiyomi_\d+-\d+-\d+_\d+-\d+.json""")
+                dir.listFiles { _, filename -> backupRegex.matches(filename) }
+                    .orEmpty()
+                    .sortedByDescending { it.name }
+                    .drop(numberOfBackups - 1)
+                    .forEach { it.delete() }
+
+                // Create new file to place backup
+                val newFile = dir.createFile(Backup.getDefaultFilename())
+                    ?: throw Exception("Couldn't create backup file")
+
+                newFile.openOutputStream().bufferedWriter().use {
+                    parser.toJson(root, it)
+                }
+
+                return newFile.uri.toString()
+            } else {
+                val file = UniFile.fromUri(context, uri)
+                    ?: throw Exception("Couldn't create backup file")
+                file.openOutputStream().bufferedWriter().use {
+                    parser.toJson(root, it)
+                }
+
+                return file.uri.toString()
+            }
+        } catch (e: Exception) {
+            Timber.e(e)
+            throw e
+        }
+    }
+
+    private fun backupExtensionInfo(root: JsonArray, extensions: Set<String>) {
+        extensions.sorted().forEach {
+            root.add(it)
+        }
     }
 
     /**
@@ -108,7 +221,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
@@ -120,7 +233,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)
             }
@@ -129,7 +242,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)
             }
         }
@@ -137,7 +250,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) }
@@ -187,8 +300,8 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
     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 {
+            .doOnNext { pair ->
-                    if (it.first.isNotEmpty()) {
+                if (pair.first.isNotEmpty()) {
                     chapters.forEach { it.manga_id = manga.id }
                     insertChapters(chapters)
                 }
@@ -212,7 +325,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
@@ -237,10 +350,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
                 }
@@ -248,10 +361,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()
         }
     }
@@ -263,13 +374,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 {
@@ -297,17 +408,22 @@ 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
                 for (dbTrack in dbTracks) {
                     if (track.sync_id == dbTrack.sync_id) {
                         // The sync is already in the db, only update its fields
-                    if (track.remote_id != dbTrack.remote_id) {
+                        if (track.media_id != dbTrack.media_id) {
-                        dbTrack.remote_id = track.remote_id
+                            dbTrack.media_id = track.media_id
                         }
-                    dbTrack.last_chapter_read = Math.max(dbTrack.last_chapter_read, track.last_chapter_read)
+                        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
@@ -319,8 +435,9 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
                     trackToUpdate.add(track)
                 }
             }
+        }
         // Update database
-        if (!trackToUpdate.isEmpty()) {
+        if (trackToUpdate.isNotEmpty()) {
             databaseHelper.insertTracks(trackToUpdate).executeAsBlocking()
         }
     }
@@ -336,8 +453,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)
@@ -361,32 +479,29 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
      *
      * @return [Manga], null if not found
      */
-    internal fun getMangaFromDatabase(manga: Manga): Manga? {
+    internal fun getMangaFromDatabase(manga: Manga): Manga? =
-        return databaseHelper.getManga(manga.url, manga.source).executeAsBlocking()
+        databaseHelper.getManga(manga.url, manga.source).executeAsBlocking()
-    }
 
     /**
      * Returns list containing manga from library
      *
      * @return [Manga] from library
      */
-    internal fun getFavoriteManga(): List<Manga> {
+    internal fun getFavoriteManga(): List<Manga> =
-        return databaseHelper.getFavoriteMangas().executeAsBlocking()
+        databaseHelper.getFavoriteMangas().executeAsBlocking()
-    }
 
     /**
      * Inserts manga and returns id
      *
      * @return id of [Manga], null if not found
      */
-    internal fun insertManga(manga: Manga): Long? {
+    internal fun insertManga(manga: Manga): Long? =
-        return databaseHelper.insertManga(manga).executeAsBlocking().insertedId()
+        databaseHelper.insertManga(manga).executeAsBlocking().insertedId()
-    }
 
     /**
      * Inserts list of chapters
      */
-    internal fun insertChapters(chapters: List<Chapter>) {
+    private fun insertChapters(chapters: List<Chapter>) {
         databaseHelper.updateChaptersBackup(chapters).executeAsBlocking()
     }
 
@@ -395,7 +510,5 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
      *
      * @return number of backups selected by user
      */
-    fun numberOfBackups(): Int {
+    fun numberOfBackups(): Int = preferences.numberOfBackups().get()
-        return preferences.numberOfBackups().getOrDefault()
-    }
 }

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

@@ -0,0 +1,161 @@
+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
+
+internal 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))
+
+            if (unifile.filePath != null) {
+                setContentText(unifile.filePath)
+            }
+
+            // 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

@@ -4,10 +4,13 @@ import android.app.Service
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
 import android.os.IBinder
 import android.os.PowerManager
 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
@@ -20,24 +23,32 @@ import eu.kanade.tachiyomi.data.backup.models.Backup.TRACK
 import eu.kanade.tachiyomi.data.backup.models.Backup.VERSION
 import eu.kanade.tachiyomi.data.backup.models.DHistory
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
-import eu.kanade.tachiyomi.data.database.models.*
+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.data.notification.Notifications
+import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.source.Source
-import eu.kanade.tachiyomi.util.chop
+import eu.kanade.tachiyomi.util.chapter.NoChaptersException
-import eu.kanade.tachiyomi.util.isServiceRunning
+import eu.kanade.tachiyomi.util.system.acquireWakeLock
-import eu.kanade.tachiyomi.util.sendLocalBroadcast
+import eu.kanade.tachiyomi.util.system.isServiceRunning
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
 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.*
+import java.util.Date
-import java.util.concurrent.ExecutorService
+import java.util.Locale
-import java.util.concurrent.Executors
 
 /**
- * Restores backup from json file
+ * Restores backup from a JSON file.
  */
 class BackupRestoreService : Service() {
 
@@ -49,9 +60,8 @@ class BackupRestoreService : Service() {
          * @param context the application context.
          * @return true if the service is running, false otherwise.
          */
-        fun isRunning(context: Context): Boolean {
+        fun isRunning(context: Context): Boolean =
-            return context.isServiceRunning(BackupRestoreService::class.java)
+            context.isServiceRunning(BackupRestoreService::class.java)
-        }
 
         /**
          * Starts a service to restore a backup from Json
@@ -64,7 +74,11 @@ class BackupRestoreService : Service() {
                 val intent = Intent(context, BackupRestoreService::class.java).apply {
                     putExtra(BackupConst.EXTRA_URI, uri)
                 }
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
                     context.startService(intent)
+                } else {
+                    context.startForegroundService(intent)
+                }
             }
         }
 
@@ -75,6 +89,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))
         }
     }
 
@@ -83,10 +99,7 @@ class BackupRestoreService : Service() {
      */
     private lateinit var wakeLock: PowerManager.WakeLock
 
-    /**
+    private var job: Job? = null
-     * Subscription where the update is done.
-     */
-    private var subscription: Subscription? = null
 
     /**
      * The progress of a backup restore
@@ -98,53 +111,53 @@ class BackupRestoreService : Service() {
      */
     private var restoreAmount = 0
 
+    /**
+     * Mapping of source ID to source name from backup data
+     */
+    private var sourceMapping: Map<Long, String> = emptyMap()
+
     /**
      * List containing errors
      */
     private val errors = mutableListOf<Pair<Date, String>>()
 
-    /**
-     * Backup manager
-     */
     private lateinit var backupManager: BackupManager
+    private lateinit var notifier: BackupNotifier
 
-    /**
-     * Database
-     */
     private val db: DatabaseHelper by injectLazy()
 
-    lateinit var executor: ExecutorService
+    private val trackManager: TrackManager by injectLazy()
 
-    /**
-     * 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() {
+        job?.cancel()
         if (wakeLock.isHeld) {
             wakeLock.release()
         }
-        super.onDestroy()
     }
 
     /**
      * This method needs to be implemented, but it's not used/needed.
      */
-    override fun onBind(intent: Intent): IBinder? {
+    override fun onBind(intent: Intent): IBinder? = null
-        return null
-    }
 
     /**
      * Method called when the service receives an intent.
@@ -155,35 +168,40 @@ 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 uri = intent.getParcelableExtra<Uri>(BackupConst.EXTRA_URI)
+        // Cancel any previous job if needed.
+        job?.cancel()
+        val handler = CoroutineExceptionHandler { _, exception ->
+            Timber.e(exception)
+            writeErrorLog()
 
-        // Unsubscribe from any previous subscription if needed.
+            notifier.showRestoreError(exception.message)
-        subscription?.unsubscribe()
 
-        subscription = Observable.using(
+            stopSelf(startId)
-                { db.lowLevel().beginTransaction() },
+        }
-                { getRestoreObservable(uri).doOnNext{ db.lowLevel().setTransactionSuccessful() } },
+        job = GlobalScope.launch(handler) {
-                { executor.execute { db.lowLevel().endTransaction() } })
+            if (!restoreBackup(uri)) {
-                .doAfterTerminate { stopSelf(startId) }
+                notifier.showRestoreError(getString(R.string.restoring_backup_canceled))
-                .subscribeOn(Schedulers.from(executor))
+            }
-                .subscribe()
+        }
+        job?.invokeOnCompletion {
+            stopSelf(startId)
+        }
 
-        return Service.START_NOT_STICKY
+        return START_NOT_STICKY
     }
 
     /**
-     * Returns an [Observable] containing restore process.
+     * Restores data from backup file.
      *
-     * @param uri restore file
+     * @param uri backup file to restore
-     * @return [Observable<Manga>]
      */
-    private fun getRestoreObservable(uri: Uri): Observable<List<Manga>> {
+    private fun restoreBackup(uri: Uri): Boolean {
         val startTime = System.currentTimeMillis()
 
-        val reader = JsonReader(contentResolver.openInputStream(uri).bufferedReader())
+        val reader = JsonReader(contentResolver.openInputStream(uri)!!.bufferedReader())
-        val json = JsonParser().parse(reader).asJsonObject
+        val json = JsonParser.parseReader(reader).asJsonObject
 
         // Get parser version
         val version = json.get(VERSION)?.asInt ?: 1
@@ -198,57 +216,236 @@ class BackupRestoreService : Service() {
         errors.clear()
 
         // Restore categories
-        json.get(CATEGORIES)?.let {
+        json.get(CATEGORIES)?.let { restoreCategories(it) }
-            backupManager.restoreCategories(it.asJsonArray)
+
-            restoreProgress += 1
+        // Store source mapping for error messages
-            showRestoreProgress(restoreProgress, restoreAmount, "Categories added", errors.size)
+        sourceMapping = BackupRestoreValidator.getSourceMapping(json)
+
+        // Restore individual manga
+        mangasJson.forEach {
+            if (job?.isActive != true) {
+                return false
             }
 
-        return Observable.from(mangasJson)
+            restoreManga(it.asJsonObject)
-                .concatMap {
+        }
-                    val obj = it.asJsonObject
+
-                    val manga = backupManager.parser.fromJson<MangaImpl>(obj.get(MANGA))
+        val endTime = System.currentTimeMillis()
-                    val chapters = backupManager.parser.fromJson<List<ChapterImpl>>(obj.get(CHAPTERS) ?: JsonArray())
+        val time = endTime - startTime
-                    val categories = backupManager.parser.fromJson<List<String>>(obj.get(CATEGORIES) ?: JsonArray())
+
-                    val history = backupManager.parser.fromJson<List<DHistory>>(obj.get(HISTORY) ?: JsonArray())
+        val logFile = writeErrorLog()
-                    val tracks = backupManager.parser.fromJson<List<TrackImpl>>(obj.get(TRACK) ?: JsonArray())
+
+        notifier.showRestoreComplete(time, errors.size, logFile.parent, logFile.name)
+        return true
+    }
+
+    private fun restoreCategories(categoriesJson: JsonElement) {
+        db.inTransaction {
+            backupManager.restoreCategories(categoriesJson.asJsonArray)
+        }
 
-                    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, getString(R.string.categories))
-                        showRestoreProgress(restoreProgress, restoreAmount, manga.title, errors.size, content)
+    }
+
+    private fun restoreManga(mangaJson: JsonObject) {
+        val manga = backupManager.parser.fromJson<MangaImpl>(mangaJson.get(MANGA))
+        val chapters = backupManager.parser.fromJson<List<ChapterImpl>>(
+            mangaJson.get(CHAPTERS)
+                ?: JsonArray()
+        )
+        val categories = backupManager.parser.fromJson<List<String>>(
+            mangaJson.get(CATEGORIES)
+                ?: JsonArray()
+        )
+        val history = backupManager.parser.fromJson<List<DHistory>>(
+            mangaJson.get(HISTORY)
+                ?: JsonArray()
+        )
+        val tracks = backupManager.parser.fromJson<List<TrackImpl>>(
+            mangaJson.get(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} - ${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)
                 }
             }
-                .toList()
             .doOnNext {
-                    val endTime = System.currentTimeMillis()
+                restoreExtraForManga(it, categories, history, tracks)
-                    val time = endTime - startTime
+            }
-                    val logFile = writeErrorLog()
+            .flatMap { manga ->
-                    val completeIntent = Intent(BackupConst.INTENT_FILTER).apply {
+                trackingFetchObservable(manga, tracks)
-                        putExtra(BackupConst.EXTRA_TIME, time)
+            }
-                        putExtra(BackupConst.EXTRA_ERRORS, errors.size)
+            .subscribe()
-                        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)
 
+    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)
     }
-                .doOnError { error ->
+
-                    Timber.e(error)
+    /**
-                    writeErrorLog()
+     * [Observable] that fetches chapter information
-                    val errorIntent = Intent(BackupConst.INTENT_FILTER).apply {
+     *
-                        putExtra(BackupConst.ACTION, BackupConst.ACTION_ERROR_RESTORE_DIALOG)
+     * @param source source of manga
-                        putExtra(BackupConst.EXTRA_ERROR_MESSAGE, error.message)
+     * @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 {
+                val errorMessage = if (it is NoChaptersException) {
+                    getString(R.string.no_chapters_error)
+                } else {
+                    it.message
                 }
-                    sendLocalBroadcast(errorIntent)
+                errors.add(Date() to "${manga.title} - $errorMessage")
+                Pair(emptyList(), emptyList())
             }
-                .onErrorReturn { 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)
+            .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} - ${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
+     */
+    private fun showRestoreProgress(
+        progress: Int,
+        amount: Int,
+        title: String
+    ) {
+        notifier.showRestoreProgress(title, progress, amount)
     }
 
     /**
@@ -257,7 +454,7 @@ class BackupRestoreService : Service() {
     private fun writeErrorLog(): File {
         try {
             if (errors.isNotEmpty()) {
-                val destFile = File(externalCacheDir, "tachiyomi_restore.log")
+                val destFile = File(externalCacheDir, "tachiyomi_restore.txt")
                 val sdf = SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.getDefault())
 
                 destFile.bufferedWriter().use { out ->
@@ -272,135 +469,4 @@ class BackupRestoreService : Service() {
         }
         return File("")
     }
-
-    /**
-     * 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.get(manga.source) ?: return null
-        val dbManga = backupManager.getMangaFromDatabase(manga)
-
-        if (dbManga == null) {
-            // Manga not in database
-            return 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
-            return mangaNoFetchObservable(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 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 { manga ->
-                    chapterFetchObservable(source, manga, chapters)
-                            // Convert to the manga that contains new chapters.
-                            .map { manga }
-                }
-                .doOnNext {
-                    // Restore categories
-                    backupManager.restoreCategoriesForManga(it, categories)
-
-                    // Restore history
-                    backupManager.restoreHistoryForManga(history)
-
-                    // Restore tracking
-                    backupManager.restoreTrackForManga(it, tracks)
-                }
-                .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 {
-                    // Restore categories
-                    backupManager.restoreCategoriesForManga(it, categories)
-
-                    // Restore history
-                    backupManager.restoreHistoryForManga(history)
-
-                    // Restore tracking
-                    backupManager.restoreTrackForManga(it, tracks)
-                }
-                .doOnCompleted {
-                    restoreProgress += 1
-                    showRestoreProgress(restoreProgress, restoreAmount, backupManga.title, errors.size)
-                }
-    }
-
-    /**
-     * [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<Chapter>(), emptyList<Chapter>())
-                }
-    }
-
-
-    /**
-     * 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/BackupRestoreValidator.kt

@@ -0,0 +1,72 @@
+package eu.kanade.tachiyomi.data.backup
+
+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.models.Backup
+import eu.kanade.tachiyomi.data.track.TrackManager
+import eu.kanade.tachiyomi.source.SourceManager
+import uy.kohesive.injekt.injectLazy
+
+object BackupRestoreValidator {
+
+    private val sourceManager: SourceManager by injectLazy()
+    private val trackManager: TrackManager by injectLazy()
+
+    /**
+     * Checks for critical backup file data.
+     *
+     * @throws Exception if version or manga cannot be found.
+     * @return List of missing sources or missing trackers.
+     */
+    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)
+    }
+
+    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()
+    }
+
+    data class Results(val missingSources: List<String>, val missingTrackers: List<String>)
+}

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

@@ -1,7 +1,8 @@
 package eu.kanade.tachiyomi.data.backup.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/serializer/ChapterTypeAdapter.kt

@@ -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/serializer/TrackTypeAdapter.kt

@@ -11,9 +11,11 @@ import eu.kanade.tachiyomi.data.database.models.TrackImpl
 object TrackTypeAdapter {
 
     private const val SYNC = "s"
-    private const val REMOTE = "r"
+    private const val MEDIA = "r"
+    private const val LIBRARY = "ml"
     private const val TITLE = "t"
     private const val LAST_READ = "l"
+    private const val TRACKING_URL = "u"
 
     fun build(): TypeAdapter<TrackImpl> {
         return typeAdapter {
@@ -23,10 +25,14 @@ object TrackTypeAdapter {
                 value(it.title)
                 name(SYNC)
                 value(it.sync_id)
-                name(REMOTE)
+                name(MEDIA)
-                value(it.remote_id)
+                value(it.media_id)
+                name(LIBRARY)
+                value(it.library_id)
                 name(LAST_READ)
                 value(it.last_chapter_read)
+                name(TRACKING_URL)
+                value(it.tracking_url)
                 endObject()
             }
 
@@ -35,13 +41,13 @@ 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()
-                            REMOTE -> track.remote_id = nextInt()
+                            MEDIA -> track.media_id = nextInt()
+                            LIBRARY -> track.library_id = nextLong()
                             LAST_READ -> track.last_chapter_read = nextInt()
+                            TRACKING_URL -> track.tracking_url = nextString()
                         }
                     }
                 }

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,22 +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()
 
-    /** Parent directory of the cache. Ensure not null and not root directory or fallback
-     * to internal cache directory. **/
-    private val basePath = context.externalCacheDir?.takeIf { it.absolutePath.length > 1 }
-            ?: context.cacheDir
-
     /** Cache class used for cache management.  */
-    private val diskCache = DiskLruCache.open(File(basePath, PARAMETER_CACHE_DIRECTORY),
+    private val diskCache = DiskLruCache.open(
+        File(context.cacheDir, PARAMETER_CACHE_DIRECTORY),
         PARAMETER_APP_VERSION,
         PARAMETER_VALUE_COUNT,
-            PARAMETER_CACHE_SIZE)
+        PARAMETER_CACHE_SIZE
+    )
 
     /**
      * Returns directory of cache.
@@ -81,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.substring(0, file.lastIndexOf("."))
+            val key = file.substringBeforeLast(".")
             // Remove file from cache.
-            return diskCache.remove(key)
+            diskCache.remove(key)
-        } catch (e: IOException) {
+        } catch (e: Exception) {
-            return false
+            false
         }
     }
 
@@ -131,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()
             }
@@ -139,7 +138,6 @@ class ChapterCache(private val context: Context) {
             diskCache.flush()
             editor.commit()
             editor.abortUnlessCommitted()
-
         } catch (e: Exception) {
             // Ignore.
         } finally {
@@ -154,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
         }
     }
 
@@ -191,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()
         }
     }
@@ -205,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,50 +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)
+
+    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.
+     * @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,19 +1,41 @@
 package eu.kanade.tachiyomi.data.database
 
 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)
+        .callback(DbOpenCallback())
+        .build()
 
     override val db = DefaultStorIOSQLite.builder()
-            .sqliteOpenHelper(DbOpenHelper(context))
+        .sqliteOpenHelper(RequerySQLiteOpenHelperFactory().create(configuration))
         .addTypeMapping(Manga::class.java, MangaTypeMapping())
         .addTypeMapping(Chapter::class.java, ChapterTypeMapping())
         .addTypeMapping(Track::class.java, TrackTypeMapping())
@@ -23,7 +45,4 @@ open class DatabaseHelper(context: Context)
         .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

@@ -0,0 +1,90 @@
+package eu.kanade.tachiyomi.data.database
+
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.sqlite.db.SupportSQLiteOpenHelper
+import eu.kanade.tachiyomi.data.database.tables.CategoryTable
+import eu.kanade.tachiyomi.data.database.tables.ChapterTable
+import eu.kanade.tachiyomi.data.database.tables.HistoryTable
+import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable
+import eu.kanade.tachiyomi.data.database.tables.MangaTable
+import eu.kanade.tachiyomi.data.database.tables.TrackTable
+
+class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
+
+    companion object {
+        /**
+         * Name of the database file.
+         */
+        const val DATABASE_NAME = "tachiyomi.db"
+
+        /**
+         * Version of the database.
+         */
+        const val DATABASE_VERSION = 11
+    }
+
+    override fun onCreate(db: SupportSQLiteDatabase) = with(db) {
+        execSQL(MangaTable.createTableQuery)
+        execSQL(ChapterTable.createTableQuery)
+        execSQL(TrackTable.createTableQuery)
+        execSQL(CategoryTable.createTableQuery)
+        execSQL(MangaCategoryTable.createTableQuery)
+        execSQL(HistoryTable.createTableQuery)
+
+        // DB indexes
+        execSQL(MangaTable.createUrlIndexQuery)
+        execSQL(MangaTable.createLibraryIndexQuery)
+        execSQL(ChapterTable.createMangaIdIndexQuery)
+        execSQL(ChapterTable.createUnreadChaptersIndexQuery)
+        execSQL(HistoryTable.createChapterIdIndexQuery)
+    }
+
+    override fun onUpgrade(db: SupportSQLiteDatabase, oldVersion: Int, newVersion: Int) {
+        if (oldVersion < 2) {
+            db.execSQL(ChapterTable.sourceOrderUpdateQuery)
+
+            // Fix kissmanga covers after supporting cloudflare
+            db.execSQL(
+                """UPDATE mangas SET thumbnail_url =
+                    REPLACE(thumbnail_url, '93.174.95.110', 'kissmanga.com') WHERE source = 4"""
+            )
+        }
+        if (oldVersion < 3) {
+            // Initialize history tables
+            db.execSQL(HistoryTable.createTableQuery)
+            db.execSQL(HistoryTable.createChapterIdIndexQuery)
+        }
+        if (oldVersion < 4) {
+            db.execSQL(ChapterTable.bookmarkUpdateQuery)
+        }
+        if (oldVersion < 5) {
+            db.execSQL(ChapterTable.addScanlator)
+        }
+        if (oldVersion < 6) {
+            db.execSQL(TrackTable.addTrackingUrl)
+        }
+        if (oldVersion < 7) {
+            db.execSQL(TrackTable.addLibraryId)
+        }
+        if (oldVersion < 8) {
+            db.execSQL("DROP INDEX IF EXISTS mangas_favorite_index")
+            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/DbOpenHelper.kt

@@ -1,63 +0,0 @@
-package eu.kanade.tachiyomi.data.database
-
-import android.content.Context
-import android.database.sqlite.SQLiteDatabase
-import android.database.sqlite.SQLiteOpenHelper
-import eu.kanade.tachiyomi.data.database.tables.*
-
-class DbOpenHelper(context: Context)
-: SQLiteOpenHelper(context, DATABASE_NAME, null, DATABASE_VERSION) {
-
-    companion object {
-        /**
-         * Name of the database file.
-         */
-        const val DATABASE_NAME = "tachiyomi.db"
-
-        /**
-         * Version of the database.
-         */
-        const val DATABASE_VERSION = 5
-    }
-
-    override fun onCreate(db: SQLiteDatabase) = with(db) {
-        execSQL(MangaTable.createTableQuery)
-        execSQL(ChapterTable.createTableQuery)
-        execSQL(TrackTable.createTableQuery)
-        execSQL(CategoryTable.createTableQuery)
-        execSQL(MangaCategoryTable.createTableQuery)
-        execSQL(HistoryTable.createTableQuery)
-
-        // DB indexes
-        execSQL(MangaTable.createUrlIndexQuery)
-        execSQL(MangaTable.createFavoriteIndexQuery)
-        execSQL(ChapterTable.createMangaIdIndexQuery)
-        execSQL(HistoryTable.createChapterIdIndexQuery)
-    }
-
-    override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
-        if (oldVersion < 2) {
-            db.execSQL(ChapterTable.sourceOrderUpdateQuery)
-
-            // Fix kissmanga covers after supporting cloudflare
-            db.execSQL("""UPDATE mangas SET thumbnail_url =
-                    REPLACE(thumbnail_url, '93.174.95.110', 'kissmanga.com') WHERE source = 4""")
-        }
-        if (oldVersion < 3) {
-            // Initialize history tables
-            db.execSQL(HistoryTable.createTableQuery)
-            db.execSQL(HistoryTable.createChapterIdIndexQuery)
-        }
-        if (oldVersion < 4) {
-            db.execSQL(ChapterTable.bookmarkUpdateQuery)
-        }
-        if (oldVersion < 5) {
-            db.execSQL(ChapterTable.addScanlator)
-        }
-    }
-
-    override fun onConfigure(db: SQLiteDatabase) {
-        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/ChapterTypeMapping.kt

@@ -85,4 +85,3 @@ class ChapterDeleteResolver : DefaultDeleteResolver<Chapter>() {
         .whereArgs(obj.id)
         .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
@@ -46,7 +48,7 @@ class MangaPutResolver : DefaultPutResolver<Manga>() {
         .whereArgs(obj.id)
         .build()
 
-    override fun mapToContentValues(obj: Manga) = ContentValues(15).apply {
+    override fun mapToContentValues(obj: Manga) = ContentValues(17).apply {
         put(COL_ID, obj.id)
         put(COL_SOURCE, obj.source)
         put(COL_URL, obj.url)
@@ -62,12 +64,13 @@ 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)
     }
 }
 
-open class MangaGetResolver : DefaultGetResolver<Manga>() {
+interface BaseMangaGetResolver {
-
+    fun mapBaseFromCursor(manga: Manga, cursor: Cursor) = manga.apply {
-    override fun mapFromCursor(cursor: Cursor): Manga = MangaImpl().apply {
         id = cursor.getLong(cursor.getColumnIndex(COL_ID))
         source = cursor.getLong(cursor.getColumnIndex(COL_SOURCE))
         url = cursor.getString(cursor.getColumnIndex(COL_URL))
@@ -83,6 +86,15 @@ open class MangaGetResolver : DefaultGetResolver<Manga>() {
         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))
+    }
+}
+
+open class MangaGetResolver : DefaultGetResolver<Manga>(), BaseMangaGetResolver {
+
+    override fun mapFromCursor(cursor: Cursor): Manga {
+        return mapBaseFromCursor(MangaImpl(), cursor)
     }
 }
 

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

@@ -11,15 +11,19 @@ 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_REMOTE_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
 import eu.kanade.tachiyomi.data.database.tables.TrackTable.COL_TOTAL_CHAPTERS
+import eu.kanade.tachiyomi.data.database.tables.TrackTable.COL_TRACKING_URL
 import eu.kanade.tachiyomi.data.database.tables.TrackTable.TABLE
 
 class TrackTypeMapping : SQLiteTypeMapping<Track>(
@@ -40,16 +44,20 @@ class TrackPutResolver : DefaultPutResolver<Track>() {
         .whereArgs(obj.id)
         .build()
 
-    override fun mapToContentValues(obj: Track) = ContentValues(9).apply {
+    override fun mapToContentValues(obj: Track) = ContentValues(10).apply {
         put(COL_ID, obj.id)
         put(COL_MANGA_ID, obj.manga_id)
         put(COL_SYNC_ID, obj.sync_id)
-        put(COL_REMOTE_ID, obj.remote_id)
+        put(COL_MEDIA_ID, obj.media_id)
+        put(COL_LIBRARY_ID, obj.library_id)
         put(COL_TITLE, obj.title)
         put(COL_LAST_CHAPTER_READ, obj.last_chapter_read)
         put(COL_TOTAL_CHAPTERS, obj.total_chapters)
         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)
     }
 }
 
@@ -59,12 +67,16 @@ class TrackGetResolver : DefaultGetResolver<Track>() {
         id = cursor.getLong(cursor.getColumnIndex(COL_ID))
         manga_id = cursor.getLong(cursor.getColumnIndex(COL_MANGA_ID))
         sync_id = cursor.getInt(cursor.getColumnIndex(COL_SYNC_ID))
-        remote_id = cursor.getInt(cursor.getColumnIndex(COL_REMOTE_ID))
+        media_id = cursor.getInt(cursor.getColumnIndex(COL_MEDIA_ID))
+        library_id = cursor.getLong(cursor.getColumnIndex(COL_LIBRARY_ID))
         title = cursor.getString(cursor.getColumnIndex(COL_TITLE))
         last_chapter_read = cursor.getInt(cursor.getColumnIndex(COL_LAST_CHAPTER_READ))
         total_chapters = cursor.getInt(cursor.getColumnIndex(COL_TOTAL_CHAPTERS))
         status = cursor.getInt(cursor.getColumnIndex(COL_STATUS))
         score = cursor.getFloat(cursor.getColumnIndex(COL_SCORE))
+        tracking_url = cursor.getString(cursor.getColumnIndex(COL_TRACKING_URL))
+        started_reading_date = cursor.getLong(cursor.getColumnIndex(COL_START_DATE))
+        finished_reading_date = cursor.getLong(cursor.getColumnIndex(COL_FINISH_DATE))
     }
 }
 

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/LibraryManga.kt

@@ -0,0 +1,8 @@
+package eu.kanade.tachiyomi.data.database.models
+
+class LibraryManga : MangaImpl() {
+
+    var unread: Int = 0
+
+    var category: Int = 0
+}

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

@@ -12,26 +12,30 @@ interface Manga : SManga {
 
     var last_update: Long
 
+    var date_added: Long
+
     var viewer: Int
 
     var chapter_flags: Int
 
-    var unread: Int
+    var cover_last_modified: Long
-
-    var category: Int
 
     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
@@ -76,7 +80,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
@@ -92,5 +97,4 @@ interface Manga : SManga {
             this.source = source
         }
     }
-
 }

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/MangaImpl.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.data.database.models
 
-class MangaImpl : Manga {
+open class MangaImpl : Manga {
 
     override var id: Long? = null
 
@@ -26,28 +26,26 @@ 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
 
-    @Transient override var unread: Int = 0
+    override var cover_last_modified: Long = 0
-
-    @Transient override var category: Int = 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

@@ -10,7 +10,9 @@ interface Track : Serializable {
 
     var sync_id: Int
 
-    var remote_id: Int
+    var media_id: Int
+
+    var library_id: Long?
 
     var title: String
 
@@ -22,17 +24,23 @@ 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 {
-
         fun create(serviceId: Int): Track = TrackImpl().apply {
             sync_id = serviceId
         }
     }
-
 }

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

@@ -8,7 +8,9 @@ class TrackImpl : Track {
 
     override var sync_id: Int = 0
 
-    override var remote_id: Int = 0
+    override var media_id: Int = 0
+
+    override var library_id: Long? = null
 
     override lateinit var title: String
 
@@ -20,6 +22,12 @@ 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 {
         if (this === other) return true
         if (other == null || javaClass != other.javaClass) return false
@@ -28,14 +36,13 @@ class TrackImpl : Track {
 
         if (manga_id != other.manga_id) return false
         if (sync_id != other.sync_id) return false
-        return remote_id == other.remote_id
+        return media_id == other.media_id
     }
 
     override fun hashCode(): Int {
         var result = (manga_id xor manga_id.ushr(32)).toInt()
         result = 31 * result + sync_id
-        result = 31 * result + remote_id
+        result = 31 * result + media_id
         return result
     }
-
 }

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

@@ -11,18 +11,22 @@ interface CategoryQueries : DbProvider {
 
     fun getCategories() = db.get()
         .listOfObjects(Category::class.java)
-            .withQuery(Query.builder()
+        .withQuery(
+            Query.builder()
                 .table(CategoryTable.TABLE)
                 .orderBy(CategoryTable.COL_ORDER)
-                    .build())
+                .build()
+        )
         .prepare()
 
     fun getCategoriesForManga(manga: Manga) = db.get()
         .listOfObjects(Category::class.java)
-            .withQuery(RawQuery.builder()
+        .withQuery(
+            RawQuery.builder()
                 .query(getCategoriesForMangaQuery())
                 .args(manga.id)
-                    .build())
+                .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)
-            .withQuery(Query.builder()
+        .withQuery(
+            Query.builder()
                 .table(ChapterTable.TABLE)
                 .where("${ChapterTable.COL_MANGA_ID} = ?")
                 .whereArgs(manga.id)
-                    .build())
+                .build()
+        )
         .prepare()
 
     fun getRecentChapters(date: Date) = db.get()
         .listOfObjects(MangaChapter::class.java)
-            .withQuery(RawQuery.builder()
+        .withQuery(
+            RawQuery.builder()
                 .query(getRecentsQuery())
                 .args(date.time)
                 .observesTables(ChapterTable.TABLE)
-                    .build())
+                .build()
+        )
         .withGetResolver(MangaChapterGetResolver.INSTANCE)
         .prepare()
 
     fun getChapter(id: Long) = db.get()
         .`object`(Chapter::class.java)
-            .withQuery(Query.builder()
+        .withQuery(
+            Query.builder()
                 .table(ChapterTable.TABLE)
                 .where("${ChapterTable.COL_ID} = ?")
                 .whereArgs(id)
-                    .build())
+                .build()
+        )
         .prepare()
 
     fun getChapter(url: String) = db.get()
         .`object`(Chapter::class.java)
-            .withQuery(Query.builder()
+        .withQuery(
+            Query.builder()
                 .table(ChapterTable.TABLE)
                 .where("${ChapterTable.COL_URL} = ?")
                 .whereArgs(url)
-                    .build())
+                .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()
 
@@ -80,5 +98,4 @@ interface ChapterQueries : DbProvider {
         .objects(chapters)
         .withPutResolver(ChapterSourceOrderPutResolver())
         .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 {
 
@@ -24,30 +24,36 @@ interface HistoryQueries : DbProvider {
      */
     fun getRecentManga(date: Date) = db.get()
         .listOfObjects(MangaChapterHistory::class.java)
-            .withQuery(RawQuery.builder()
+        .withQuery(
+            RawQuery.builder()
                 .query(getRecentMangasQuery())
                 .args(date.time)
                 .observesTables(HistoryTable.TABLE)
-                    .build())
+                .build()
+        )
         .withGetResolver(MangaChapterHistoryGetResolver.INSTANCE)
         .prepare()
 
     fun getHistoryByMangaId(mangaId: Long) = db.get()
         .listOfObjects(History::class.java)
-            .withQuery(RawQuery.builder()
+        .withQuery(
+            RawQuery.builder()
                 .query(getHistoryByMangaId())
                 .args(mangaId)
                 .observesTables(HistoryTable.TABLE)
-                    .build())
+                .build()
+        )
         .prepare()
 
     fun getHistoryByChapterUrl(chapterUrl: String) = db.get()
         .`object`(History::class.java)
-            .withQuery(RawQuery.builder()
+        .withQuery(
+            RawQuery.builder()
                 .query(getHistoryByChapterUrl())
                 .args(chapterUrl)
                 .observesTables(HistoryTable.TABLE)
-                    .build())
+                .build()
+        )
         .prepare()
 
     /**
@@ -71,16 +77,20 @@ interface HistoryQueries : DbProvider {
         .prepare()
 
     fun deleteHistory() = db.delete()
-            .byQuery(DeleteQuery.builder()
+        .byQuery(
+            DeleteQuery.builder()
                 .table(HistoryTable.TABLE)
-                    .build())
+                .build()
+        )
         .prepare()
 
     fun deleteHistoryNoLastRead() = db.delete()
-            .byQuery(DeleteQuery.builder()
+        .byQuery(
+            DeleteQuery.builder()
                 .table(HistoryTable.TABLE)
                 .where("${HistoryTable.COL_LAST_READ} = ?")
                 .whereArgs(0)
-                    .build())
+                .build()
+        )
         .prepare()
 }

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

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

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

@@ -4,10 +4,15 @@ import com.pushtorefresh.storio.sqlite.queries.DeleteQuery
 import com.pushtorefresh.storio.sqlite.queries.Query
 import com.pushtorefresh.storio.sqlite.queries.RawQuery
 import eu.kanade.tachiyomi.data.database.DbProvider
+import eu.kanade.tachiyomi.data.database.models.LibraryManga
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.database.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
@@ -17,46 +22,56 @@ interface MangaQueries : DbProvider {
 
     fun getMangas() = db.get()
         .listOfObjects(Manga::class.java)
-            .withQuery(Query.builder()
+        .withQuery(
+            Query.builder()
                 .table(MangaTable.TABLE)
-                    .build())
+                .build()
+        )
         .prepare()
 
     fun getLibraryMangas() = db.get()
-            .listOfObjects(Manga::class.java)
+        .listOfObjects(LibraryManga::class.java)
-            .withQuery(RawQuery.builder()
+        .withQuery(
+            RawQuery.builder()
                 .query(libraryQuery)
                 .observesTables(MangaTable.TABLE, ChapterTable.TABLE, MangaCategoryTable.TABLE, CategoryTable.TABLE)
-                    .build())
+                .build()
+        )
         .withGetResolver(LibraryMangaGetResolver.INSTANCE)
         .prepare()
 
     fun getFavoriteMangas() = db.get()
         .listOfObjects(Manga::class.java)
-            .withQuery(Query.builder()
+        .withQuery(
+            Query.builder()
                 .table(MangaTable.TABLE)
                 .where("${MangaTable.COL_FAVORITE} = ?")
                 .whereArgs(1)
                 .orderBy(MangaTable.COL_TITLE)
-                    .build())
+                .build()
+        )
         .prepare()
 
     fun getManga(url: String, sourceId: Long) = db.get()
         .`object`(Manga::class.java)
-            .withQuery(Query.builder()
+        .withQuery(
+            Query.builder()
                 .table(MangaTable.TABLE)
                 .where("${MangaTable.COL_URL} = ? AND ${MangaTable.COL_SOURCE} = ?")
                 .whereArgs(url, sourceId)
-                    .build())
+                .build()
+        )
         .prepare()
 
     fun getManga(id: Long) = db.get()
         .`object`(Manga::class.java)
-            .withQuery(Query.builder()
+        .withQuery(
+            Query.builder()
                 .table(MangaTable.TABLE)
                 .where("${MangaTable.COL_ID} = ?")
                 .whereArgs(id)
-                    .build())
+                .build()
+        )
         .prepare()
 
     fun insertManga(manga: Manga) = db.put().`object`(manga).prepare()
@@ -73,32 +88,75 @@ interface MangaQueries : DbProvider {
         .withPutResolver(MangaLastUpdatedPutResolver())
         .prepare()
 
+    fun updateMangaFavorite(manga: Manga) = db.put()
+        .`object`(manga)
+        .withPutResolver(MangaFavoritePutResolver())
+        .prepare()
+
+    fun updateMangaViewer(manga: Manga) = db.put()
+        .`object`(manga)
+        .withPutResolver(MangaViewerPutResolver())
+        .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(
+            DeleteQuery.builder()
                 .table(MangaTable.TABLE)
                 .where("${MangaTable.COL_FAVORITE} = ?")
                 .whereArgs(0)
-                    .build())
+                .build()
+        )
         .prepare()
 
     fun deleteMangas() = db.delete()
-            .byQuery(DeleteQuery.builder()
+        .byQuery(
+            DeleteQuery.builder()
                 .table(MangaTable.TABLE)
-                    .build())
+                .build()
+        )
         .prepare()
 
     fun getLastReadManga() = db.get()
         .listOfObjects(Manga::class.java)
-            .withQuery(RawQuery.builder()
+        .withQuery(
+            RawQuery.builder()
                 .query(getLastReadMangaQuery())
                 .observesTables(MangaTable.TABLE)
-                    .build())
+                .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
 """
 
@@ -47,7 +51,8 @@ fun getRecentsQuery() = """
  * and are read after the given time period
  * @return return limit is 25
  */
-fun getRecentMangasQuery() = """
+fun getRecentMangasQuery() =
+    """
     SELECT ${Manga.TABLE}.${Manga.COL_URL} as mangaUrl, ${Manga.TABLE}.*, ${Chapter.TABLE}.*, ${History.TABLE}.*
     FROM ${Manga.TABLE}
     JOIN ${Chapter.TABLE}
@@ -65,7 +70,8 @@ fun getRecentMangasQuery() = """
     LIMIT 25
 """
 
-fun getHistoryByMangaId() = """
+fun getHistoryByMangaId() =
+    """
     SELECT ${History.TABLE}.*
     FROM ${History.TABLE}
     JOIN ${Chapter.TABLE}
@@ -73,7 +79,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 +88,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 +101,8 @@ fun getLastReadMangaQuery() = """
     ORDER BY max DESC
 """
 
-fun getTotalChapterMangaQuery()= """
+fun getTotalChapterMangaQuery() =
+    """
     SELECT ${Manga.TABLE}.*
     FROM ${Manga.TABLE}
     JOIN ${Chapter.TABLE}
@@ -102,10 +111,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}

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

@@ -12,11 +12,13 @@ interface TrackQueries : DbProvider {
 
     fun getTracks(manga: Manga) = db.get()
         .listOfObjects(Track::class.java)
-            .withQuery(Query.builder()
+        .withQuery(
+            Query.builder()
                 .table(TrackTable.TABLE)
                 .where("${TrackTable.COL_MANGA_ID} = ?")
                 .whereArgs(manga.id)
-                    .build())
+                .build()
+        )
         .prepare()
 
     fun insertTrack(track: Track) = db.put().`object`(track).prepare()
@@ -24,11 +26,12 @@ interface TrackQueries : DbProvider {
     fun insertTracks(tracks: List<Track>) = db.put().objects(tracks).prepare()
 
     fun deleteTrackForManga(manga: Manga, sync: TrackService) = db.delete()
-            .byQuery(DeleteQuery.builder()
+        .byQuery(
+            DeleteQuery.builder()
                 .table(TrackTable.TABLE)
                 .where("${TrackTable.COL_MANGA_ID} = ? AND ${TrackTable.COL_SYNC_ID} = ?")
                 .whereArgs(manga.id, sync.id)
-                    .build())
+                .build()
+        )
         .prepare()
-
 }

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

@@ -30,6 +30,4 @@ class ChapterBackupPutResolver : PutResolver<Chapter>() {
         put(ChapterTable.COL_BOOKMARK, chapter.bookmark)
         put(ChapterTable.COL_LAST_PAGE_READ, chapter.last_page_read)
     }
-
 }
-

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

@@ -30,6 +30,4 @@ class ChapterProgressPutResolver : PutResolver<Chapter>() {
         put(ChapterTable.COL_BOOKMARK, chapter.bookmark)
         put(ChapterTable.COL_LAST_PAGE_READ, chapter.last_page_read)
     }
-
 }
-

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

@@ -28,5 +28,4 @@ class ChapterSourceOrderPutResolver : PutResolver<Chapter>() {
     fun mapToContentValues(chapter: Chapter) = ContentValues(1).apply {
         put(ChapterTable.COL_SOURCE_ORDER, chapter.source_order)
     }
-
 }

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

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.data.database.resolvers
 
 import android.content.ContentValues
-import android.support.annotation.NonNull
+import androidx.annotation.NonNull
 import com.pushtorefresh.storio.sqlite.StorIOSQLite
 import com.pushtorefresh.storio.sqlite.operations.put.PutResult
 import com.pushtorefresh.storio.sqlite.queries.Query
@@ -19,25 +19,25 @@ class HistoryLastReadPutResolver : HistoryPutResolver() {
     override fun performPut(@NonNull db: StorIOSQLite, @NonNull history: History): PutResult = db.inTransactionReturn {
         val updateQuery = mapToUpdateQuery(history)
 
-        val cursor = db.lowLevel().query(Query.builder()
+        val cursor = db.lowLevel().query(
+            Query.builder()
                 .table(updateQuery.table())
                 .where(updateQuery.where())
                 .whereArgs(updateQuery.whereArgs())
-                .build())
+                .build()
+        )
 
         val putResult: PutResult
 
-        try {
+        putResult = cursor.use { putCursor ->
-            if (cursor.count == 0) {
+            if (putCursor.count == 0) {
                 val insertQuery = mapToInsertQuery(history)
                 val insertedId = db.lowLevel().insert(insertQuery, mapToContentValues(history))
-                putResult = PutResult.newInsertResult(insertedId, insertQuery.table())
+                PutResult.newInsertResult(insertedId, insertQuery.table())
             } else {
                 val numberOfRowsUpdated = db.lowLevel().update(updateQuery, mapToUpdateContentValues(history))
-                putResult = PutResult.newUpdateResult(numberOfRowsUpdated, updateQuery.table())
+                PutResult.newUpdateResult(numberOfRowsUpdated, updateQuery.table())
             }
-        } finally {
-            cursor.close()
         }
 
         putResult
@@ -60,5 +60,4 @@ class HistoryLastReadPutResolver : HistoryPutResolver() {
     fun mapToUpdateContentValues(history: History) = ContentValues(1).apply {
         put(HistoryTable.COL_LAST_READ, history.last_read)
     }
-
 }

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

@@ -1,26 +1,24 @@
 package eu.kanade.tachiyomi.data.database.resolvers
 
 import android.database.Cursor
-import eu.kanade.tachiyomi.data.database.mappers.MangaGetResolver
+import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
-import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.mappers.BaseMangaGetResolver
+import eu.kanade.tachiyomi.data.database.models.LibraryManga
 import eu.kanade.tachiyomi.data.database.tables.MangaTable
 
-class LibraryMangaGetResolver : MangaGetResolver() {
+class LibraryMangaGetResolver : DefaultGetResolver<LibraryManga>(), BaseMangaGetResolver {
 
     companion object {
         val INSTANCE = LibraryMangaGetResolver()
     }
 
-    override fun mapFromCursor(cursor: Cursor): Manga {
+    override fun mapFromCursor(cursor: Cursor): LibraryManga {
-        val manga = super.mapFromCursor(cursor)
+        val manga = LibraryManga()
 
-        val unreadColumn = cursor.getColumnIndex(MangaTable.COL_UNREAD)
+        mapBaseFromCursor(manga, cursor)
-        manga.unread = cursor.getInt(unreadColumn)
+        manga.unread = cursor.getInt(cursor.getColumnIndex(MangaTable.COL_UNREAD))
-
+        manga.category = cursor.getInt(cursor.getColumnIndex(MangaTable.COL_CATEGORY))
-        val categoryColumn = cursor.getColumnIndex(MangaTable.COL_CATEGORY)
-        manga.category = cursor.getInt(categoryColumn)
 
         return manga
     }
-
 }

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

@@ -24,5 +24,4 @@ class MangaChapterGetResolver : DefaultGetResolver<MangaChapter>() {
 
         return MangaChapter(manga, chapter)
     }
-
 }

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

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

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

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

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

@@ -28,6 +28,4 @@ class MangaFlagsPutResolver : PutResolver<Manga>() {
     fun mapToContentValues(manga: Manga) = ContentValues(1).apply {
         put(MangaTable.COL_CHAPTER_FLAGS, manga.chapter_flags)
     }
-
 }
-

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

@@ -28,6 +28,4 @@ class MangaLastUpdatedPutResolver : PutResolver<Manga>() {
     fun mapToContentValues(manga: Manga) = ContentValues(1).apply {
         put(MangaTable.COL_LAST_UPDATE, manga.last_update)
     }
-
 }
-

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

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

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

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

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

@@ -13,11 +13,11 @@ object CategoryTable {
     const val COL_FLAGS = "flags"
 
     val createTableQuery: String
-        get() = """CREATE TABLE $TABLE(
+        get() =
+            """CREATE TABLE $TABLE(
             $COL_ID INTEGER NOT NULL PRIMARY KEY,
             $COL_NAME TEXT NOT NULL,
             $COL_ORDER INTEGER NOT NULL,
             $COL_FLAGS INTEGER NOT NULL
             )"""
-
 }

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

@@ -29,7 +29,8 @@ object ChapterTable {
     const val COL_SOURCE_ORDER = "source_order"
 
     val createTableQuery: String
-        get() = """CREATE TABLE $TABLE(
+        get() =
+            """CREATE TABLE $TABLE(
             $COL_ID INTEGER NOT NULL PRIMARY KEY,
             $COL_MANGA_ID INTEGER NOT NULL,
             $COL_URL TEXT NOT NULL,
@@ -49,6 +50,10 @@ object ChapterTable {
     val createMangaIdIndexQuery: String
         get() = "CREATE INDEX ${TABLE}_${COL_MANGA_ID}_index ON $TABLE($COL_MANGA_ID)"
 
+    val createUnreadChaptersIndexQuery: String
+        get() = "CREATE INDEX ${TABLE}_unread_by_manga_index ON $TABLE($COL_MANGA_ID, $COL_READ) " +
+            "WHERE $COL_READ = 0"
+
     val sourceOrderUpdateQuery: String
         get() = "ALTER TABLE $TABLE ADD COLUMN $COL_SOURCE_ORDER INTEGER DEFAULT 0"
 
@@ -57,5 +62,4 @@ object ChapterTable {
 
     val addScanlator: String
         get() = "ALTER TABLE $TABLE ADD COLUMN $COL_SCANLATOR TEXT DEFAULT NULL"
-
 }

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

@@ -31,7 +31,8 @@ object HistoryTable {
      * query to create history table
      */
     val createTableQuery: String
-        get() = """CREATE TABLE $TABLE(
+        get() =
+            """CREATE TABLE $TABLE(
             $COL_ID INTEGER NOT NULL PRIMARY KEY,
             $COL_CHAPTER_ID INTEGER NOT NULL UNIQUE,
             $COL_LAST_READ LONG,

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

@@ -11,7 +11,8 @@ object MangaCategoryTable {
     const val COL_CATEGORY_ID = "category_id"
 
     val createTableQuery: String
-        get() = """CREATE TABLE $TABLE(
+        get() =
+            """CREATE TABLE $TABLE(
             $COL_ID INTEGER NOT NULL PRIMARY KEY,
             $COL_MANGA_ID INTEGER NOT NULL,
             $COL_CATEGORY_ID INTEGER NOT NULL,
@@ -20,5 +21,4 @@ object MangaCategoryTable {
             FOREIGN KEY($COL_MANGA_ID) REFERENCES ${MangaTable.TABLE} (${MangaTable.COL_ID})
             ON DELETE CASCADE
             )"""
-
 }

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

@@ -28,6 +28,8 @@ object MangaTable {
 
     const val COL_LAST_UPDATE = "last_update"
 
+    const val COL_DATE_ADDED = "date_added"
+
     const val COL_INITIALIZED = "initialized"
 
     const val COL_VIEWER = "viewer"
@@ -38,8 +40,11 @@ object MangaTable {
 
     const val COL_CATEGORY = "category"
 
+    const val COL_COVER_LAST_MODIFIED = "cover_last_modified"
+
     val createTableQuery: String
-        get() = """CREATE TABLE $TABLE(
+        get() =
+            """CREATE TABLE $TABLE(
             $COL_ID INTEGER NOT NULL PRIMARY KEY,
             $COL_SOURCE INTEGER NOT NULL,
             $COL_URL TEXT NOT NULL,
@@ -54,12 +59,31 @@ object MangaTable {
             $COL_LAST_UPDATE LONG,
             $COL_INITIALIZED BOOLEAN NOT NULL,
             $COL_VIEWER INTEGER NOT NULL,
-            $COL_CHAPTER_FLAGS INTEGER NOT NULL
+            $COL_CHAPTER_FLAGS INTEGER NOT NULL,
+            $COL_COVER_LAST_MODIFIED LONG NOT NULL,
+            $COL_DATE_ADDED LONG NOT NULL
             )"""
 
     val createUrlIndexQuery: String
         get() = "CREATE INDEX ${TABLE}_${COL_URL}_index ON $TABLE($COL_URL)"
 
-    val createFavoriteIndexQuery: String
+    val createLibraryIndexQuery: String
-        get() = "CREATE INDEX ${TABLE}_${COL_FAVORITE}_index ON $TABLE($COL_FAVORITE)"
+        get() = "CREATE INDEX library_${COL_FAVORITE}_index ON $TABLE($COL_FAVORITE) " +
+            "WHERE $COL_FAVORITE = 1"
+
+    val addCoverLastModified: String
+        get() = "ALTER TABLE $TABLE ADD COLUMN $COL_COVER_LAST_MODIFIED LONG NOT NULL DEFAULT 0"
+
+    val addDateAdded: String
+        get() = "ALTER TABLE $TABLE ADD COLUMN $COL_DATE_ADDED LONG NOT NULL DEFAULT 0"
+
+    /**
+     * Used with addDateAdded to populate it with the oldest chapter fetch date.
+     */
+    val backfillDateAdded: String
+        get() = "UPDATE $TABLE SET $COL_DATE_ADDED = " +
+            "(SELECT MIN(${ChapterTable.COL_DATE_FETCH}) " +
+            "FROM $TABLE INNER JOIN ${ChapterTable.TABLE} " +
+            "ON $TABLE.$COL_ID = ${ChapterTable.TABLE}.${ChapterTable.COL_MANGA_ID} " +
+            "GROUP BY $TABLE.$COL_ID)"
 }

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

@@ -10,7 +10,9 @@ object TrackTable {
 
     const val COL_SYNC_ID = "sync_id"
 
-    const val COL_REMOTE_ID = "remote_id"
+    const val COL_MEDIA_ID = "remote_id"
+
+    const val COL_LIBRARY_ID = "library_id"
 
     const val COL_TITLE = "title"
 
@@ -22,20 +24,42 @@ object TrackTable {
 
     const val COL_TOTAL_CHAPTERS = "total_chapters"
 
+    const val COL_TRACKING_URL = "remote_url"
+
+    const val COL_START_DATE = "start_date"
+
+    const val COL_FINISH_DATE = "finish_date"
+
     val createTableQuery: String
-        get() = """CREATE TABLE $TABLE(
+        get() =
+            """CREATE TABLE $TABLE(
             $COL_ID INTEGER NOT NULL PRIMARY KEY,
             $COL_MANGA_ID INTEGER NOT NULL,
             $COL_SYNC_ID INTEGER NOT NULL,
-            $COL_REMOTE_ID INTEGER NOT NULL,
+            $COL_MEDIA_ID INTEGER NOT NULL,
+            $COL_LIBRARY_ID INTEGER,
             $COL_TITLE TEXT NOT NULL,
             $COL_LAST_CHAPTER_READ INTEGER NOT NULL,
             $COL_TOTAL_CHAPTERS INTEGER NOT NULL,
             $COL_STATUS INTEGER NOT NULL,
             $COL_SCORE FLOAT NOT NULL,
+            $COL_TRACKING_URL TEXT NOT NULL,
+            $COL_START_DATE LONG NOT NULL,
+            $COL_FINISH_DATE LONG NOT NULL,
             UNIQUE ($COL_MANGA_ID, $COL_SYNC_ID) ON CONFLICT REPLACE,
             FOREIGN KEY($COL_MANGA_ID) REFERENCES ${MangaTable.TABLE} (${MangaTable.COL_ID})
             ON DELETE CASCADE
             )"""
 
+    val addTrackingUrl: String
+        get() = "ALTER TABLE $TABLE ADD COLUMN $COL_TRACKING_URL TEXT DEFAULT ''"
+
+    val addLibraryId: String
+        get() = "ALTER TABLE $TABLE ADD COLUMN $COL_LIBRARY_ID INTEGER NULL"
+
+    val addStartDate: String
+        get() = "ALTER TABLE $TABLE ADD COLUMN $COL_START_DATE LONG NOT NULL DEFAULT 0"
+
+    val addFinishDate: String
+        get() = "ALTER TABLE $TABLE ADD COLUMN $COL_FINISH_DATE LONG NOT NULL DEFAULT 0"
 }

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

@@ -0,0 +1,280 @@
+package eu.kanade.tachiyomi.data.download
+
+import android.content.Context
+import androidx.core.net.toUri
+import com.hippo.unifile.UniFile
+import eu.kanade.tachiyomi.data.database.models.Chapter
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.source.SourceManager
+import kotlinx.coroutines.flow.onEach
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+import java.util.concurrent.TimeUnit
+
+/**
+ * Cache where we dump the downloads directory from the filesystem. This class is needed because
+ * directory checking is expensive and it slowdowns the app. The cache is invalidated by the time
+ * defined in [renewInterval] as we don't have any control over the filesystem and the user can
+ * delete the folders at any time without the app noticing.
+ *
+ * @param context the application context.
+ * @param provider the downloads directories provider.
+ * @param sourceManager the source manager.
+ * @param preferences the preferences of the app.
+ */
+class DownloadCache(
+    private val context: Context,
+    private val provider: DownloadProvider,
+    private val sourceManager: SourceManager,
+    private val preferences: PreferencesHelper = Injekt.get()
+) {
+
+    /**
+     * The interval after which this cache should be invalidated. 1 hour shouldn't cause major
+     * issues, as the cache is only used for UI feedback.
+     */
+    private val renewInterval = TimeUnit.HOURS.toMillis(1)
+
+    /**
+     * The last time the cache was refreshed.
+     */
+    private var lastRenew = 0L
+
+    /**
+     * The root directory for downloads.
+     */
+    private var rootDir = RootDirectory(getDirectoryFromPreference())
+
+    init {
+        preferences.downloadsDirectory().asFlow()
+            .onEach {
+                lastRenew = 0L // invalidate cache
+                rootDir = RootDirectory(getDirectoryFromPreference())
+            }
+    }
+
+    /**
+     * Returns the downloads directory from the user's preferences.
+     */
+    private fun getDirectoryFromPreference(): UniFile {
+        val dir = preferences.downloadsDirectory().get()
+        return UniFile.fromUri(context, dir.toUri())
+    }
+
+    /**
+     * Returns true if the chapter is downloaded.
+     *
+     * @param chapter the chapter to check.
+     * @param manga the manga of the chapter.
+     * @param skipCache whether to skip the directory cache and check in the filesystem.
+     */
+    fun isChapterDownloaded(chapter: Chapter, manga: Manga, skipCache: Boolean): Boolean {
+        if (skipCache) {
+            val source = sourceManager.get(manga.source) ?: return false
+            return provider.findChapterDir(chapter, manga, source) != null
+        }
+
+        checkRenew()
+
+        val sourceDir = rootDir.files[manga.source]
+        if (sourceDir != null) {
+            val mangaDir = sourceDir.files[provider.getMangaDirName(manga)]
+            if (mangaDir != null) {
+                return provider.getValidChapterDirNames(chapter).any { it in mangaDir.files }
+            }
+        }
+        return false
+    }
+
+    /**
+     * Returns the amount of downloaded chapters for a manga.
+     *
+     * @param manga the manga to check.
+     */
+    fun getDownloadCount(manga: Manga): Int {
+        checkRenew()
+
+        val sourceDir = rootDir.files[manga.source]
+        if (sourceDir != null) {
+            val mangaDir = sourceDir.files[provider.getMangaDirName(manga)]
+            if (mangaDir != null) {
+                return mangaDir.files
+                    .filter { !it.endsWith(Downloader.TMP_DIR_SUFFIX) }
+                    .size
+            }
+        }
+        return 0
+    }
+
+    /**
+     * Checks if the cache needs a renewal and performs it if needed.
+     */
+    @Synchronized
+    private fun checkRenew() {
+        if (lastRenew + renewInterval < System.currentTimeMillis()) {
+            renew()
+            lastRenew = System.currentTimeMillis()
+        }
+    }
+
+    /**
+     * Renews the downloads cache.
+     */
+    private fun renew() {
+        val onlineSources = sourceManager.getOnlineSources()
+
+        val sourceDirs = rootDir.dir.listFiles()
+            .orEmpty()
+            .associate { it.name to SourceDirectory(it) }
+            .mapNotNullKeys { entry ->
+                onlineSources.find { provider.getSourceDirName(it).toLowerCase() == entry.key?.toLowerCase() }?.id
+            }
+
+        rootDir.files = sourceDirs
+
+        sourceDirs.values.forEach { sourceDir ->
+            val mangaDirs = sourceDir.dir.listFiles()
+                .orEmpty()
+                .associateNotNullKeys { it.name to MangaDirectory(it) }
+
+            sourceDir.files = mangaDirs
+
+            mangaDirs.values.forEach { mangaDir ->
+                val chapterDirs = mangaDir.dir.listFiles()
+                    .orEmpty()
+                    .mapNotNull { it.name }
+                    .toHashSet()
+
+                mangaDir.files = chapterDirs
+            }
+        }
+    }
+
+    /**
+     * Adds a chapter that has just been download to this cache.
+     *
+     * @param chapterDirName the downloaded chapter's directory name.
+     * @param mangaUniFile the directory of the manga.
+     * @param manga the manga of the chapter.
+     */
+    @Synchronized
+    fun addChapter(chapterDirName: String, mangaUniFile: UniFile, manga: Manga) {
+        // Retrieve the cached source directory or cache a new one
+        var sourceDir = rootDir.files[manga.source]
+        if (sourceDir == null) {
+            val source = sourceManager.get(manga.source) ?: return
+            val sourceUniFile = provider.findSourceDir(source) ?: return
+            sourceDir = SourceDirectory(sourceUniFile)
+            rootDir.files += manga.source to sourceDir
+        }
+
+        // Retrieve the cached manga directory or cache a new one
+        val mangaDirName = provider.getMangaDirName(manga)
+        var mangaDir = sourceDir.files[mangaDirName]
+        if (mangaDir == null) {
+            mangaDir = MangaDirectory(mangaUniFile)
+            sourceDir.files += mangaDirName to mangaDir
+        }
+
+        // Save the chapter directory
+        mangaDir.files += chapterDirName
+    }
+
+    /**
+     * Removes a chapter that has been deleted from this cache.
+     *
+     * @param chapter the chapter to remove.
+     * @param manga the manga of the chapter.
+     */
+    @Synchronized
+    fun removeChapter(chapter: Chapter, manga: Manga) {
+        val sourceDir = rootDir.files[manga.source] ?: return
+        val mangaDir = sourceDir.files[provider.getMangaDirName(manga)] ?: return
+        provider.getValidChapterDirNames(chapter).forEach {
+            if (it in mangaDir.files) {
+                mangaDir.files -= it
+            }
+        }
+    }
+
+    /**
+     * Removes a list of chapters that have been deleted from this cache.
+     *
+     * @param chapters the list of chapter to remove.
+     * @param manga the manga of the chapter.
+     */
+    @Synchronized
+    fun removeChapters(chapters: List<Chapter>, manga: Manga) {
+        val sourceDir = rootDir.files[manga.source] ?: return
+        val mangaDir = sourceDir.files[provider.getMangaDirName(manga)] ?: return
+        chapters.forEach { chapter ->
+            provider.getValidChapterDirNames(chapter).forEach {
+                if (it in mangaDir.files) {
+                    mangaDir.files -= it
+                }
+            }
+        }
+    }
+
+    /**
+     * Removes a manga that has been deleted from this cache.
+     *
+     * @param manga the manga to remove.
+     */
+    @Synchronized
+    fun removeManga(manga: Manga) {
+        val sourceDir = rootDir.files[manga.source] ?: return
+        val mangaDirName = provider.getMangaDirName(manga)
+        if (mangaDirName in sourceDir.files) {
+            sourceDir.files -= mangaDirName
+        }
+    }
+
+    /**
+     * Class to store the files under the root downloads directory.
+     */
+    private class RootDirectory(
+        val dir: UniFile,
+        var files: Map<Long, SourceDirectory> = hashMapOf()
+    )
+
+    /**
+     * Class to store the files under a source directory.
+     */
+    private class SourceDirectory(
+        val dir: UniFile,
+        var files: Map<String, MangaDirectory> = hashMapOf()
+    )
+
+    /**
+     * Class to store the files under a manga directory.
+     */
+    private class MangaDirectory(
+        val dir: UniFile,
+        var files: Set<String> = hashSetOf()
+    )
+
+    /**
+     * Returns a new map containing only the key entries of [transform] that are not null.
+     */
+    private inline fun <K, V, R> Map<out K, V>.mapNotNullKeys(transform: (Map.Entry<K?, V>) -> R?): Map<R, V> {
+        val destination = LinkedHashMap<R, V>()
+        forEach { element -> transform(element)?.let { destination[it] = element.value } }
+        return destination
+    }
+
+    /**
+     * Returns a map from a list containing only the key entries of [transform] that are not null.
+     */
+    private inline fun <T, K, V> Array<T>.associateNotNullKeys(transform: (T) -> Pair<K?, V>): Map<K, V> {
+        val destination = LinkedHashMap<K, V>()
+        for (element in this) {
+            val (key, value) = transform(element)
+            if (key != null) {
+                destination[key] = value
+            }
+        }
+        return destination
+    }
+}

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

@@ -3,12 +3,18 @@ package eu.kanade.tachiyomi.data.download
 import android.content.Context
 import com.hippo.unifile.UniFile
 import com.jakewharton.rxrelay.BehaviorRelay
+import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.download.model.Download
 import eu.kanade.tachiyomi.data.download.model.DownloadQueue
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.source.Source
+import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.model.Page
 import rx.Observable
+import timber.log.Timber
+import uy.kohesive.injekt.injectLazy
 
 /**
  * This class is used to manage chapter downloads in the application. It must be instantiated once
@@ -17,17 +23,30 @@ import rx.Observable
  *
  * @param context the application context.
  */
-class DownloadManager(context: Context) {
+class DownloadManager(private val context: Context) {
+
+    private val sourceManager: SourceManager by injectLazy()
+    private val preferences: PreferencesHelper by injectLazy()
 
     /**
      * Downloads provider, used to retrieve the folders where the chapters are or should be stored.
      */
     private val provider = DownloadProvider(context)
 
+    /**
+     * Cache of downloaded chapters.
+     */
+    private val cache = DownloadCache(context, provider, sourceManager)
+
     /**
      * Downloader whose only task is to download chapters.
      */
-    private val downloader = Downloader(context, provider)
+    private val downloader = Downloader(context, provider, cache, sourceManager)
+
+    /**
+     * Queue to delay the deletion of a list of chapters until triggered.
+     */
+    private val pendingDeleter = DownloadPendingDeleter(context)
 
     /**
      * Downloads queue, where the pending chapters are stored.
@@ -75,14 +94,38 @@ class DownloadManager(context: Context) {
         downloader.clearQueue(isNotification)
     }
 
+    /**
+     * Reorders the download queue.
+     *
+     * @param downloads value to set the download queue to
+     */
+    fun reorderQueue(downloads: List<Download>) {
+        val wasRunning = downloader.isRunning
+
+        if (downloads.isEmpty()) {
+            DownloadService.stop(context)
+            downloader.queue.clear()
+            return
+        }
+
+        downloader.pause()
+        downloader.queue.clear()
+        downloader.queue.addAll(downloads)
+
+        if (wasRunning) {
+            downloader.start()
+        }
+    }
+
     /**
      * Tells the downloader to enqueue the given list of chapters.
      *
      * @param manga the manga of the chapters.
      * @param chapters the list of chapters to enqueue.
+     * @param autoStart whether to start the downloader after enqueing the chapters.
      */
-    fun downloadChapters(manga: Manga, chapters: List<Chapter>) {
+    fun downloadChapters(manga: Manga, chapters: List<Chapter>, autoStart: Boolean = true) {
-        downloader.queueChapters(manga, chapters)
+        downloader.queueChapters(manga, chapters, autoStart)
     }
 
     /**
@@ -94,7 +137,7 @@ class DownloadManager(context: Context) {
      * @return an observable containing the list of pages from the chapter.
      */
     fun buildPageList(source: Source, manga: Manga, chapter: Chapter): Observable<List<Page>> {
-        return buildPageList(provider.findChapterDir(source, manga, chapter))
+        return buildPageList(provider.findChapterDir(chapter, manga, source))
     }
 
     /**
@@ -109,7 +152,7 @@ class DownloadManager(context: Context) {
                 .filter { "image" in it.type.orEmpty() }
 
             if (files.isEmpty()) {
-                throw Exception("Page list is empty")
+                throw Exception(context.getString(R.string.page_list_empty_error))
             }
 
             files.sortedBy { it.name }
@@ -120,61 +163,120 @@ class DownloadManager(context: Context) {
     }
 
     /**
-     * Returns the directory name for a manga.
+     * Returns true if the chapter is downloaded.
      *
-     * @param manga the manga to query.
+     * @param chapter the chapter to check.
+     * @param manga the manga of the chapter.
+     * @param skipCache whether to skip the directory cache and check in the filesystem.
      */
-    fun getMangaDirName(manga: Manga): String {
+    fun isChapterDownloaded(chapter: Chapter, manga: Manga, skipCache: Boolean = false): Boolean {
-        return provider.getMangaDirName(manga)
+        return cache.isChapterDownloaded(chapter, manga, skipCache)
     }
 
     /**
-     * Returns the directory name for the given chapter.
+     * Returns the amount of downloaded chapters for a manga.
      *
-     * @param chapter the chapter to query.
+     * @param manga the manga to check.
      */
-    fun getChapterDirName(chapter: Chapter): String {
+    fun getDownloadCount(manga: Manga): Int {
-        return provider.getChapterDirName(chapter)
+        return cache.getDownloadCount(manga)
     }
 
     /**
-     * Returns the download directory for a source if it exists.
+     * Calls delete chapter, which deletes a temp download.
      *
-     * @param source the source to query.
+     * @param download the download to cancel.
      */
-    fun findSourceDir(source: Source): UniFile? {
+    fun deletePendingDownload(download: Download) {
-        return provider.findSourceDir(source)
+        deleteChapters(listOf(download.chapter), download.manga, download.source)
     }
 
     /**
-     * Returns the directory for the given manga, if it exists.
+     * Deletes the directories of a list of downloaded chapters.
+     *
+     * @param chapters the list of chapters to delete.
+     * @param manga the manga of the chapters.
+     * @param source the source of the chapters.
+     */
+    fun deleteChapters(chapters: List<Chapter>, manga: Manga, source: Source): List<Chapter> {
+        val filteredChapters = getChaptersToDelete(chapters)
+
+        queue.remove(filteredChapters)
+
+        val chapterDirs = provider.findChapterDirs(filteredChapters, manga, source)
+        chapterDirs.forEach { it.delete() }
+        cache.removeChapters(filteredChapters, manga)
+        if (cache.getDownloadCount(manga) == 0) { // Delete manga directory if empty
+            chapterDirs.firstOrNull()?.parentFile?.delete()
+        }
+
+        return filteredChapters
+    }
+
+    /**
+     * Deletes the directory of a downloaded manga.
+     *
+     * @param manga the manga to delete.
+     * @param source the source of the manga.
+     */
+    fun deleteManga(manga: Manga, source: Source) {
+        queue.remove(manga)
+        provider.findMangaDir(manga, source)?.delete()
+        cache.removeManga(manga)
+    }
+
+    /**
+     * Adds a list of chapters to be deleted later.
+     *
+     * @param chapters the list of chapters to delete.
+     * @param manga the manga of the chapters.
+     */
+    fun enqueueDeleteChapters(chapters: List<Chapter>, manga: Manga) {
+        pendingDeleter.addChapters(getChaptersToDelete(chapters), manga)
+    }
+
+    /**
+     * Triggers the execution of the deletion of pending chapters.
+     */
+    fun deletePendingChapters() {
+        val pendingChapters = pendingDeleter.getPendingChapters()
+        for ((manga, chapters) in pendingChapters) {
+            val source = sourceManager.get(manga.source) ?: continue
+            deleteChapters(chapters, manga, source)
+        }
+    }
+
+    /**
+     * Renames an already downloaded chapter
      *
      * @param source the source of the manga.
-     * @param manga the manga to query.
+     * @param manga the manga of the chapter.
+     * @param oldChapter the existing chapter with the old name.
+     * @param newChapter the target chapter with the new name.
      */
-    fun findMangaDir(source: Source, manga: Manga): UniFile? {
+    fun renameChapter(source: Source, manga: Manga, oldChapter: Chapter, newChapter: Chapter) {
-        return provider.findMangaDir(source, manga)
+        val oldNames = provider.getValidChapterDirNames(oldChapter)
+        val newName = provider.getChapterDirName(newChapter)
+        val mangaDir = provider.getMangaDir(manga, source)
+
+        // Assume there's only 1 version of the chapter name formats present
+        val oldFolder = oldNames.asSequence()
+            .mapNotNull { mangaDir.findFile(it) }
+            .firstOrNull()
+
+        if (oldFolder?.renameTo(newName) == true) {
+            cache.removeChapter(oldChapter, manga)
+            cache.addChapter(newName, mangaDir, manga)
+        } else {
+            Timber.e("Could not rename downloaded chapter: %s.", oldNames.joinToString())
+        }
     }
 
-    /**
+    private fun getChaptersToDelete(chapters: List<Chapter>): List<Chapter> {
-     * Returns the directory for the given chapter, if it exists.
+        return if (!preferences.removeBookmarkedChapters()) {
-     *
+            chapters.filterNot { it.bookmark }
-     * @param source the source of the chapter.
+        } else {
-     * @param manga the manga of the chapter.
+            chapters
-     * @param chapter the chapter to query.
+        }
-     */
-    fun findChapterDir(source: Source, manga: Manga, chapter: Chapter): UniFile? {
-        return provider.findChapterDir(source, manga, chapter)
-    }
-
-    /**
-     * Deletes the directory of a downloaded chapter.
-     *
-     * @param source the source of the chapter.
-     * @param manga the manga of the chapter.
-     * @param chapter the chapter to delete.
-     */
-    fun deleteChapter(source: Source, manga: Manga, chapter: Chapter) {
-        provider.findChapterDir(source, manga, chapter)?.delete()
     }
 }