Fix fdroid not building

.github/CONTRIBUTING.md

@@ -1,27 +1,20 @@
-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/WrBkRk4)
-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)
-4. After following 1. and 3. you can [open your issue](https://github.com/inorichi/tachiyomi/issues/new)
-
-***
-
-# Catalogue requests
-
-* Catalogue requests should be created at https://github.com/inorichi/tachiyomi-extensions#readme, not here
-
 # Bugs
 * Include version (Setting > 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
 * 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)
+* If it could be device-dependent, try reproducing on another device (if possible), include results and device names, OS, modifications (root, Xposed)
+* **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).**
 * For large logs use http://pastebin.com/ (or similar)
-* Don't group unrelated requests into one issue
+* For multipart issues **use list** like this:
+ * [x] Done
+ * [ ] Not done
+```
+* [x] Done
+* [ ] Not done
+```
+* Don't put together too many unrelated requests into one issue
 
 DO: https://github.com/inorichi/tachiyomi/issues/24 https://github.com/inorichi/tachiyomi/issues/71
 
@@ -31,3 +24,8 @@ DON'T: https://github.com/inorichi/tachiyomi/issues/75
 
 * Write a detailed issue, explaning what it should do or how. Avoid writing just "like X app does"
 * Include screenshot (if needed)
+
+# Translations
+
+File `app/src/main/res/values/strings.xml` should be copied over to appropriate directories and then translated.
+Consult [Android.com](http://developer.android.com/training/basics/supporting-devices/languages.html#CreateDirs)

.github/ISSUE_TEMPLATE.md

@@ -1 +1,7 @@
 **Please read https://github.com/inorichi/tachiyomi/blob/master/.github/CONTRIBUTING.md before posting**
+
+Remove line above and describe your issue here. Fill out version below. Use Preview.
+
+
+Version: r000 or v0.0.0
+(other relevant info like OS)

.travis.yml

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

.travis/build.sh

@@ -1,20 +0,0 @@
-#!/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

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

README.md

@@ -1,11 +1,10 @@
-| Build | Download | F-Droid | Contribute | Contact |
-|-------|----------|---------|------------|---------|
-| [![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) | [![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) |
+| Build | Download | Auto Update |
+|-------|----------|-------------|
+| [![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=2592000&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-blue.svg)](https://f-droid.org/repository/browse/?fdid=eu.kanade.tachiyomi) [![fdroid debug](https://img.shields.io/badge/dev-F--Droid-blue.svg)](//github.com/inorichi/tachiyomi/wiki/FDroid-for-debug-versions) |
 
-### **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.
+## [Report an issue](https://github.com/inorichi/tachiyomi/blob/master/.github/CONTRIBUTING.md)
 
-***
+**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.**
 
 Tachiyomi is a free and open source manga reader for Android.
 

app/.gitignore

@@ -1,4 +1,4 @@
 /build
 *iml
 *.iml
-custom.gradle
+.idea

app/build.gradle

@@ -3,10 +3,6 @@ import java.text.SimpleDateFormat
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'com.github.zellius.shortcut-helper'
-
-shortcutHelper.filePath = './shortcuts.xml'
 
 ext {
     // Git is needed in your system PATH for these commands to work.
@@ -28,62 +24,43 @@ ext {
     }
 }
 
+def includeUpdater() {
+    return hasProperty("include_updater")
+}
+
 android {
-    compileSdkVersion 26
-    buildToolsVersion "27.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.3"
     publishNonDefault true
 
     defaultConfig {
         applicationId "eu.kanade.tachiyomi"
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 23
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        versionCode 28
-        versionName "0.6.5"
+        versionCode 9
+        versionName "0.2.2-1"
 
         buildConfigField "String", "COMMIT_COUNT", "\"${getCommitCount()}\""
         buildConfigField "String", "COMMIT_SHA", "\"${getGitSha()}\""
         buildConfigField "String", "BUILD_TIME", "\"${getBuildTime()}\""
-        buildConfigField "boolean", "INCLUDE_UPDATER", "false"
+        buildConfigField "boolean", "INCLUDE_UPDATER", "${includeUpdater()}"
 
         vectorDrawables.useSupportLibrary = true
-
-        ndk {
-            abiFilters "armeabi-v7a", "arm64-v8a", "x86"
-        }
     }
 
     buildTypes {
         debug {
-            versionNameSuffix "-${getCommitCount()}"
+            versionNameSuffix ".${getCommitCount()}"
             applicationIdSuffix ".debug"
-            multiDexEnabled true
         }
         release {
             minifyEnabled true
             shrinkResources true
-            multiDexEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), '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"
-        }
-    }
-
     packagingOptions {
         exclude 'META-INF/DEPENDENCIES'
         exclude 'LICENSE.txt'
@@ -97,142 +74,123 @@ android {
         checkReleaseBuilds false
     }
 
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
+
+    // http://stackoverflow.com/questions/32759529/androidhttpclient-not-found-when-running-robolectric
+    useLibrary 'org.apache.http.legacy'
+
+}
+
+kapt {
+    generateStubs = true
 }
 
 dependencies {
+    final SUPPORT_LIBRARY_VERSION = '23.4.0'
+    final DAGGER_VERSION = '2.4'
+    final RETROFIT_VERSION = '2.0.2'
+    final NUCLEUS_VERSION = '3.0.0'
+    final STORIO_VERSION = '1.8.0'
+    final MOCKITO_VERSION = '1.10.19'
 
     // Modified dependencies
-    implementation 'com.github.inorichi:subsampling-scale-image-view:c19b883'
-    implementation 'com.github.inorichi:junrar-android:634c1f5'
+    compile 'com.github.inorichi:subsampling-scale-image-view:421fb81'
+    compile 'com.github.inorichi:ReactiveNetwork:69092ed'
 
     // Android support library
-    final support_library_version = '27.0.1'
-    implementation "com.android.support:support-v4:$support_library_version"
-    implementation "com.android.support:appcompat-v7:$support_library_version"
-    implementation "com.android.support:cardview-v7:$support_library_version"
-    implementation "com.android.support:design:$support_library_version"
-    implementation "com.android.support:recyclerview-v7:$support_library_version"
-    implementation "com.android.support:preference-v7:$support_library_version"
-    implementation "com.android.support:support-annotations:$support_library_version"
-    implementation "com.android.support:customtabs:$support_library_version"
-
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-
-    implementation 'com.android.support:multidex:1.0.1'
+    compile "com.android.support:support-v4:$SUPPORT_LIBRARY_VERSION"
+    compile "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_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:preference-v7:$SUPPORT_LIBRARY_VERSION"
+    compile "com.android.support:preference-v14:$SUPPORT_LIBRARY_VERSION"
+    compile "com.android.support:customtabs:$SUPPORT_LIBRARY_VERSION"
 
     // ReactiveX
-    implementation 'io.reactivex:rxandroid:1.2.1'
-    implementation 'io.reactivex:rxjava:1.3.4'
-    implementation 'com.jakewharton.rxrelay:rxrelay:1.2.0'
-    implementation 'com.f2prateek.rx.preferences:rx-preferences:1.0.2'
-    implementation 'com.github.pwittchen:reactivenetwork:0.7.0'
+    compile 'io.reactivex:rxandroid:1.2.0'
+    compile 'io.reactivex:rxjava:1.1.5'
+    compile 'com.f2prateek.rx.preferences:rx-preferences:1.0.1'
 
     // Network client
-    implementation "com.squareup.okhttp3:okhttp:3.9.1"
-    implementation 'com.squareup.okio:okio:1.13.0'
+    compile "com.squareup.okhttp3:okhttp:3.3.1"
 
     // REST
-    final retrofit_version = '2.3.0'
-    implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
-    implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
-    implementation "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
+    compile "com.squareup.retrofit2:retrofit:$RETROFIT_VERSION"
+    compile "com.squareup.retrofit2:converter-gson:$RETROFIT_VERSION"
+    compile "com.squareup.retrofit2:adapter-rxjava:$RETROFIT_VERSION"
+
+    // IO
+    compile 'com.squareup.okio:okio:1.8.0'
 
     // JSON
-    implementation 'com.google.code.gson:gson:2.8.2'
-    implementation 'com.github.salomonbrys.kotson:kotson:2.5.0'
+    compile 'com.google.code.gson:gson:2.6.2'
 
     // YAML
-    implementation 'com.github.bmoliveira:snake-yaml:v1.18-android'
+    compile 'org.yaml:snakeyaml:1.17'
 
     // JavaScript engine
-    implementation 'com.squareup.duktape:duktape-android:1.2.0'
+    compile 'com.squareup.duktape:duktape-android:0.9.5'
 
-    // Disk
-    implementation 'com.jakewharton:disklrucache:2.0.2'
-    implementation 'com.github.seven332:unifile:1.0.0'
+    // Disk cache
+    compile 'com.jakewharton:disklrucache:2.0.2'
 
-    // HTML parser
-    implementation 'org.jsoup:jsoup:1.10.2'
-
-    // Job scheduling
-    implementation 'com.evernote:android-job:1.2.0'
-    implementation 'com.google.android.gms:play-services-gcm:11.6.0'
+    // Parse HTML
+    compile 'org.jsoup:jsoup:1.9.2'
 
     // Changelog
-    implementation 'com.github.gabrielemariotti.changeloglib:changelog:2.1.0'
+    compile 'com.github.gabrielemariotti.changeloglib:changelog:2.1.0'
 
     // Database
-    implementation "com.pushtorefresh.storio:sqlite:1.13.0"
+    compile "com.pushtorefresh.storio:sqlite:$STORIO_VERSION"
+    compile "com.pushtorefresh.storio:sqlite-annotations:$STORIO_VERSION"
+    kapt "com.pushtorefresh.storio:sqlite-annotations-processor:$STORIO_VERSION"
 
     // Model View Presenter
-    final nucleus_version = '3.0.0'
-    implementation "info.android15.nucleus:nucleus:$nucleus_version"
-    implementation "info.android15.nucleus:nucleus-support-v7:$nucleus_version"
+    compile "info.android15.nucleus:nucleus:$NUCLEUS_VERSION"
+    compile "info.android15.nucleus:nucleus-support-v4:$NUCLEUS_VERSION"
+    compile "info.android15.nucleus:nucleus-support-v7:$NUCLEUS_VERSION"
 
     // Dependency injection
-    implementation "uy.kohesive.injekt:injekt-core:1.16.1"
+    compile "com.google.dagger:dagger:$DAGGER_VERSION"
+    kapt "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
+    provided 'org.glassfish:javax.annotation:10.0-b28'
 
     // Image library
-    final glide_version = '4.3.1'
-    implementation "com.github.bumptech.glide:glide:$glide_version"
-    implementation "com.github.bumptech.glide:okhttp3-integration:$glide_version"
-    kapt "com.github.bumptech.glide:compiler:$glide_version"
-
-    // Transformations
-    implementation 'jp.wasabeef:glide-transformations:3.0.1'
+    compile 'com.github.bumptech.glide:glide:3.7.0'
+    compile 'com.github.bumptech.glide:okhttp3-integration:1.4.0@aar'
 
     // Logging
-    implementation 'com.jakewharton.timber:timber:4.6.0'
+    compile 'com.jakewharton.timber:timber:4.1.2'
 
     // Crash reports
-    implementation 'ch.acra:acra:4.9.2'
-
-    // Sort
-    implementation 'com.github.gpanther:java-nat-sort:natural-comparator-1.1'
+    compile 'ch.acra:acra:4.8.5'
 
     // UI
-    implementation 'com.dmitrymalkovich.android:material-design-dimens:1.4'
-    implementation 'com.github.dmytrodanylyk.android-process-button:library:1.0.4'
-    implementation 'eu.davidea:flexible-adapter:5.0.0-rc3'
-    implementation 'com.nononsenseapps:filepicker:2.5.2'
-    implementation 'com.github.amulyakhare:TextDrawable:558677e'
-    implementation('com.afollestad.material-dialogs:core:0.9.4.7') {
-        exclude group: "com.android.support", module: "support-v13"
-    }
-    implementation 'me.zhanghai.android.systemuihelper:library:1.0.0'
-    implementation 'com.nightlynexus.viewstatepageradapter:viewstatepageradapter:1.0.4'
-    implementation 'com.github.mthli:Slice:v1.2'
-
-    // Conductor
-    implementation "com.bluelinelabs:conductor:2.1.4"
-    implementation 'com.github.inorichi:conductor-support-preference:26.0.2'
-
-    // RxBindings
-    final rxbindings_version = '1.0.1'
-    implementation "com.jakewharton.rxbinding:rxbinding-kotlin:$rxbindings_version"
-    implementation "com.jakewharton.rxbinding:rxbinding-appcompat-v7-kotlin:$rxbindings_version"
-    implementation "com.jakewharton.rxbinding:rxbinding-support-v4-kotlin:$rxbindings_version"
-    implementation "com.jakewharton.rxbinding:rxbinding-recyclerview-v7-kotlin:$rxbindings_version"
+    compile 'com.github.dmytrodanylyk.android-process-button:library:1.0.4'
+    compile 'eu.davidea:flexible-adapter:4.2.0'
+    compile 'com.nononsenseapps:filepicker:2.5.2'
+    compile 'com.github.amulyakhare:TextDrawable:558677e'
+    compile 'com.afollestad.material-dialogs:core:0.8.5.9'
 
     // Tests
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.assertj:assertj-core:1.7.1'
-    testImplementation 'org.mockito:mockito-core:1.10.19'
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.assertj:assertj-core:1.7.1'
+    testCompile "org.mockito:mockito-core:$MOCKITO_VERSION"
+    testCompile('org.robolectric:robolectric:3.0') {
+        exclude group: 'commons-logging', module: 'commons-logging'
+        exclude group: 'org.apache.httpcomponents', module: 'httpclient'
+    }
 
-    final robolectric_version = '3.1.4'
-    testImplementation "org.robolectric:robolectric:$robolectric_version"
-    testImplementation "org.robolectric:shadows-multidex:$robolectric_version"
-    testImplementation "org.robolectric:shadows-play-services:$robolectric_version"
-
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-
-    final coroutines_version = '0.19.1'
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
+    kaptTest "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
 buildscript {
-    ext.kotlin_version = '1.1.61'
+    ext.kotlin_version = '1.0.2'
     repositories {
         mavenCentral()
     }
@@ -244,9 +202,3 @@ buildscript {
 repositories {
     mavenCentral()
 }
-
-kotlin {
-    experimental {
-        coroutines 'enable'
-    }
-}

app/proguard-rules.pro

@@ -1,30 +1,24 @@
 -dontobfuscate
 
--dontwarn eu.kanade.tachiyomi.**
--keep class eu.kanade.tachiyomi.**
--keep class eu.kanade.tachiyomi.source.model.** { *; }
-
--keep class com.hippo.image.** { *; }
--keep interface com.hippo.image.** { *; }
--dontwarn nucleus.view.NucleusActionBarActivity
-
-# Extensions may require methods unused in the core app
--keep class org.jsoup.** { *; }
--keep class kotlin.** { *; }
--keep class okhttp3.** { *; }
--keep class com.google.gson.** { *; }
--keep class com.github.salomonbrys.kotson.** { *; }
+-keep class eu.kanade.tachiyomi.injection.** { *; }
 
 # OkHttp
+-keepattributes Signature
+-keepattributes *Annotation*
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
 -dontwarn okhttp3.**
 -dontwarn okio.**
--dontwarn javax.annotation.**
--dontwarn retrofit2.Platform$Java8
+
+# Okio
+-keep class sun.misc.Unsafe { *; }
+-dontwarn java.nio.file.*
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+-dontwarn okio.**
 
 # Glide specific rules #
 # https://github.com/bumptech/glide
 -keep public class * implements com.bumptech.glide.module.GlideModule
--keep public class * extends com.bumptech.glide.AppGlideModule
 -keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
     **[] $VALUES;
     public *;
@@ -46,46 +40,89 @@
     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 { *; }
+# Retrofit 2.X
+## https://square.github.io/retrofit/ ##
 
+-dontwarn retrofit2.**
+-keep class retrofit2.** { *; }
+-keepattributes Signature
+-keepattributes Exceptions
+
+-keepclasseswithmembers class * {
+    @retrofit2.http.* <methods>;
+}
+
+# AppCombat
 -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.**
-
-## GSON ##
+## GSON 2.2.4 specific rules ##
 
 # Gson uses generic type information stored in a class file when working with fields. Proguard
 # removes such information by default, so configure it to keep all of it.
 -keepattributes Signature
 
+# For using GSON @Expose annotation
+-keepattributes *Annotation*
+
+-keepattributes EnclosingMethod
+
 # Gson specific classes
 -keep class sun.misc.Unsafe { *; }
+-keep class com.google.gson.stream.** { *; }
 
-# Prevent proguard from stripping interface information from TypeAdapterFactory,
-# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
--keep class * implements com.google.gson.TypeAdapterFactory
--keep class * implements com.google.gson.JsonSerializer
--keep class * implements com.google.gson.JsonDeserializer
+## ACRA 4.5.0 specific rules ##
+
+# we need line numbers in our stack traces otherwise they are pretty useless
+-renamesourcefileattribute SourceFile
+-keepattributes SourceFile,LineNumberTable
+
+# ACRA needs "annotations" so add this...
+-keepattributes *Annotation*
+
+# keep this class so that logging will show 'ACRA' and not a obfuscated name like 'a'.
+# Note: if you are removing log messages elsewhere in this file then this isn't necessary
+-keep class org.acra.ACRA {
+	*;
+}
+
+# keep this around for some enums that ACRA needs
+-keep class org.acra.ReportingInteractionMode {
+    *;
+}
+
+-keepnames class org.acra.sender.HttpSender$** {
+    *;
+}
+
+-keepnames class org.acra.ReportField {
+    *;
+}
+
+# keep this otherwise it is removed by ProGuard
+-keep public class org.acra.ErrorReporter {
+    public void addCustomData(java.lang.String,java.lang.String);
+    public void putCustomData(java.lang.String,java.lang.String);
+    public void removeCustomData(java.lang.String);
+}
+
+# keep this otherwise it is removed by ProGuard
+-keep public class org.acra.ErrorReporter {
+    public void handleSilentException(java.lang.Throwable);
+}
+
+# Keep the support library
+-keep class org.acra.** { *; }
+-keep interface org.acra.** { *; }
 
 # SnakeYaml
 -keep class org.yaml.snakeyaml.** { public protected private *; }
+-keep class org.yaml.snakeyaml.** { public protected private *; }
 -dontwarn org.yaml.snakeyaml.**
 
 # Duktape

app/shortcuts.xml

@@ -1,47 +0,0 @@
-<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <shortcut
-        android:enabled="true"
-        android:icon="@drawable/sc_book_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" />
-    </shortcut>
-    <shortcut
-        android:enabled="true"
-        android:icon="@drawable/sc_update_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" />
-    </shortcut>
-    <shortcut
-        android:enabled="true"
-        android:icon="@drawable/sc_glasses_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" />
-    </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:shortcutShortLabel="@string/label_catalogues">
-        <intent
-            android:action="eu.kanade.tachiyomi.SHOW_CATALOGUES"
-            android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
-    </shortcut>
-</shortcuts>

app/src/main/AndroidManifest.xml

@@ -1,100 +1,108 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="eu.kanade.tachiyomi">
+          package="eu.kanade.tachiyomi">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <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.RECEIVE_BOOT_COMPLETED"/>
 
     <application
         android:name=".App"
         android:allowBackup="true"
         android:hardwareAccelerated="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:theme="@style/Theme.Tachiyomi" >
         <activity
             android:name=".ui.main.MainActivity"
-            android:launchMode="singleTop">
+            android:theme="@style/Theme.BrandedLaunch">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
-            <!--suppress AndroidDomInspection -->
-            <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts"/>
+        </activity>
+        <activity
+            android:name=".ui.manga.MangaActivity"
+            android:parentActivityName=".ui.main.MainActivity" >
         </activity>
         <activity
             android:name=".ui.reader.ReaderActivity"
-            android:theme="@style/Theme.Reader" />
+            android:theme="@style/Theme.Reader">
+        </activity>
         <activity
-            android:name=".widget.CustomLayoutPickerActivity"
+            android:name=".ui.setting.SettingsActivity"
+            android:label="@string/label_settings"
+            android:parentActivityName=".ui.main.MainActivity" >
+        </activity>
+        <activity
+            android:name=".ui.category.CategoryActivity"
+            android:label="@string/label_categories"
+            android:parentActivityName=".ui.main.MainActivity">
+        </activity>
+        <activity
+            android:name=".ui.setting.SettingsDownloadsFragment$CustomLayoutPickerActivity"
             android:label="@string/app_name"
-            android:theme="@style/FilePickerTheme" />
-        <activity
-            android:name=".ui.setting.AnilistLoginActivity"
-            android:label="Anilist">
-            <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="anilist-auth"
-                    android:scheme="tachiyomi" />
-            </intent-filter>
+            android:theme="@style/FilePickerTheme">
         </activity>
 
-        <provider
-            android:name="android.support.v4.content.FileProvider"
-            android:authorities="${applicationId}.provider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths" />
-        </provider>
+        <service android:name=".data.library.LibraryUpdateService"
+            android:exported="false"/>
 
-        <provider
-            android:name="eu.kanade.tachiyomi.util.ZipContentProvider"
-            android:authorities="${applicationId}.zip-provider"
-            android:exported="false" />
+        <service android:name=".data.download.DownloadService"
+            android:exported="false"/>
 
-        <provider
-            android:name="eu.kanade.tachiyomi.util.RarContentProvider"
-            android:authorities="${applicationId}.rar-provider"
-            android:exported="false" />
+        <service android:name=".data.mangasync.UpdateMangaSyncService"
+            android:exported="false"/>
 
         <receiver
-            android:name=".data.notification.NotificationReceiver"
-            android:exported="false" />
+            android:name=".data.library.LibraryUpdateService$SyncOnConnectionAvailable"
+            android:enabled="false">
+            <intent-filter>
+                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
+            </intent-filter>
+        </receiver>
 
-        <service
-            android:name=".data.library.LibraryUpdateService"
-            android:exported="false" />
+        <receiver
+            android:name=".data.library.LibraryUpdateService$SyncOnPowerConnected"
+            android:enabled="false">
+            <intent-filter>
+                <action android:name="android.intent.action.ACTION_POWER_CONNECTED" />
+            </intent-filter>
+        </receiver>
 
-        <service
-            android:name=".data.download.DownloadService"
-            android:exported="false" />
+        <receiver
+            android:name=".data.library.LibraryUpdateService$CancelUpdateReceiver">
+        </receiver>
 
-        <service
-            android:name=".data.updater.UpdateDownloaderService"
-            android:exported="false" />
+        <receiver
+            android:name=".data.updater.UpdateDownloader$InstallOnReceived">
+        </receiver>
 
-        <service
-            android:name=".data.backup.BackupCreateService"
-            android:exported="false"/>
+        <receiver
+            android:name=".data.library.LibraryUpdateAlarm">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <action android:name="eu.kanade.UPDATE_LIBRARY" />
+            </intent-filter>
+        </receiver>
 
-        <service
-            android:name=".data.backup.BackupRestoreService"
-            android:exported="false"/>
+        <receiver
+            android:name=".data.updater.UpdateDownloaderAlarm">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <action android:name="eu.kanade.CHECK_UPDATE"/>
+            </intent-filter>
+        </receiver>
+
+
+        <meta-data
+            android:name="eu.kanade.tachiyomi.data.glide.AppGlideModule"
+            android:value="GlideModule" />
 
     </application>
 

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

@@ -2,73 +2,61 @@ package eu.kanade.tachiyomi
 
 import android.app.Application
 import android.content.Context
-import android.content.res.Configuration
-import android.support.multidex.MultiDex
-import com.evernote.android.job.JobManager
-import eu.kanade.tachiyomi.data.backup.BackupCreatorJob
-import eu.kanade.tachiyomi.data.library.LibraryUpdateJob
-import eu.kanade.tachiyomi.data.notification.Notifications
-import eu.kanade.tachiyomi.data.updater.UpdateCheckerJob
-import eu.kanade.tachiyomi.util.LocaleHelper
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.injection.ComponentReflectionInjector
+import eu.kanade.tachiyomi.injection.component.AppComponent
+import eu.kanade.tachiyomi.injection.component.DaggerAppComponent
+import eu.kanade.tachiyomi.injection.module.AppModule
 import org.acra.ACRA
 import org.acra.annotation.ReportsCrashes
 import timber.log.Timber
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.InjektScope
-import uy.kohesive.injekt.registry.default.DefaultRegistrar
 
 @ReportsCrashes(
         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 = arrayOf(".*username.*", ".*password.*")
 )
 open class App : Application() {
 
+    lateinit var component: AppComponent
+        private set
+
+    lateinit var componentReflection: ComponentReflectionInjector<AppComponent>
+        private set
+
+    var appTheme = 0
+
     override fun onCreate() {
         super.onCreate()
-        Injekt = InjektScope(DefaultRegistrar())
-        Injekt.importModule(AppModule(this))
-
         if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree())
 
+        component = prepareAppComponent().build()
+
+        componentReflection = ComponentReflectionInjector(AppComponent::class.java, component)
+
+        setupTheme()
         setupAcra()
-        setupJobManager()
-        setupNotificationChannels()
-
-        LocaleHelper.updateConfiguration(this, resources.configuration)
     }
 
-    override fun attachBaseContext(base: Context) {
-        super.attachBaseContext(base)
-        if (BuildConfig.DEBUG) {
-            MultiDex.install(this)
-        }
+    private fun setupTheme() {
+        appTheme = PreferencesHelper.getTheme(this)
     }
 
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        LocaleHelper.updateConfiguration(this, newConfig, true)
+    protected open fun prepareAppComponent(): DaggerAppComponent.Builder {
+        return DaggerAppComponent.builder()
+                .appModule(AppModule(this))
     }
 
     protected open fun setupAcra() {
         ACRA.init(this)
     }
 
-    protected open fun setupJobManager() {
-        JobManager.create(this).addJobCreator { tag ->
-            when (tag) {
-                LibraryUpdateJob.TAG -> LibraryUpdateJob()
-                UpdateCheckerJob.TAG -> UpdateCheckerJob()
-                BackupCreatorJob.TAG -> BackupCreatorJob()
-                else -> null
-            }
+    companion object {
+        @JvmStatic
+        fun get(context: Context): App {
+            return context.applicationContext as App
         }
     }
-
-    protected open fun setupNotificationChannels() {
-        Notifications.createChannels(this)
-    }
-
 }

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

@@ -1,41 +0,0 @@
-package eu.kanade.tachiyomi
-
-import android.app.Application
-import com.google.gson.Gson
-import eu.kanade.tachiyomi.data.cache.ChapterCache
-import eu.kanade.tachiyomi.data.cache.CoverCache
-import eu.kanade.tachiyomi.data.database.DatabaseHelper
-import eu.kanade.tachiyomi.data.download.DownloadManager
-import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.data.track.TrackManager
-import eu.kanade.tachiyomi.network.NetworkHelper
-import eu.kanade.tachiyomi.source.SourceManager
-import uy.kohesive.injekt.api.InjektModule
-import uy.kohesive.injekt.api.InjektRegistrar
-import uy.kohesive.injekt.api.addSingletonFactory
-
-class AppModule(val app: Application) : InjektModule {
-
-    override fun InjektRegistrar.registerInjectables() {
-
-            addSingletonFactory { PreferencesHelper(app) }
-
-            addSingletonFactory { DatabaseHelper(app) }
-
-            addSingletonFactory { ChapterCache(app) }
-
-            addSingletonFactory { CoverCache(app) }
-
-            addSingletonFactory { NetworkHelper(app) }
-
-            addSingletonFactory { SourceManager(app) }
-
-            addSingletonFactory { DownloadManager(app) }
-
-            addSingletonFactory { TrackManager(app) }
-
-            addSingletonFactory { Gson() }
-
-    }
-
-}

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

@@ -0,0 +1,8 @@
+package eu.kanade.tachiyomi
+
+object Constants {
+    const val NOTIFICATION_LIBRARY_ID = 1
+    const val NOTIFICATION_UPDATER_ID = 2
+    const val NOTIFICATION_DOWNLOAD_CHAPTER_ID = 3
+    const val NOTIFICATION_DOWNLOAD_CHAPTER_ERROR_ID = 4
+}

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

@@ -1,63 +0,0 @@
-package eu.kanade.tachiyomi
-
-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.UpdateCheckerJob
-import java.io.File
-
-object Migrations {
-
-    /**
-     * Performs a migration when the application is updated.
-     *
-     * @param preferences Preferences of the application.
-     * @return true if a migration is performed, false otherwise.
-     */
-    fun upgrade(preferences: PreferencesHelper): Boolean {
-        val context = preferences.context
-        val oldVersion = preferences.lastVersionCode().getOrDefault()
-        if (oldVersion < BuildConfig.VERSION_CODE) {
-            preferences.lastVersionCode().set(BuildConfig.VERSION_CODE)
-
-            if (oldVersion == 0) return false
-
-            if (oldVersion < 14) {
-                // Restore jobs after upgrading to evernote's job scheduler.
-                if (BuildConfig.INCLUDE_UPDATER && preferences.automaticUpdates()) {
-                    UpdateCheckerJob.setupTask()
-                }
-                LibraryUpdateJob.setupTask()
-            }
-            if (oldVersion < 15) {
-                // Delete internal chapter cache dir.
-                File(context.cacheDir, "chapter_disk_cache").deleteRecursively()
-            }
-            if (oldVersion < 19) {
-                // Move covers to external files dir.
-                val oldDir = File(context.externalCacheDir, "cover_disk_cache")
-                if (oldDir.exists()) {
-                    val destDir = context.getExternalFilesDir("covers")
-                    if (destDir != null) {
-                        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()
-                    }
-                }
-            }
-            return true
-        }
-        return false
-    }
-
-}

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

@@ -1,23 +0,0 @@
-package eu.kanade.tachiyomi.data.backup
-import eu.kanade.tachiyomi.BuildConfig.APPLICATION_ID as ID
-
-
-object BackupConst {
-
-    const val INTENT_FILTER = "SettingsBackupFragment"
-    const val ACTION_BACKUP_COMPLETED_DIALOG = "$ID.$INTENT_FILTER.ACTION_BACKUP_COMPLETED_DIALOG"
-    const val ACTION_SET_PROGRESS_DIALOG = "$ID.$INTENT_FILTER.ACTION_SET_PROGRESS_DIALOG"
-    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,162 +0,0 @@
-package eu.kanade.tachiyomi.data.backup
-
-import android.app.IntentService
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import com.github.salomonbrys.kotson.set
-import com.google.gson.JsonArray
-import com.google.gson.JsonObject
-import com.hippo.unifile.UniFile
-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.MANGAS
-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]
- */
-class BackupCreateService : IntentService(NAME) {
-
-    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
-        internal const val BACKUP_CHAPTER = 0x2
-        internal const val BACKUP_CHAPTER_MASK = 0x2
-        internal const val BACKUP_HISTORY = 0x4
-        internal const val BACKUP_HISTORY_MASK = 0x4
-        internal const val BACKUP_TRACK = 0x8
-        internal const val BACKUP_TRACK_MASK = 0x8
-        internal const val BACKUP_ALL = 0xF
-
-        /**
-         * Make a backup from library
-         *
-         * @param context context of application
-         * @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) {
-            val intent = Intent(context, BackupCreateService::class.java).apply {
-                putExtra(BackupConst.EXTRA_URI, uri)
-                putExtra(EXTRA_IS_JOB, isJob)
-                putExtra(EXTRA_FLAGS, flags)
-            }
-            context.startService(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
-     *
-     * @param uri path of Uri
-     * @param isJob backup called from job
-     */
-    private fun createBackupFromApp(uri: Uri, flags: Int, isJob: Boolean) {
-        // Create root object
-        val root = JsonObject()
-
-        // Create manga array
-        val mangaEntries = JsonArray()
-
-        // Create category array
-        val categoryEntries = JsonArray()
-
-        // Add value's to root
-        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
-            if ((flags and BACKUP_CATEGORY_MASK) == BACKUP_CATEGORY) {
-                backupManager.backupCategories(categoryEntries)
-            }
-        }
-
-        try {
-            // When BackupCreatorJob
-            if (isJob) {
-                // Get dir of file and create
-                var dir = UniFile.fromUri(this, uri)
-                dir = dir.createDirectory("automatic")
-
-                // Delete older backups
-                val numberOfBackups = backupManager.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 {
-                    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)
-            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)
-            }
-        }
-    }
-}

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

@@ -1,41 +0,0 @@
-package eu.kanade.tachiyomi.data.backup
-
-import android.net.Uri
-import com.evernote.android.job.Job
-import com.evernote.android.job.JobManager
-import com.evernote.android.job.JobRequest
-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
-
-class BackupCreatorJob : Job() {
-
-    override fun onRunJob(params: Params): Result {
-        val preferences = Injekt.get<PreferencesHelper>()
-        val uri = Uri.parse(preferences.backupsDirectory().getOrDefault())
-        val flags = BackupCreateService.BACKUP_ALL
-        BackupCreateService.makeBackup(context, uri, flags, true)
-        return Result.SUCCESS
-    }
-
-    companion object {
-        const val TAG = "BackupCreator"
-
-        fun setupTask(prefInterval: Int? = null) {
-            val preferences = Injekt.get<PreferencesHelper>()
-            val interval = prefInterval ?: preferences.backupInterval().getOrDefault()
-            if (interval > 0) {
-                JobRequest.Builder(TAG)
-                        .setPeriodic(interval * 60 * 60 * 1000L, 10 * 60 * 1000)
-                        .setUpdateCurrent(true)
-                        .build()
-                        .schedule()
-            }
-        }
-
-        fun cancelTask() {
-            JobManager.instance().cancelAllForTag(TAG)
-        }
-    }
-}

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

@@ -1,212 +1,201 @@
 package eu.kanade.tachiyomi.data.backup
 
-import android.content.Context
-import com.github.salomonbrys.kotson.*
 import com.google.gson.*
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CATEGORY
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CATEGORY_MASK
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CHAPTER
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CHAPTER_MASK
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_HISTORY
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_HISTORY_MASK
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_TRACK
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_TRACK_MASK
-import eu.kanade.tachiyomi.data.backup.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.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 com.google.gson.reflect.TypeToken
+import com.google.gson.stream.JsonReader
+import eu.kanade.tachiyomi.data.backup.serializer.IdExclusion
+import eu.kanade.tachiyomi.data.backup.serializer.IntegerSerializer
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.*
-import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.data.preference.getOrDefault
-import eu.kanade.tachiyomi.source.Source
-import eu.kanade.tachiyomi.source.SourceManager
-import eu.kanade.tachiyomi.util.syncChaptersWithSource
-import rx.Observable
-import uy.kohesive.injekt.injectLazy
+import java.io.*
+import java.lang.reflect.Type
+import java.util.*
 
-class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
+/**
+ * This class provides the necessary methods to create and restore backups for the data of the
+ * application. The backup follows a JSON structure, with the following scheme:
+ *
+ * {
+ *     "mangas": [
+ *         {
+ *             "manga": {"id": 1, ...},
+ *             "chapters": [{"id": 1, ...}, {...}],
+ *             "sync": [{"id": 1, ...}, {...}],
+ *             "categories": ["cat1", "cat2", ...]
+ *         },
+ *         { ... }
+ *     ],
+ *     "categories": [
+ *         {"id": 1, ...},
+ *         {"id": 2, ...}
+ *     ]
+ * }
+ *
+ * @param db the database helper.
+ */
+class BackupManager(private val db: DatabaseHelper) {
+
+    private val MANGA = "manga"
+    private val MANGAS = "mangas"
+    private val CHAPTERS = "chapters"
+    private val MANGA_SYNC = "sync"
+    private val CATEGORIES = "categories"
+
+    @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
+    private val gson = GsonBuilder()
+            .registerTypeAdapter(Integer::class.java, IntegerSerializer())
+            .setExclusionStrategies(IdExclusion())
+            .create()
 
     /**
-     * Database.
-     */
-    internal val databaseHelper: DatabaseHelper by injectLazy()
-
-    /**
-     * Source manager.
-     */
-    internal val sourceManager: SourceManager by injectLazy()
-
-    /**
-     * Version of parser
-     */
-    var version: Int = version
-        private set
-
-    /**
-     * Json Parser
-     */
-    var parser: Gson = initParser()
-
-    /**
-     * Preferences
-     */
-    private val preferences: PreferencesHelper by injectLazy()
-
-    /**
-     * Set version of parser
+     * Backups the data of the application to a file.
      *
-     * @param version version of parser
+     * @param file the file where the backup will be saved.
+     * @throws IOException if there's any IO error.
      */
-    internal fun setVersion(version: Int) {
-        this.version = version
-        parser = initParser()
-    }
+    @Throws(IOException::class)
+    fun backupToFile(file: File) {
+        val root = backupToJson()
 
-    private fun initParser(): Gson {
-        return when (version) {
-            1 -> GsonBuilder().create()
-            2 -> GsonBuilder()
-                    .registerTypeAdapter<MangaImpl>(MangaTypeAdapter.build())
-                    .registerTypeHierarchyAdapter<ChapterImpl>(ChapterTypeAdapter.build())
-                    .registerTypeAdapter<CategoryImpl>(CategoryTypeAdapter.build())
-                    .registerTypeAdapter<DHistory>(HistoryTypeAdapter.build())
-                    .registerTypeHierarchyAdapter<TrackImpl>(TrackTypeAdapter.build())
-                    .create()
-            else -> throw Exception("Json version unknown")
+        FileWriter(file).use {
+            gson.toJson(root, it)
         }
     }
 
     /**
-     * Backup the categories of library
+     * Creates a JSON object containing the backup of the app's data.
      *
-     * @param root root of categories json
+     * @return the backup as a JSON object.
      */
-    internal fun backupCategories(root: JsonArray) {
-        val categories = databaseHelper.getCategories().executeAsBlocking()
-        categories.forEach { root.add(parser.toJsonTree(it)) }
+    fun backupToJson(): JsonObject {
+        val root = JsonObject()
+
+        // Backup library mangas and its dependencies
+        val mangaEntries = JsonArray()
+        root.add(MANGAS, mangaEntries)
+        for (manga in db.getFavoriteMangas().executeAsBlocking()) {
+            mangaEntries.add(backupManga(manga))
+        }
+
+        // Backup categories
+        val categoryEntries = JsonArray()
+        root.add(CATEGORIES, categoryEntries)
+        for (category in db.getCategories().executeAsBlocking()) {
+            categoryEntries.add(backupCategory(category))
+        }
+
+        return root
     }
 
     /**
-     * Convert a manga to Json
+     * Backups a manga and its related data (chapters, categories this manga is in, sync...).
      *
-     * @param manga manga that gets converted
-     * @return [JsonElement] containing manga information
+     * @param manga the manga to backup.
+     * @return a JSON object containing all the data of the manga.
      */
-    internal fun backupMangaObject(manga: Manga, options: Int): JsonElement {
+    private fun backupManga(manga: Manga): JsonObject {
         // Entry for this manga
         val entry = JsonObject()
 
         // Backup manga fields
-        entry[MANGA] = parser.toJsonTree(manga)
+        entry.add(MANGA, gson.toJsonTree(manga))
 
-        // Check if user wants chapter information in backup
-        if (options and BACKUP_CHAPTER_MASK == BACKUP_CHAPTER) {
-            // Backup all the chapters
-            val chapters = databaseHelper.getChapters(manga).executeAsBlocking()
-            if (!chapters.isEmpty()) {
-                val chaptersJson = parser.toJsonTree(chapters)
-                if (chaptersJson.asJsonArray.size() > 0) {
-                    entry[CHAPTERS] = chaptersJson
-                }
-            }
+        // Backup all the chapters
+        val chapters = db.getChapters(manga).executeAsBlocking()
+        if (!chapters.isEmpty()) {
+            entry.add(CHAPTERS, gson.toJsonTree(chapters))
         }
 
-        // Check if user wants category information in backup
-        if (options and BACKUP_CATEGORY_MASK == BACKUP_CATEGORY) {
-            // Backup categories for this manga
-            val categoriesForManga = databaseHelper.getCategoriesForManga(manga).executeAsBlocking()
-            if (!categoriesForManga.isEmpty()) {
-                val categoriesNames = categoriesForManga.map { it.name }
-                entry[CATEGORIES] = parser.toJsonTree(categoriesNames)
-            }
+        // Backup manga sync
+        val mangaSync = db.getMangasSync(manga).executeAsBlocking()
+        if (!mangaSync.isEmpty()) {
+            entry.add(MANGA_SYNC, gson.toJsonTree(mangaSync))
         }
 
-        // 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()) {
-                entry[TRACK] = parser.toJsonTree(tracks)
-            }
-        }
-
-        // Check if user wants history information in backup
-        if (options and BACKUP_HISTORY_MASK == BACKUP_HISTORY) {
-            val historyForManga = databaseHelper.getHistoryByMangaId(manga.id!!).executeAsBlocking()
-            if (!historyForManga.isEmpty()) {
-                val historyData = historyForManga.mapNotNull { history ->
-                    val url = databaseHelper.getChapter(history.chapter_id).executeAsBlocking()?.url
-                    url?.let { DHistory(url, history.last_read) }
-                }
-                val historyJson = parser.toJsonTree(historyData)
-                if (historyJson.asJsonArray.size() > 0) {
-                    entry[HISTORY] = historyJson
-                }
+        // Backup categories for this manga
+        val categoriesForManga = db.getCategoriesForManga(manga).executeAsBlocking()
+        if (!categoriesForManga.isEmpty()) {
+            val categoriesNames = ArrayList<String>()
+            for (category in categoriesForManga) {
+                categoriesNames.add(category.name)
             }
+            entry.add(CATEGORIES, gson.toJsonTree(categoriesNames))
         }
 
         return entry
     }
 
-    fun restoreMangaNoFetch(manga: Manga, dbManga: Manga) {
-        manga.id = dbManga.id
-        manga.copyFrom(dbManga)
-        manga.favorite = true
-        insertManga(manga)
+    /**
+     * Backups a category.
+     *
+     * @param category the category to backup.
+     * @return a JSON object containing the data of the category.
+     */
+    private fun backupCategory(category: Category): JsonElement {
+        return gson.toJsonTree(category)
     }
 
     /**
-     * [Observable] that fetches manga information
+     * Restores a backup from a file.
      *
-     * @param source source of manga
-     * @param manga manga that needs updating
-     * @return [Observable] that contains manga
+     * @param file the file containing the backup.
+     * @throws IOException if there's any IO error.
      */
-    fun restoreMangaFetchObservable(source: Source, manga: Manga): Observable<Manga> {
-        return source.fetchMangaDetails(manga)
-                .map { networkManga ->
-                    manga.copyFrom(networkManga)
-                    manga.favorite = true
-                    manga.initialized = true
-                    manga.id = insertManga(manga)
-                    manga
-                }
+    @Throws(IOException::class)
+    fun restoreFromFile(file: File) {
+        JsonReader(FileReader(file)).use {
+            val root = JsonParser().parse(it).asJsonObject
+            restoreFromJson(root)
+        }
     }
 
     /**
-     * [Observable] that fetches chapter information
+     * Restores a backup from an input stream.
      *
-     * @param source source of manga
-     * @param manga manga that needs updating
-     * @return [Observable] that contains manga
+     * @param stream the stream containing the backup.
+     * @throws IOException if there's any IO error.
      */
-    fun restoreChapterFetchObservable(source: Source, manga: Manga, chapters: List<Chapter>): Observable<Pair<List<Chapter>, List<Chapter>>> {
-        return source.fetchChapterList(manga)
-                .map { syncChaptersWithSource(databaseHelper, it, manga, source) }
-                .doOnNext {
-                    if (it.first.isNotEmpty()) {
-                        chapters.forEach { it.manga_id = manga.id }
-                        insertChapters(chapters)
-                    }
-                }
+    @Throws(IOException::class)
+    fun restoreFromStream(stream: InputStream) {
+        JsonReader(InputStreamReader(stream)).use {
+            val root = JsonParser().parse(it).asJsonObject
+            restoreFromJson(root)
+        }
     }
 
     /**
-     * Restore the categories from Json
+     * Restores a backup from a JSON object. Everything executes in a single transaction so that
+     * nothing is modified if there's an error.
      *
-     * @param jsonCategories array containing categories
+     * @param root the root of the JSON.
      */
-    internal fun restoreCategories(jsonCategories: JsonArray) {
+    fun restoreFromJson(root: JsonObject) {
+        db.inTransaction {
+            // Restore categories
+            root.get(CATEGORIES)?.let {
+                restoreCategories(it.asJsonArray)
+            }
+
+            // Restore mangas
+            root.get(MANGAS)?.let {
+                restoreMangas(it.asJsonArray)
+            }
+        }
+    }
+
+    /**
+     * Restores the categories.
+     *
+     * @param jsonCategories the categories of the json.
+     */
+    private fun restoreCategories(jsonCategories: JsonArray) {
         // Get categories from file and from db
-        val dbCategories = databaseHelper.getCategories().executeAsBlocking()
-        val backupCategories = parser.fromJson<List<CategoryImpl>>(jsonCategories)
+        val dbCategories = db.getCategories().executeAsBlocking()
+        val backupCategories = getArrayOrEmpty<Category>(jsonCategories,
+                object : TypeToken<List<Category>>() {}.type)
 
         // Iterate over them
-        backupCategories.forEach { category ->
+        for (category in backupCategories) {
             // Used to know if the category is already in the db
             var found = false
             for (dbCategory in dbCategories) {
@@ -223,20 +212,106 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
             if (!found) {
                 // Let the db assign the id
                 category.id = null
-                val result = databaseHelper.insertCategory(category).executeAsBlocking()
+                val result = db.insertCategory(category).executeAsBlocking()
                 category.id = result.insertedId()?.toInt()
             }
         }
     }
 
+    /**
+     * Restores all the mangas and its related data.
+     *
+     * @param jsonMangas the mangas and its related data (chapters, sync, categories) from the json.
+     */
+    private fun restoreMangas(jsonMangas: JsonArray) {
+        val chapterToken = object : TypeToken<List<Chapter>>() {}.type
+        val mangaSyncToken = object : TypeToken<List<MangaSync>>() {}.type
+        val categoriesNamesToken = object : TypeToken<List<String>>() {}.type
+
+        for (backupManga in jsonMangas) {
+            // Map every entry to objects
+            val element = backupManga.asJsonObject
+            val manga = gson.fromJson(element.get(MANGA), Manga::class.java)
+            val chapters = getArrayOrEmpty<Chapter>(element.get(CHAPTERS), chapterToken)
+            val sync = getArrayOrEmpty<MangaSync>(element.get(MANGA_SYNC), mangaSyncToken)
+            val categories = getArrayOrEmpty<String>(element.get(CATEGORIES), categoriesNamesToken)
+
+            // Restore everything related to this manga
+            restoreManga(manga)
+            restoreChaptersForManga(manga, chapters)
+            restoreSyncForManga(manga, sync)
+            restoreCategoriesForManga(manga, categories)
+        }
+    }
+
+    /**
+     * Restores a manga.
+     *
+     * @param manga the manga to restore.
+     */
+    private fun restoreManga(manga: Manga) {
+        // Try to find existing manga in db
+        val dbManga = db.getManga(manga.url, manga.source).executeAsBlocking()
+        if (dbManga == null) {
+            // Let the db assign the id
+            manga.id = null
+            val result = db.insertManga(manga).executeAsBlocking()
+            manga.id = result.insertedId()
+        } else {
+            // If it exists already, we copy only the values related to the source from the db
+            // (they can be up to date). Local values (flags) are kept from the backup.
+            manga.id = dbManga.id
+            manga.copyFrom(dbManga)
+            manga.favorite = true
+            db.insertManga(manga).executeAsBlocking()
+        }
+    }
+
+    /**
+     * Restores the chapters of a manga.
+     *
+     * @param manga the manga whose chapters have to be restored.
+     * @param chapters the chapters to restore.
+     */
+    private fun restoreChaptersForManga(manga: Manga, chapters: List<Chapter>) {
+        // Fix foreign keys with the current manga id
+        for (chapter in chapters) {
+            chapter.manga_id = manga.id
+        }
+
+        val dbChapters = db.getChapters(manga).executeAsBlocking()
+        val chaptersToUpdate = ArrayList<Chapter>()
+        for (backupChapter in chapters) {
+            // Try to find existing chapter in db
+            val pos = dbChapters.indexOf(backupChapter)
+            if (pos != -1) {
+                // The chapter is already in the db, only update its fields
+                val dbChapter = dbChapters[pos]
+                // If one of them was read, the chapter will be marked as read
+                dbChapter.read = backupChapter.read || dbChapter.read
+                dbChapter.last_page_read = Math.max(backupChapter.last_page_read, dbChapter.last_page_read)
+                chaptersToUpdate.add(dbChapter)
+            } else {
+                // Insert new chapter. Let the db assign the id
+                backupChapter.id = null
+                chaptersToUpdate.add(backupChapter)
+            }
+        }
+
+        // Update database
+        if (!chaptersToUpdate.isEmpty()) {
+            db.insertChapters(chaptersToUpdate).executeAsBlocking()
+        }
+    }
+
     /**
      * Restores the categories a manga is in.
      *
      * @param manga the manga whose categories have to be restored.
      * @param categories the categories to restore.
      */
-    internal fun restoreCategoriesForManga(manga: Manga, categories: List<String>) {
-        val dbCategories = databaseHelper.getCategories().executeAsBlocking()
+    private fun restoreCategoriesForManga(manga: Manga, categories: List<String>) {
+        val dbCategories = db.getCategories().executeAsBlocking()
         val mangaCategoriesToUpdate = ArrayList<MangaCategory>()
         for (backupCategoryStr in categories) {
             for (dbCategory in dbCategories) {
@@ -251,151 +326,56 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
         if (!mangaCategoriesToUpdate.isEmpty()) {
             val mangaAsList = ArrayList<Manga>()
             mangaAsList.add(manga)
-            databaseHelper.deleteOldMangasCategories(mangaAsList).executeAsBlocking()
-            databaseHelper.insertMangasCategories(mangaCategoriesToUpdate).executeAsBlocking()
+            db.deleteOldMangasCategories(mangaAsList).executeAsBlocking()
+            db.insertMangasCategories(mangaCategoriesToUpdate).executeAsBlocking()
         }
     }
 
-    /**
-     * Restore history from Json
-     *
-     * @param history list containing history to be restored
-     */
-    internal fun restoreHistoryForManga(history: List<DHistory>) {
-        // List containing history to be updated
-        val historyToBeUpdated = ArrayList<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)
-                }
-                historyToBeUpdated.add(dbHistory)
-            } else {
-                // If not in database create
-                databaseHelper.getChapter(url).executeAsBlocking()?.let {
-                    val historyToAdd = History.create(it).apply {
-                        last_read = lastRead
-                    }
-                    historyToBeUpdated.add(historyToAdd)
-                }
-            }
-        }
-        databaseHelper.updateHistoryLastRead(historyToBeUpdated).executeAsBlocking()
-    }
-
     /**
      * Restores the sync of a manga.
      *
      * @param manga the manga whose sync have to be restored.
-     * @param tracks the track list to restore.
+     * @param sync the sync to restore.
      */
-    internal fun restoreTrackForManga(manga: Manga, tracks: List<Track>) {
+    private fun restoreSyncForManga(manga: Manga, sync: List<MangaSync>) {
         // Fix foreign keys with the current manga id
-        tracks.map { it.manga_id = manga.id!! }
-
-        // Get tracks from database
-        val dbTracks = databaseHelper.getTracks(manga).executeAsBlocking()
-        val trackToUpdate = ArrayList<Track>()
-
-        for (track in tracks) {
-            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) {
-                        dbTrack.remote_id = track.remote_id
-                    }
-                    dbTrack.last_chapter_read = Math.max(dbTrack.last_chapter_read, track.last_chapter_read)
-                    isInDatabase = true
-                    trackToUpdate.add(dbTrack)
-                    break
-                }
-            }
-            if (!isInDatabase) {
-                // Insert new sync. Let the db assign the id
-                track.id = null
-                trackToUpdate.add(track)
-            }
+        for (mangaSync in sync) {
+            mangaSync.manga_id = manga.id
         }
-        // Update database
-        if (!trackToUpdate.isEmpty()) {
-            databaseHelper.insertTracks(trackToUpdate).executeAsBlocking()
-        }
-    }
 
-    /**
-     * Restore the chapters for manga if chapters already in database
-     *
-     * @param manga manga of chapters
-     * @param chapters list containing chapters that get restored
-     * @return boolean answering if chapter fetch is not needed
-     */
-    internal fun restoreChaptersForManga(manga: Manga, chapters: List<Chapter>): Boolean {
-        val dbChapters = databaseHelper.getChapters(manga).executeAsBlocking()
-
-        // Return if fetch is needed
-        if (dbChapters.isEmpty() || dbChapters.size < chapters.size)
-            return false
-
-        for (chapter in chapters) {
-            val pos = dbChapters.indexOf(chapter)
+        val dbSyncs = db.getMangasSync(manga).executeAsBlocking()
+        val syncToUpdate = ArrayList<MangaSync>()
+        for (backupSync in sync) {
+            // Try to find existing chapter in db
+            val pos = dbSyncs.indexOf(backupSync)
             if (pos != -1) {
-                val dbChapter = dbChapters[pos]
-                chapter.id = dbChapter.id
-                chapter.copyFrom(dbChapter)
-                break
+                // The sync is already in the db, only update its fields
+                val dbSync = dbSyncs[pos]
+                // Mark the max chapter as read and nothing else
+                dbSync.last_chapter_read = Math.max(backupSync.last_chapter_read, dbSync.last_chapter_read)
+                syncToUpdate.add(dbSync)
+            } else {
+                // Insert new sync. Let the db assign the id
+                backupSync.id = null
+                syncToUpdate.add(backupSync)
             }
         }
-        // Filter the chapters that couldn't be found.
-        chapters.filter { it.id != null }
-        chapters.map { it.manga_id = manga.id }
 
-        insertChapters(chapters)
-        return true
+        // Update database
+        if (!syncToUpdate.isEmpty()) {
+            db.insertMangasSync(syncToUpdate).executeAsBlocking()
+        }
     }
 
     /**
-     * Returns manga
+     * Returns a list of items from a json element, or an empty list if the element is null.
      *
-     * @return [Manga], null if not found
+     * @param element the json to be mapped to a list of items.
+     * @param type the gson mapping to restore the list.
+     * @return a list of items.
      */
-    internal fun getMangaFromDatabase(manga: Manga): Manga? {
-        return databaseHelper.getManga(manga.url, manga.source).executeAsBlocking()
+    private fun <T> getArrayOrEmpty(element: JsonElement?, type: Type): List<T> {
+        return gson.fromJson<List<T>>(element, type) ?: ArrayList<T>()
     }
 
-    /**
-     * Returns list containing manga from library
-     *
-     * @return [Manga] from library
-     */
-    internal fun getFavoriteManga(): List<Manga> {
-        return databaseHelper.getFavoriteMangas().executeAsBlocking()
-    }
-
-    /**
-     * Inserts manga and returns id
-     *
-     * @return id of [Manga], null if not found
-     */
-    internal fun insertManga(manga: Manga): Long? {
-        return databaseHelper.insertManga(manga).executeAsBlocking().insertedId()
-    }
-
-    /**
-     * Inserts list of chapters
-     */
-    internal fun insertChapters(chapters: List<Chapter>) {
-        databaseHelper.updateChaptersBackup(chapters).executeAsBlocking()
-    }
-
-    /**
-     * Return number of backups.
-     *
-     * @return number of backups selected by user
-     */
-    fun numberOfBackups(): Int {
-        return preferences.numberOfBackups().getOrDefault()
-    }
 }

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

@@ -1,410 +0,0 @@
-package eu.kanade.tachiyomi.data.backup
-
-import android.app.Service
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.os.IBinder
-import android.os.PowerManager
-import com.github.salomonbrys.kotson.fromJson
-import com.google.gson.JsonArray
-import com.google.gson.JsonParser
-import com.google.gson.stream.JsonReader
-import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.data.backup.models.Backup.CATEGORIES
-import eu.kanade.tachiyomi.data.backup.models.Backup.CHAPTERS
-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.MANGAS
-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.source.Source
-import eu.kanade.tachiyomi.util.chop
-import eu.kanade.tachiyomi.util.isServiceRunning
-import eu.kanade.tachiyomi.util.sendLocalBroadcast
-import rx.Observable
-import rx.Subscription
-import rx.schedulers.Schedulers
-import timber.log.Timber
-import uy.kohesive.injekt.injectLazy
-import java.io.File
-import java.text.SimpleDateFormat
-import java.util.*
-import java.util.concurrent.ExecutorService
-import java.util.concurrent.Executors
-
-/**
- * Restores backup from json file
- */
-class BackupRestoreService : Service() {
-
-    companion object {
-
-        /**
-         * 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 {
-            return context.isServiceRunning(BackupRestoreService::class.java)
-        }
-
-        /**
-         * Starts a service to restore a backup from Json
-         *
-         * @param context context of application
-         * @param uri path of Uri
-         */
-        fun start(context: Context, uri: Uri) {
-            if (!isRunning(context)) {
-                val intent = Intent(context, BackupRestoreService::class.java).apply {
-                    putExtra(BackupConst.EXTRA_URI, uri)
-                }
-                context.startService(intent)
-            }
-        }
-
-        /**
-         * Stops the service.
-         *
-         * @param context the application context.
-         */
-        fun stop(context: Context) {
-            context.stopService(Intent(context, BackupRestoreService::class.java))
-        }
-    }
-
-    /**
-     * Wake lock that will be held until the service is destroyed.
-     */
-    private lateinit var wakeLock: PowerManager.WakeLock
-
-    /**
-     * Subscription where the update is done.
-     */
-    private var subscription: Subscription? = null
-
-    /**
-     * The progress of a backup restore
-     */
-    private var restoreProgress = 0
-
-    /**
-     * Amount of manga in Json file (needed for restore)
-     */
-    private var restoreAmount = 0
-
-    /**
-     * List containing errors
-     */
-    private val errors = mutableListOf<Pair<Date, String>>()
-
-    /**
-     * Backup manager
-     */
-    private lateinit var backupManager: BackupManager
-
-    /**
-     * Database
-     */
-    private val db: DatabaseHelper by injectLazy()
-
-    lateinit var executor: ExecutorService
-
-    /**
-     * Method called when the service is created. It injects dependencies and acquire the wake lock.
-     */
-    override fun onCreate() {
-        super.onCreate()
-        wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager).newWakeLock(
-                PowerManager.PARTIAL_WAKE_LOCK, "BackupRestoreService:WakeLock")
-        wakeLock.acquire()
-        executor = Executors.newSingleThreadExecutor()
-    }
-
-    /**
-     * Method called when the service is destroyed. It destroys the running subscription and
-     * releases the wake lock.
-     */
-    override fun onDestroy() {
-        subscription?.unsubscribe()
-        executor.shutdown() // must be called after unsubscribe
-        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? {
-        return null
-    }
-
-    /**
-     * Method called when the service receives an intent.
-     *
-     * @param intent the start intent from.
-     * @param flags the flags of the command.
-     * @param startId the start id of this command.
-     * @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)
-
-        // Unsubscribe from any previous subscription if needed.
-        subscription?.unsubscribe()
-
-        subscription = Observable.using(
-                { db.lowLevel().beginTransaction() },
-                { getRestoreObservable(uri).doOnNext{ db.lowLevel().setTransactionSuccessful() } },
-                { executor.execute { db.lowLevel().endTransaction() } })
-                .doAfterTerminate { stopSelf(startId) }
-                .subscribeOn(Schedulers.from(executor))
-                .subscribe()
-
-        return Service.START_NOT_STICKY
-    }
-
-    /**
-     * Returns an [Observable] containing restore process.
-     *
-     * @param uri restore file
-     * @return [Observable<Manga>]
-     */
-    private fun getRestoreObservable(uri: Uri): Observable<List<Manga>> {
-        val startTime = System.currentTimeMillis()
-
-        return Observable.just(Unit)
-                .map {
-                    val reader = JsonReader(contentResolver.openInputStream(uri).bufferedReader())
-                    val json = JsonParser().parse(reader).asJsonObject
-
-                    // Get parser version
-                    val version = json.get(VERSION)?.asInt ?: 1
-
-                    // Initialize manager
-                    backupManager = BackupManager(this, version)
-
-                    val mangasJson = json.get(MANGAS).asJsonArray
-
-                    restoreAmount = mangasJson.size() + 1 // +1 for categories
-                    restoreProgress = 0
-                    errors.clear()
-
-                    // Restore categories
-                    json.get(CATEGORIES)?.let {
-                        backupManager.restoreCategories(it.asJsonArray)
-                        restoreProgress += 1
-                        showRestoreProgress(restoreProgress, restoreAmount, "Categories added", errors.size)
-                    }
-
-                    mangasJson
-                }
-                .flatMap { Observable.from(it) }
-                .concatMap {
-                    val obj = it.asJsonObject
-                    val manga = backupManager.parser.fromJson<MangaImpl>(obj.get(MANGA))
-                    val chapters = backupManager.parser.fromJson<List<ChapterImpl>>(obj.get(CHAPTERS) ?: JsonArray())
-                    val categories = backupManager.parser.fromJson<List<String>>(obj.get(CATEGORIES) ?: JsonArray())
-                    val history = backupManager.parser.fromJson<List<DHistory>>(obj.get(HISTORY) ?: JsonArray())
-                    val tracks = backupManager.parser.fromJson<List<TrackImpl>>(obj.get(TRACK) ?: JsonArray())
-
-                    val observable = getMangaRestoreObservable(manga, chapters, categories, history, tracks)
-                    if (observable != null) {
-                        observable
-                    } else {
-                        errors.add(Date() to "${manga.title} - ${getString(R.string.source_not_found)}")
-                        restoreProgress += 1
-                        val content = getString(R.string.dialog_restoring_source_not_found, manga.title.chop(15))
-                        showRestoreProgress(restoreProgress, restoreAmount, manga.title, errors.size, content)
-                        Observable.just(manga)
-                    }
-                }
-                .toList()
-                .doOnNext {
-                    val endTime = System.currentTimeMillis()
-                    val time = endTime - startTime
-                    val logFile = writeErrorLog()
-                    val completeIntent = Intent(BackupConst.INTENT_FILTER).apply {
-                        putExtra(BackupConst.EXTRA_TIME, time)
-                        putExtra(BackupConst.EXTRA_ERRORS, errors.size)
-                        putExtra(BackupConst.EXTRA_ERROR_FILE_PATH, logFile.parent)
-                        putExtra(BackupConst.EXTRA_ERROR_FILE, logFile.name)
-                        putExtra(BackupConst.ACTION, BackupConst.ACTION_RESTORE_COMPLETED_DIALOG)
-                    }
-                    sendLocalBroadcast(completeIntent)
-
-                }
-                .doOnError { error ->
-                    Timber.e(error)
-                    writeErrorLog()
-                    val errorIntent = Intent(BackupConst.INTENT_FILTER).apply {
-                        putExtra(BackupConst.ACTION, BackupConst.ACTION_ERROR_RESTORE_DIALOG)
-                        putExtra(BackupConst.EXTRA_ERROR_MESSAGE, error.message)
-                    }
-                    sendLocalBroadcast(errorIntent)
-                }
-                .onErrorReturn { emptyList() }
-    }
-
-    /**
-     * Write errors to error log
-     */
-    private fun writeErrorLog(): File {
-        try {
-            if (errors.isNotEmpty()) {
-                val destFile = File(externalCacheDir, "tachiyomi_restore.log")
-                val sdf = SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.getDefault())
-
-                destFile.bufferedWriter().use { out ->
-                    errors.forEach { (date, message) ->
-                        out.write("[${sdf.format(date)}] $message\n")
-                    }
-                }
-                return destFile
-            }
-        } catch (e: Exception) {
-            // Empty
-        }
-        return File("")
-    }
-
-    /**
-     * 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 {
-                    chapterFetchObservable(source, it, 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/models/Backup.kt

@@ -1,23 +0,0 @@
-package eu.kanade.tachiyomi.data.backup.models
-
-import java.text.SimpleDateFormat
-import java.util.*
-
-/**
- * Json values
- */
-object Backup {
-    const val CURRENT_VERSION = 2
-    const val MANGA = "manga"
-    const val MANGAS = "mangas"
-    const val TRACK = "track"
-    const val CHAPTERS = "chapters"
-    const val CATEGORIES = "categories"
-    const val HISTORY = "history"
-    const val VERSION = "version"
-
-    fun getDefaultFilename(): String {
-        val date = SimpleDateFormat("yyyy-MM-dd_HH-mm", Locale.getDefault()).format(Date())
-        return "tachiyomi_$date.json"
-    }
-}

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

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

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

@@ -1,31 +0,0 @@
-package eu.kanade.tachiyomi.data.backup.serializer
-
-import com.github.salomonbrys.kotson.typeAdapter
-import com.google.gson.TypeAdapter
-import eu.kanade.tachiyomi.data.database.models.CategoryImpl
-
-/**
- * JSON Serializer used to write / read [CategoryImpl] to / from json
- */
-object CategoryTypeAdapter {
-
-    fun build(): TypeAdapter<CategoryImpl> {
-        return typeAdapter {
-            write {
-                beginArray()
-                value(it.name)
-                value(it.order)
-                endArray()
-            }
-
-            read {
-                beginArray()
-                val category = CategoryImpl()
-                category.name = nextString()
-                category.order = nextInt()
-                endArray()
-                category
-            }
-        }
-    }
-}

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

@@ -1,61 +0,0 @@
-package eu.kanade.tachiyomi.data.backup.serializer
-
-import com.github.salomonbrys.kotson.typeAdapter
-import com.google.gson.TypeAdapter
-import com.google.gson.stream.JsonToken
-import eu.kanade.tachiyomi.data.database.models.ChapterImpl
-
-/**
- * JSON Serializer used to write / read [ChapterImpl] to / from json
- */
-object ChapterTypeAdapter {
-
-    private const val URL = "u"
-    private const val READ = "r"
-    private const val BOOKMARK = "b"
-    private const val LAST_READ = "l"
-
-    fun build(): TypeAdapter<ChapterImpl> {
-        return typeAdapter {
-            write {
-                if (it.read || it.bookmark || it.last_page_read != 0) {
-                    beginObject()
-                    name(URL)
-                    value(it.url)
-                    if (it.read) {
-                        name(READ)
-                        value(1)
-                    }
-                    if (it.bookmark) {
-                        name(BOOKMARK)
-                        value(1)
-                    }
-                    if (it.last_page_read != 0) {
-                        name(LAST_READ)
-                        value(it.last_page_read)
-                    }
-                    endObject()
-                }
-            }
-
-            read {
-                val chapter = ChapterImpl()
-                beginObject()
-                while (hasNext()) {
-                    if (peek() == JsonToken.NAME) {
-                        val name = nextName()
-
-                        when (name) {
-                            URL -> chapter.url = nextString()
-                            READ -> chapter.read = nextInt() == 1
-                            BOOKMARK -> chapter.bookmark = nextInt() == 1
-                            LAST_READ -> chapter.last_page_read = nextInt()
-                        }
-                    }
-                }
-                endObject()
-                chapter
-            }
-        }
-    }
-}

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

@@ -1,32 +0,0 @@
-package eu.kanade.tachiyomi.data.backup.serializer
-
-import com.github.salomonbrys.kotson.typeAdapter
-import com.google.gson.TypeAdapter
-import eu.kanade.tachiyomi.data.backup.models.DHistory
-
-/**
- * JSON Serializer used to write / read [DHistory] to / from json
- */
-object HistoryTypeAdapter {
-
-    fun build(): TypeAdapter<DHistory> {
-        return typeAdapter {
-            write {
-                if (it.lastRead != 0L) {
-                    beginArray()
-                    value(it.url)
-                    value(it.lastRead)
-                    endArray()
-                }
-            }
-
-            read {
-                beginArray()
-                val url = nextString()
-                val lastRead = nextLong()
-                endArray()
-                DHistory(url, lastRead)
-            }
-        }
-    }
-}

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

@@ -0,0 +1,27 @@
+package eu.kanade.tachiyomi.data.backup.serializer
+
+import com.google.gson.ExclusionStrategy
+import com.google.gson.FieldAttributes
+import eu.kanade.tachiyomi.data.database.models.Category
+import eu.kanade.tachiyomi.data.database.models.Chapter
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.models.MangaSync
+
+class IdExclusion : ExclusionStrategy {
+
+    private val categoryExclusions = listOf("id")
+    private val mangaExclusions = listOf("id")
+    private val chapterExclusions = listOf("id", "manga_id")
+    private val syncExclusions = listOf("id", "manga_id", "update")
+
+    override fun shouldSkipField(f: FieldAttributes) = when (f.declaringClass) {
+        Manga::class.java -> mangaExclusions.contains(f.name)
+        Chapter::class.java -> chapterExclusions.contains(f.name)
+        MangaSync::class.java -> syncExclusions.contains(f.name)
+        Category::class.java -> categoryExclusions.contains(f.name)
+        else -> false
+    }
+
+    override fun shouldSkipClass(clazz: Class<*>) = false
+
+}

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

@@ -0,0 +1,17 @@
+package eu.kanade.tachiyomi.data.backup.serializer
+
+import com.google.gson.JsonElement
+import com.google.gson.JsonPrimitive
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
+
+import java.lang.reflect.Type
+
+class IntegerSerializer : JsonSerializer<Int> {
+
+    override fun serialize(value: Int?, type: Type, context: JsonSerializationContext): JsonElement? {
+        if (value != null && value !== 0)
+            return JsonPrimitive(value)
+        return null
+    }
+}

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

@@ -1,37 +0,0 @@
-package eu.kanade.tachiyomi.data.backup.serializer
-
-import com.github.salomonbrys.kotson.typeAdapter
-import com.google.gson.TypeAdapter
-import eu.kanade.tachiyomi.data.database.models.MangaImpl
-
-/**
- * JSON Serializer used to write / read [MangaImpl] to / from json
- */
-object MangaTypeAdapter {
-
-    fun build(): TypeAdapter<MangaImpl> {
-        return typeAdapter {
-            write {
-                beginArray()
-                value(it.url)
-                value(it.title)
-                value(it.source)
-                value(it.viewer)
-                value(it.chapter_flags)
-                endArray()
-            }
-
-            read {
-                beginArray()
-                val manga = MangaImpl()
-                manga.url = nextString()
-                manga.title = nextString()
-                manga.source = nextLong()
-                manga.viewer = nextInt()
-                manga.chapter_flags = nextInt()
-                endArray()
-                manga
-            }
-        }
-    }
-}

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

@@ -1,53 +0,0 @@
-package eu.kanade.tachiyomi.data.backup.serializer
-
-import com.github.salomonbrys.kotson.typeAdapter
-import com.google.gson.TypeAdapter
-import com.google.gson.stream.JsonToken
-import eu.kanade.tachiyomi.data.database.models.TrackImpl
-
-/**
- * JSON Serializer used to write / read [TrackImpl] to / from json
- */
-object TrackTypeAdapter {
-
-    private const val SYNC = "s"
-    private const val REMOTE = "r"
-    private const val TITLE = "t"
-    private const val LAST_READ = "l"
-
-    fun build(): TypeAdapter<TrackImpl> {
-        return typeAdapter {
-            write {
-                beginObject()
-                name(TITLE)
-                value(it.title)
-                name(SYNC)
-                value(it.sync_id)
-                name(REMOTE)
-                value(it.remote_id)
-                name(LAST_READ)
-                value(it.last_chapter_read)
-                endObject()
-            }
-
-            read {
-                val track = TrackImpl()
-                beginObject()
-                while (hasNext()) {
-                    if (peek() == JsonToken.NAME) {
-                        val name = nextName()
-
-                        when (name) {
-                            TITLE -> track.title = nextString()
-                            SYNC -> track.sync_id = nextInt()
-                            REMOTE -> track.remote_id = nextInt()
-                            LAST_READ -> track.last_chapter_read = nextInt()
-                        }
-                    }
-                }
-                endObject()
-                track
-            }
-        }
-    }
-}

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

@@ -2,19 +2,18 @@ package eu.kanade.tachiyomi.data.cache
 
 import android.content.Context
 import android.text.format.Formatter
-import com.github.salomonbrys.kotson.fromJson
 import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
 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.saveTo
+import eu.kanade.tachiyomi.data.source.model.Page
+import eu.kanade.tachiyomi.util.DiskUtils
+import eu.kanade.tachiyomi.util.saveImageTo
 import okhttp3.Response
 import okio.Okio
 import rx.Observable
-import uy.kohesive.injekt.injectLazy
 import java.io.File
 import java.io.IOException
+import java.lang.reflect.Type
 
 /**
  * Class used to create chapter cache
@@ -27,6 +26,15 @@ import java.io.IOException
  */
 class ChapterCache(private val context: Context) {
 
+    /** Google Json class used for parsing JSON files.  */
+    private val gson: Gson = Gson()
+
+    /** Cache class used for cache management.  */
+    private val diskCache: DiskLruCache
+
+    /** Page list collection used for deserializing from JSON.  */
+    private val pageListCollection: Type = object : TypeToken<List<Page>>() {}.type
+
     companion object {
         /** Name of cache directory.  */
         const val PARAMETER_CACHE_DIRECTORY = "chapter_disk_cache"
@@ -41,36 +49,38 @@ class ChapterCache(private val context: Context) {
         const val PARAMETER_CACHE_SIZE = 75L * 1024 * 1024
     }
 
-    /** Google Json class used for parsing JSON files.  */
-    private val gson: Gson by injectLazy()
-
-    /** Cache class used for cache management.  */
-    private val diskCache = DiskLruCache.open(File(context.cacheDir, PARAMETER_CACHE_DIRECTORY),
-            PARAMETER_APP_VERSION,
-            PARAMETER_VALUE_COUNT,
-            PARAMETER_CACHE_SIZE)
+    init {
+        // Open cache in default cache directory.
+        diskCache = DiskLruCache.open(
+                File(context.cacheDir, PARAMETER_CACHE_DIRECTORY),
+                PARAMETER_APP_VERSION,
+                PARAMETER_VALUE_COUNT,
+                PARAMETER_CACHE_SIZE)
+    }
 
     /**
      * Returns directory of cache.
+     * @return directory of cache.
      */
     val cacheDir: File
         get() = diskCache.directory
 
     /**
      * Returns real size of directory.
+     * @return real size of directory.
      */
     private val realSize: Long
-        get() = DiskUtil.getDirectorySize(cacheDir)
+        get() = DiskUtils.getDirectorySize(cacheDir)
 
     /**
      * Returns real size of directory in human readable format.
+     * @return real size of directory.
      */
     val readableSize: String
         get() = Formatter.formatFileSize(context, realSize)
 
     /**
      * Remove file from cache.
-     *
      * @param file name of file "md5.0".
      * @return status of deletion for the file.
      */
@@ -81,39 +91,37 @@ class ChapterCache(private val context: Context) {
 
         try {
             // Remove the extension from the file to get the key of the cache
-            val key = file.substringBeforeLast(".")
+            val key = file.substring(0, file.lastIndexOf("."))
             // Remove file from cache.
             return diskCache.remove(key)
-        } catch (e: Exception) {
+        } catch (e: IOException) {
             return false
         }
     }
 
     /**
      * Get page list from cache.
-     *
-     * @param chapter the chapter.
+     * @param chapterUrl the url of the chapter.
      * @return an observable of the list of pages.
      */
-    fun getPageListFromCache(chapter: Chapter): Observable<List<Page>> {
-        return Observable.fromCallable {
+    fun getPageListFromCache(chapterUrl: String): Observable<List<Page>> {
+        return Observable.fromCallable<List<Page>> {
             // Get the key for the chapter.
-            val key = DiskUtil.hashKeyForDisk(getKey(chapter))
+            val key = DiskUtils.hashKeyForDisk(chapterUrl)
 
             // Convert JSON string to list of objects. Throws an exception if snapshot is null
             diskCache.get(key).use {
-                gson.fromJson<List<Page>>(it.getString(0))
+                gson.fromJson(it.getString(0), pageListCollection)
             }
         }
     }
 
     /**
      * Add page list to disk cache.
-     *
-     * @param chapter the chapter.
+     * @param chapterUrl the url of the chapter.
      * @param pages list of pages.
      */
-    fun putPageListToCache(chapter: Chapter, pages: List<Page>) {
+    fun putPageListToCache(chapterUrl: String, pages: List<Page>) {
         // Convert list of pages to json string.
         val cachedValue = gson.toJson(pages)
 
@@ -122,7 +130,7 @@ class ChapterCache(private val context: Context) {
 
         try {
             // Get editor from md5 key.
-            val key = DiskUtil.hashKeyForDisk(getKey(chapter))
+            val key = DiskUtils.hashKeyForDisk(chapterUrl)
             editor = diskCache.edit(key) ?: return
 
             // Write chapter urls to cache.
@@ -143,61 +151,59 @@ class ChapterCache(private val context: Context) {
     }
 
     /**
-     * Returns true if image is in cache.
-     *
+     * Check if image is in cache.
      * @param imageUrl url of image.
      * @return true if in cache otherwise false.
      */
     fun isImageInCache(imageUrl: String): Boolean {
         try {
-            return diskCache.get(DiskUtil.hashKeyForDisk(imageUrl)) != null
+            return diskCache.get(DiskUtils.hashKeyForDisk(imageUrl)) != null
         } catch (e: IOException) {
             return false
         }
     }
 
     /**
-     * Get image file from url.
-     *
+     * Get image path from url.
      * @param imageUrl url of image.
      * @return path of image.
      */
-    fun getImageFile(imageUrl: String): File {
-        // Get file from md5 key.
-        val imageName = DiskUtil.hashKeyForDisk(imageUrl) + ".0"
-        return File(diskCache.directory, imageName)
+    fun getImagePath(imageUrl: String): String? {
+        try {
+            // Get file from md5 key.
+            val imageName = DiskUtils.hashKeyForDisk(imageUrl) + ".0"
+            return File(diskCache.directory, imageName).canonicalPath
+        } catch (e: IOException) {
+            return null
+        }
     }
 
     /**
      * Add image to cache.
-     * 
      * @param imageUrl url of image.
      * @param response http response from page.
      * @throws IOException image error.
      */
     @Throws(IOException::class)
-    fun putImageToCache(imageUrl: String, response: Response) {
+    fun putImageToCache(imageUrl: String, response: Response, reencode: Boolean) {
         // Initialize editor (edits the values for an entry).
         var editor: DiskLruCache.Editor? = null
 
         try {
             // Get editor from md5 key.
-            val key = DiskUtil.hashKeyForDisk(imageUrl)
+            val key = DiskUtils.hashKeyForDisk(imageUrl)
             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().saveImageTo(editor.newOutputStream(0), reencode)
 
             diskCache.flush()
             editor.commit()
         } finally {
-            response.body()?.close()
+            response.body().close()
             editor?.abortUnlessCommitted()
         }
     }
 
-    private fun getKey(chapter: Chapter): String {
-        return "${chapter.manga_id}${chapter.url}"
-    }
 }
 

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

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.data.cache
 
 import android.content.Context
-import eu.kanade.tachiyomi.util.DiskUtil
+import eu.kanade.tachiyomi.util.DiskUtils
 import java.io.File
 import java.io.IOException
 import java.io.InputStream
@@ -20,8 +20,7 @@ class CoverCache(private val context: Context) {
     /**
      * Cache directory used for cache management.
      */
-    private val cacheDir = context.getExternalFilesDir("covers") ?:
-            File(context.filesDir, "covers").also { it.mkdirs() }
+    private val cacheDir: File = File(context.externalCacheDir, "cover_disk_cache")
 
     /**
      * Returns the cover from cache.
@@ -30,7 +29,7 @@ class CoverCache(private val context: Context) {
      * @return cover image.
      */
     fun getCoverFile(thumbnailUrl: String): File {
-        return File(cacheDir, DiskUtil.hashKeyForDisk(thumbnailUrl))
+        return File(cacheDir, DiskUtils.hashKeyForDisk(thumbnailUrl))
     }
 
     /**

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

@@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.data.database
 
 import android.content.Context
 import com.pushtorefresh.storio.sqlite.impl.DefaultStorIOSQLite
-import eu.kanade.tachiyomi.data.database.mappers.*
 import eu.kanade.tachiyomi.data.database.models.*
 import eu.kanade.tachiyomi.data.database.queries.*
 
@@ -10,20 +9,17 @@ import eu.kanade.tachiyomi.data.database.queries.*
  * This class provides operations to manage the database through its interfaces.
  */
 open class DatabaseHelper(context: Context)
-: MangaQueries, ChapterQueries, TrackQueries, CategoryQueries, MangaCategoryQueries, HistoryQueries {
+: MangaQueries, ChapterQueries, MangaSyncQueries, CategoryQueries, MangaCategoryQueries {
 
     override val db = DefaultStorIOSQLite.builder()
             .sqliteOpenHelper(DbOpenHelper(context))
-            .addTypeMapping(Manga::class.java, MangaTypeMapping())
-            .addTypeMapping(Chapter::class.java, ChapterTypeMapping())
-            .addTypeMapping(Track::class.java, TrackTypeMapping())
-            .addTypeMapping(Category::class.java, CategoryTypeMapping())
-            .addTypeMapping(MangaCategory::class.java, MangaCategoryTypeMapping())
-            .addTypeMapping(History::class.java, HistoryTypeMapping())
+            .addTypeMapping(Manga::class.java, MangaSQLiteTypeMapping())
+            .addTypeMapping(Chapter::class.java, ChapterSQLiteTypeMapping())
+            .addTypeMapping(MangaSync::class.java, MangaSyncSQLiteTypeMapping())
+            .addTypeMapping(Category::class.java, CategorySQLiteTypeMapping())
+            .addTypeMapping(MangaCategory::class.java, MangaCategorySQLiteTypeMapping())
             .build()
 
     inline fun inTransaction(block: () -> Unit) = db.inTransaction(block)
 
-    fun lowLevel() = db.lowLevel()
-
 }

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

@@ -3,23 +3,23 @@ package eu.kanade.tachiyomi.data.database
 import com.pushtorefresh.storio.sqlite.StorIOSQLite
 
 inline fun StorIOSQLite.inTransaction(block: () -> Unit) {
-    lowLevel().beginTransaction()
+    internal().beginTransaction()
     try {
         block()
-        lowLevel().setTransactionSuccessful()
+        internal().setTransactionSuccessful()
     } finally {
-        lowLevel().endTransaction()
+        internal().endTransaction()
     }
 }
 
 inline fun <T> StorIOSQLite.inTransactionReturn(block: () -> T): T {
-    lowLevel().beginTransaction()
+    internal().beginTransaction()
     try {
         val result = block()
-        lowLevel().setTransactionSuccessful()
+        internal().setTransactionSuccessful()
         return result
     } finally {
-        lowLevel().endTransaction()
+        internal().endTransaction()
     }
 }
 

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

@@ -17,22 +17,20 @@ class DbOpenHelper(context: Context)
         /**
          * Version of the database.
          */
-        const val DATABASE_VERSION = 5
+        const val DATABASE_VERSION = 2
     }
 
     override fun onCreate(db: SQLiteDatabase) = with(db) {
         execSQL(MangaTable.createTableQuery)
         execSQL(ChapterTable.createTableQuery)
-        execSQL(TrackTable.createTableQuery)
+        execSQL(MangaSyncTable.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) {
@@ -43,17 +41,6 @@ class DbOpenHelper(context: Context)
             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) {

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

@@ -1,63 +0,0 @@
-package eu.kanade.tachiyomi.data.database.mappers
-
-import android.content.ContentValues
-import android.database.Cursor
-import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
-import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
-import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
-import com.pushtorefresh.storio.sqlite.operations.put.DefaultPutResolver
-import com.pushtorefresh.storio.sqlite.queries.DeleteQuery
-import com.pushtorefresh.storio.sqlite.queries.InsertQuery
-import com.pushtorefresh.storio.sqlite.queries.UpdateQuery
-import eu.kanade.tachiyomi.data.database.models.Category
-import eu.kanade.tachiyomi.data.database.models.CategoryImpl
-import eu.kanade.tachiyomi.data.database.tables.CategoryTable.COL_FLAGS
-import eu.kanade.tachiyomi.data.database.tables.CategoryTable.COL_ID
-import eu.kanade.tachiyomi.data.database.tables.CategoryTable.COL_NAME
-import eu.kanade.tachiyomi.data.database.tables.CategoryTable.COL_ORDER
-import eu.kanade.tachiyomi.data.database.tables.CategoryTable.TABLE
-
-class CategoryTypeMapping : SQLiteTypeMapping<Category>(
-        CategoryPutResolver(),
-        CategoryGetResolver(),
-        CategoryDeleteResolver()
-)
-
-class CategoryPutResolver : DefaultPutResolver<Category>() {
-
-    override fun mapToInsertQuery(obj: Category) = InsertQuery.builder()
-            .table(TABLE)
-            .build()
-
-    override fun mapToUpdateQuery(obj: Category) = UpdateQuery.builder()
-            .table(TABLE)
-            .where("$COL_ID = ?")
-            .whereArgs(obj.id)
-            .build()
-
-    override fun mapToContentValues(obj: Category) = ContentValues(4).apply {
-        put(COL_ID, obj.id)
-        put(COL_NAME, obj.name)
-        put(COL_ORDER, obj.order)
-        put(COL_FLAGS, obj.flags)
-    }
-}
-
-class CategoryGetResolver : DefaultGetResolver<Category>() {
-
-    override fun mapFromCursor(cursor: Cursor): Category = CategoryImpl().apply {
-        id = cursor.getInt(cursor.getColumnIndex(COL_ID))
-        name = cursor.getString(cursor.getColumnIndex(COL_NAME))
-        order = cursor.getInt(cursor.getColumnIndex(COL_ORDER))
-        flags = cursor.getInt(cursor.getColumnIndex(COL_FLAGS))
-    }
-}
-
-class CategoryDeleteResolver : DefaultDeleteResolver<Category>() {
-
-    override fun mapToDeleteQuery(obj: Category) = DeleteQuery.builder()
-            .table(TABLE)
-            .where("$COL_ID = ?")
-            .whereArgs(obj.id)
-            .build()
-}

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

@@ -1,88 +0,0 @@
-package eu.kanade.tachiyomi.data.database.mappers
-
-import android.content.ContentValues
-import android.database.Cursor
-import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
-import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
-import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
-import com.pushtorefresh.storio.sqlite.operations.put.DefaultPutResolver
-import com.pushtorefresh.storio.sqlite.queries.DeleteQuery
-import com.pushtorefresh.storio.sqlite.queries.InsertQuery
-import com.pushtorefresh.storio.sqlite.queries.UpdateQuery
-import eu.kanade.tachiyomi.data.database.models.Chapter
-import eu.kanade.tachiyomi.data.database.models.ChapterImpl
-import eu.kanade.tachiyomi.data.database.tables.ChapterTable.COL_BOOKMARK
-import eu.kanade.tachiyomi.data.database.tables.ChapterTable.COL_CHAPTER_NUMBER
-import eu.kanade.tachiyomi.data.database.tables.ChapterTable.COL_DATE_FETCH
-import eu.kanade.tachiyomi.data.database.tables.ChapterTable.COL_DATE_UPLOAD
-import eu.kanade.tachiyomi.data.database.tables.ChapterTable.COL_ID
-import eu.kanade.tachiyomi.data.database.tables.ChapterTable.COL_LAST_PAGE_READ
-import eu.kanade.tachiyomi.data.database.tables.ChapterTable.COL_MANGA_ID
-import eu.kanade.tachiyomi.data.database.tables.ChapterTable.COL_NAME
-import eu.kanade.tachiyomi.data.database.tables.ChapterTable.COL_READ
-import eu.kanade.tachiyomi.data.database.tables.ChapterTable.COL_SCANLATOR
-import eu.kanade.tachiyomi.data.database.tables.ChapterTable.COL_SOURCE_ORDER
-import eu.kanade.tachiyomi.data.database.tables.ChapterTable.COL_URL
-import eu.kanade.tachiyomi.data.database.tables.ChapterTable.TABLE
-
-class ChapterTypeMapping : SQLiteTypeMapping<Chapter>(
-        ChapterPutResolver(),
-        ChapterGetResolver(),
-        ChapterDeleteResolver()
-)
-
-class ChapterPutResolver : DefaultPutResolver<Chapter>() {
-
-    override fun mapToInsertQuery(obj: Chapter) = InsertQuery.builder()
-            .table(TABLE)
-            .build()
-
-    override fun mapToUpdateQuery(obj: Chapter) = UpdateQuery.builder()
-            .table(TABLE)
-            .where("$COL_ID = ?")
-            .whereArgs(obj.id)
-            .build()
-
-    override fun mapToContentValues(obj: Chapter) = ContentValues(11).apply {
-        put(COL_ID, obj.id)
-        put(COL_MANGA_ID, obj.manga_id)
-        put(COL_URL, obj.url)
-        put(COL_NAME, obj.name)
-        put(COL_READ, obj.read)
-        put(COL_SCANLATOR, obj.scanlator)
-        put(COL_BOOKMARK, obj.bookmark)
-        put(COL_DATE_FETCH, obj.date_fetch)
-        put(COL_DATE_UPLOAD, obj.date_upload)
-        put(COL_LAST_PAGE_READ, obj.last_page_read)
-        put(COL_CHAPTER_NUMBER, obj.chapter_number)
-        put(COL_SOURCE_ORDER, obj.source_order)
-    }
-}
-
-class ChapterGetResolver : DefaultGetResolver<Chapter>() {
-
-    override fun mapFromCursor(cursor: Cursor): Chapter = ChapterImpl().apply {
-        id = cursor.getLong(cursor.getColumnIndex(COL_ID))
-        manga_id = cursor.getLong(cursor.getColumnIndex(COL_MANGA_ID))
-        url = cursor.getString(cursor.getColumnIndex(COL_URL))
-        name = cursor.getString(cursor.getColumnIndex(COL_NAME))
-        scanlator = cursor.getString(cursor.getColumnIndex(COL_SCANLATOR))
-        read = cursor.getInt(cursor.getColumnIndex(COL_READ)) == 1
-        bookmark = cursor.getInt(cursor.getColumnIndex(COL_BOOKMARK)) == 1
-        date_fetch = cursor.getLong(cursor.getColumnIndex(COL_DATE_FETCH))
-        date_upload = cursor.getLong(cursor.getColumnIndex(COL_DATE_UPLOAD))
-        last_page_read = cursor.getInt(cursor.getColumnIndex(COL_LAST_PAGE_READ))
-        chapter_number = cursor.getFloat(cursor.getColumnIndex(COL_CHAPTER_NUMBER))
-        source_order = cursor.getInt(cursor.getColumnIndex(COL_SOURCE_ORDER))
-    }
-}
-
-class ChapterDeleteResolver : DefaultDeleteResolver<Chapter>() {
-
-    override fun mapToDeleteQuery(obj: Chapter) = DeleteQuery.builder()
-            .table(TABLE)
-            .where("$COL_ID = ?")
-            .whereArgs(obj.id)
-            .build()
-}
-

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

@@ -1,63 +0,0 @@
-package eu.kanade.tachiyomi.data.database.mappers
-
-import android.content.ContentValues
-import android.database.Cursor
-import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
-import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
-import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
-import com.pushtorefresh.storio.sqlite.operations.put.DefaultPutResolver
-import com.pushtorefresh.storio.sqlite.queries.DeleteQuery
-import com.pushtorefresh.storio.sqlite.queries.InsertQuery
-import com.pushtorefresh.storio.sqlite.queries.UpdateQuery
-import eu.kanade.tachiyomi.data.database.models.History
-import eu.kanade.tachiyomi.data.database.models.HistoryImpl
-import eu.kanade.tachiyomi.data.database.tables.HistoryTable.COL_CHAPTER_ID
-import eu.kanade.tachiyomi.data.database.tables.HistoryTable.COL_ID
-import eu.kanade.tachiyomi.data.database.tables.HistoryTable.COL_LAST_READ
-import eu.kanade.tachiyomi.data.database.tables.HistoryTable.COL_TIME_READ
-import eu.kanade.tachiyomi.data.database.tables.HistoryTable.TABLE
-
-class HistoryTypeMapping : SQLiteTypeMapping<History>(
-        HistoryPutResolver(),
-        HistoryGetResolver(),
-        HistoryDeleteResolver()
-)
-
-open class HistoryPutResolver : DefaultPutResolver<History>() {
-
-    override fun mapToInsertQuery(obj: History) = InsertQuery.builder()
-            .table(TABLE)
-            .build()
-
-    override fun mapToUpdateQuery(obj: History) = UpdateQuery.builder()
-            .table(TABLE)
-            .where("$COL_ID = ?")
-            .whereArgs(obj.id)
-            .build()
-
-    override fun mapToContentValues(obj: History) = ContentValues(4).apply {
-        put(COL_ID, obj.id)
-        put(COL_CHAPTER_ID, obj.chapter_id)
-        put(COL_LAST_READ, obj.last_read)
-        put(COL_TIME_READ, obj.time_read)
-    }
-}
-
-class HistoryGetResolver : DefaultGetResolver<History>() {
-
-    override fun mapFromCursor(cursor: Cursor): History = HistoryImpl().apply {
-        id = cursor.getLong(cursor.getColumnIndex(COL_ID))
-        chapter_id = cursor.getLong(cursor.getColumnIndex(COL_CHAPTER_ID))
-        last_read = cursor.getLong(cursor.getColumnIndex(COL_LAST_READ))
-        time_read = cursor.getLong(cursor.getColumnIndex(COL_TIME_READ))
-    }
-}
-
-class HistoryDeleteResolver : DefaultDeleteResolver<History>() {
-
-    override fun mapToDeleteQuery(obj: History) = DeleteQuery.builder()
-            .table(TABLE)
-            .where("$COL_ID = ?")
-            .whereArgs(obj.id)
-            .build()
-}

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

@@ -1,59 +0,0 @@
-package eu.kanade.tachiyomi.data.database.mappers
-
-import android.content.ContentValues
-import android.database.Cursor
-import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
-import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
-import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
-import com.pushtorefresh.storio.sqlite.operations.put.DefaultPutResolver
-import com.pushtorefresh.storio.sqlite.queries.DeleteQuery
-import com.pushtorefresh.storio.sqlite.queries.InsertQuery
-import com.pushtorefresh.storio.sqlite.queries.UpdateQuery
-import eu.kanade.tachiyomi.data.database.models.MangaCategory
-import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable.COL_CATEGORY_ID
-import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable.COL_ID
-import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable.COL_MANGA_ID
-import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable.TABLE
-
-class MangaCategoryTypeMapping : SQLiteTypeMapping<MangaCategory>(
-        MangaCategoryPutResolver(),
-        MangaCategoryGetResolver(),
-        MangaCategoryDeleteResolver()
-)
-
-class MangaCategoryPutResolver : DefaultPutResolver<MangaCategory>() {
-
-    override fun mapToInsertQuery(obj: MangaCategory) = InsertQuery.builder()
-            .table(TABLE)
-            .build()
-
-    override fun mapToUpdateQuery(obj: MangaCategory) = UpdateQuery.builder()
-            .table(TABLE)
-            .where("$COL_ID = ?")
-            .whereArgs(obj.id)
-            .build()
-
-    override fun mapToContentValues(obj: MangaCategory) = ContentValues(3).apply {
-        put(COL_ID, obj.id)
-        put(COL_MANGA_ID, obj.manga_id)
-        put(COL_CATEGORY_ID, obj.category_id)
-    }
-}
-
-class MangaCategoryGetResolver : DefaultGetResolver<MangaCategory>() {
-
-    override fun mapFromCursor(cursor: Cursor): MangaCategory = MangaCategory().apply {
-        id = cursor.getLong(cursor.getColumnIndex(COL_ID))
-        manga_id = cursor.getLong(cursor.getColumnIndex(COL_MANGA_ID))
-        category_id = cursor.getInt(cursor.getColumnIndex(COL_CATEGORY_ID))
-    }
-}
-
-class MangaCategoryDeleteResolver : DefaultDeleteResolver<MangaCategory>() {
-
-    override fun mapToDeleteQuery(obj: MangaCategory) = DeleteQuery.builder()
-            .table(TABLE)
-            .where("$COL_ID = ?")
-            .whereArgs(obj.id)
-            .build()
-}

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

@@ -1,102 +0,0 @@
-package eu.kanade.tachiyomi.data.database.mappers
-
-import android.content.ContentValues
-import android.database.Cursor
-import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
-import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
-import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
-import com.pushtorefresh.storio.sqlite.operations.put.DefaultPutResolver
-import com.pushtorefresh.storio.sqlite.queries.DeleteQuery
-import com.pushtorefresh.storio.sqlite.queries.InsertQuery
-import com.pushtorefresh.storio.sqlite.queries.UpdateQuery
-import eu.kanade.tachiyomi.data.database.models.Manga
-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_DESCRIPTION
-import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_FAVORITE
-import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_GENRE
-import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_ID
-import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_INITIALIZED
-import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_LAST_UPDATE
-import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_SOURCE
-import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_STATUS
-import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_THUMBNAIL_URL
-import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_TITLE
-import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_URL
-import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_VIEWER
-import eu.kanade.tachiyomi.data.database.tables.MangaTable.TABLE
-
-class MangaTypeMapping : SQLiteTypeMapping<Manga>(
-        MangaPutResolver(),
-        MangaGetResolver(),
-        MangaDeleteResolver()
-)
-
-class MangaPutResolver : DefaultPutResolver<Manga>() {
-
-    override fun mapToInsertQuery(obj: Manga) = InsertQuery.builder()
-            .table(TABLE)
-            .build()
-
-    override fun mapToUpdateQuery(obj: Manga) = UpdateQuery.builder()
-            .table(TABLE)
-            .where("$COL_ID = ?")
-            .whereArgs(obj.id)
-            .build()
-
-    override fun mapToContentValues(obj: Manga) = ContentValues(15).apply {
-        put(COL_ID, obj.id)
-        put(COL_SOURCE, obj.source)
-        put(COL_URL, obj.url)
-        put(COL_ARTIST, obj.artist)
-        put(COL_AUTHOR, obj.author)
-        put(COL_DESCRIPTION, obj.description)
-        put(COL_GENRE, obj.genre)
-        put(COL_TITLE, obj.title)
-        put(COL_STATUS, obj.status)
-        put(COL_THUMBNAIL_URL, obj.thumbnail_url)
-        put(COL_FAVORITE, obj.favorite)
-        put(COL_LAST_UPDATE, obj.last_update)
-        put(COL_INITIALIZED, obj.initialized)
-        put(COL_VIEWER, obj.viewer)
-        put(COL_CHAPTER_FLAGS, obj.chapter_flags)
-    }
-}
-
-interface BaseMangaGetResolver {
-    fun mapBaseFromCursor(manga: Manga, cursor: Cursor) = manga.apply {
-        id = cursor.getLong(cursor.getColumnIndex(COL_ID))
-        source = cursor.getLong(cursor.getColumnIndex(COL_SOURCE))
-        url = cursor.getString(cursor.getColumnIndex(COL_URL))
-        artist = cursor.getString(cursor.getColumnIndex(COL_ARTIST))
-        author = cursor.getString(cursor.getColumnIndex(COL_AUTHOR))
-        description = cursor.getString(cursor.getColumnIndex(COL_DESCRIPTION))
-        genre = cursor.getString(cursor.getColumnIndex(COL_GENRE))
-        title = cursor.getString(cursor.getColumnIndex(COL_TITLE))
-        status = cursor.getInt(cursor.getColumnIndex(COL_STATUS))
-        thumbnail_url = cursor.getString(cursor.getColumnIndex(COL_THUMBNAIL_URL))
-        favorite = cursor.getInt(cursor.getColumnIndex(COL_FAVORITE)) == 1
-        last_update = cursor.getLong(cursor.getColumnIndex(COL_LAST_UPDATE))
-        initialized = cursor.getInt(cursor.getColumnIndex(COL_INITIALIZED)) == 1
-        viewer = cursor.getInt(cursor.getColumnIndex(COL_VIEWER))
-        chapter_flags = cursor.getInt(cursor.getColumnIndex(COL_CHAPTER_FLAGS))
-    }
-}
-
-open class MangaGetResolver : DefaultGetResolver<Manga>(), BaseMangaGetResolver {
-
-    override fun mapFromCursor(cursor: Cursor): Manga {
-        return mapBaseFromCursor(MangaImpl(), cursor)
-    }
-}
-
-class MangaDeleteResolver : DefaultDeleteResolver<Manga>() {
-
-    override fun mapToDeleteQuery(obj: Manga) = DeleteQuery.builder()
-            .table(TABLE)
-            .where("$COL_ID = ?")
-            .whereArgs(obj.id)
-            .build()
-}

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

@@ -1,78 +0,0 @@
-package eu.kanade.tachiyomi.data.database.mappers
-
-import android.content.ContentValues
-import android.database.Cursor
-import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
-import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
-import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
-import com.pushtorefresh.storio.sqlite.operations.put.DefaultPutResolver
-import com.pushtorefresh.storio.sqlite.queries.DeleteQuery
-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_ID
-import eu.kanade.tachiyomi.data.database.tables.TrackTable.COL_LAST_CHAPTER_READ
-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_SCORE
-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.TABLE
-
-class TrackTypeMapping : SQLiteTypeMapping<Track>(
-        TrackPutResolver(),
-        TrackGetResolver(),
-        TrackDeleteResolver()
-)
-
-class TrackPutResolver : DefaultPutResolver<Track>() {
-
-    override fun mapToInsertQuery(obj: Track) = InsertQuery.builder()
-            .table(TABLE)
-            .build()
-
-    override fun mapToUpdateQuery(obj: Track) = UpdateQuery.builder()
-            .table(TABLE)
-            .where("$COL_ID = ?")
-            .whereArgs(obj.id)
-            .build()
-
-    override fun mapToContentValues(obj: Track) = ContentValues(9).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_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_SCORE, obj.score)
-    }
-}
-
-class TrackGetResolver : DefaultGetResolver<Track>() {
-
-    override fun mapFromCursor(cursor: Cursor): Track = TrackImpl().apply {
-        id = cursor.getLong(cursor.getColumnIndex(COL_ID))
-        manga_id = cursor.getLong(cursor.getColumnIndex(COL_MANGA_ID))
-        sync_id = cursor.getInt(cursor.getColumnIndex(COL_SYNC_ID))
-        remote_id = cursor.getInt(cursor.getColumnIndex(COL_REMOTE_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))
-    }
-}
-
-class TrackDeleteResolver : DefaultDeleteResolver<Track>() {
-
-    override fun mapToDeleteQuery(obj: Track) = DeleteQuery.builder()
-            .table(TABLE)
-            .where("$COL_ID = ?")
-            .whereArgs(obj.id)
-            .build()
-}

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

@@ -0,0 +1,57 @@
+package eu.kanade.tachiyomi.data.database.models;
+
+import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteColumn;
+import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteType;
+
+import java.io.Serializable;
+
+import eu.kanade.tachiyomi.data.database.tables.CategoryTable;
+
+@StorIOSQLiteType(table = CategoryTable.TABLE)
+public class Category implements Serializable {
+
+    @StorIOSQLiteColumn(name = CategoryTable.COL_ID, key = true)
+    public Integer id;
+
+    @StorIOSQLiteColumn(name = CategoryTable.COL_NAME)
+    public String name;
+
+    @StorIOSQLiteColumn(name = CategoryTable.COL_ORDER)
+    public int order;
+
+    @StorIOSQLiteColumn(name = CategoryTable.COL_FLAGS)
+    public int flags;
+
+    public Category() {}
+
+    public static Category create(String name) {
+        Category c = new Category();
+        c.name = name;
+        return c;
+    }
+
+    public static Category createDefault() {
+        Category c = create("Default");
+        c.id = 0;
+        return c;
+    }
+
+    public String getNameLower() {
+        return name.toLowerCase();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Category category = (Category) o;
+
+        return name.equals(category.name);
+    }
+
+    @Override
+    public int hashCode() {
+        return name.hashCode();
+    }
+}

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

@@ -1,27 +0,0 @@
-package eu.kanade.tachiyomi.data.database.models
-
-import java.io.Serializable
-
-interface Category : Serializable {
-
-    var id: Int?
-
-    var name: String
-
-    var order: Int
-
-    var flags: Int
-
-    val nameLower: String
-        get() = name.toLowerCase()
-
-    companion object {
-
-        fun create(name: String): Category = CategoryImpl().apply {
-            this.name = name
-        }
-
-        fun createDefault(): Category = create("Default").apply { id = 0 }
-    }
-
-}

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

@@ -1,26 +0,0 @@
-package eu.kanade.tachiyomi.data.database.models
-
-class CategoryImpl : Category {
-
-    override var id: Int? = null
-
-    override lateinit var name: String
-
-    override var order: Int = 0
-
-    override var flags: Int = 0
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        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/Chapter.java

@@ -0,0 +1,94 @@
+package eu.kanade.tachiyomi.data.database.models;
+
+import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteColumn;
+import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteType;
+
+import java.io.Serializable;
+import java.util.List;
+
+import eu.kanade.tachiyomi.data.database.tables.ChapterTable;
+import eu.kanade.tachiyomi.data.download.model.Download;
+import eu.kanade.tachiyomi.data.source.model.Page;
+import eu.kanade.tachiyomi.util.UrlUtil;
+
+@StorIOSQLiteType(table = ChapterTable.TABLE)
+public class Chapter implements Serializable {
+
+    @StorIOSQLiteColumn(name = ChapterTable.COL_ID, key = true)
+    public Long id;
+
+    @StorIOSQLiteColumn(name = ChapterTable.COL_MANGA_ID)
+    public Long manga_id;
+
+    @StorIOSQLiteColumn(name = ChapterTable.COL_URL)
+    public String url;
+
+    @StorIOSQLiteColumn(name = ChapterTable.COL_NAME)
+    public String name;
+
+    @StorIOSQLiteColumn(name = ChapterTable.COL_READ)
+    public boolean read;
+
+    @StorIOSQLiteColumn(name = ChapterTable.COL_LAST_PAGE_READ)
+    public int last_page_read;
+
+    @StorIOSQLiteColumn(name = ChapterTable.COL_DATE_FETCH)
+    public long date_fetch;
+
+    @StorIOSQLiteColumn(name = ChapterTable.COL_DATE_UPLOAD)
+    public long date_upload;
+
+    @StorIOSQLiteColumn(name = ChapterTable.COL_CHAPTER_NUMBER)
+    public float chapter_number;
+
+    @StorIOSQLiteColumn(name = ChapterTable.COL_SOURCE_ORDER)
+    public int source_order;
+
+    public int status;
+
+    private transient List<Page> pages;
+
+    public Chapter() {}
+
+    public void setUrl(String url) {
+        this.url = UrlUtil.getPath(url);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Chapter chapter = (Chapter) o;
+
+        return url.equals(chapter.url);
+
+    }
+
+    @Override
+    public int hashCode() {
+        return url.hashCode();
+    }
+
+    public static Chapter create() {
+        Chapter chapter = new Chapter();
+        chapter.chapter_number = -1;
+        return chapter;
+    }
+
+    public List<Page> getPages() {
+        return pages;
+    }
+
+    public void setPages(List<Page> pages) {
+        this.pages = pages;
+    }
+
+    public boolean isDownloaded() {
+        return status == Download.DOWNLOADED;
+    }
+
+    public boolean isRecognizedNumber() {
+        return chapter_number >= 0f;
+    }
+}

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

@@ -1,31 +0,0 @@
-package eu.kanade.tachiyomi.data.database.models
-
-import eu.kanade.tachiyomi.source.model.SChapter
-import java.io.Serializable
-
-interface Chapter : SChapter, Serializable {
-
-    var id: Long?
-
-    var manga_id: Long?
-
-    var read: Boolean
-
-    var bookmark: Boolean
-
-    var last_page_read: Int
-
-    var date_fetch: Long
-
-    var source_order: Int
-
-    val isRecognizedNumber: Boolean
-        get() = chapter_number >= 0f
-
-    companion object {
-
-        fun create(): Chapter = ChapterImpl().apply {
-            chapter_number = -1f
-        }
-    }
-}

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

@@ -1,41 +0,0 @@
-package eu.kanade.tachiyomi.data.database.models
-
-class ChapterImpl : Chapter {
-
-    override var id: Long? = null
-
-    override var manga_id: Long? = null
-
-    override lateinit var url: String
-
-    override lateinit var name: String
-
-    override var scanlator: String? = null
-
-    override var read: Boolean = false
-
-    override var bookmark: Boolean = false
-
-    override var last_page_read: Int = 0
-
-    override var date_fetch: Long = 0
-
-    override var date_upload: Long = 0
-
-    override var chapter_number: Float = 0f
-
-    override var source_order: Int = 0
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other == null || javaClass != other.javaClass) return false
-
-        val chapter = other as Chapter
-        return url == chapter.url
-    }
-
-    override fun hashCode(): Int {
-        return url.hashCode()
-    }
-
-}

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

@@ -1,42 +0,0 @@
-package eu.kanade.tachiyomi.data.database.models
-
-import java.io.Serializable
-
-/**
- * Object containing the history statistics of a chapter
- */
-interface History : Serializable {
-
-    /**
-     * Id of history object.
-     */
-    var id: Long?
-
-    /**
-     * Chapter id of history object.
-     */
-    var chapter_id: Long
-
-    /**
-     * Last time chapter was read in time long format
-     */
-    var last_read: Long
-
-    /**
-     * Total time chapter was read - todo not yet implemented
-     */
-    var time_read: Long
-
-    companion object {
-
-        /**
-         * History constructor
-         *
-         * @param chapter chapter object
-         * @return history object
-         */
-        fun create(chapter: Chapter): History =  HistoryImpl().apply {
-            this.chapter_id = chapter.id!!
-        }
-    }
-}

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

@@ -1,27 +0,0 @@
-package eu.kanade.tachiyomi.data.database.models
-
-/**
- * Object containing the history statistics of a chapter
- */
-class HistoryImpl : History {
-
-    /**
-     * Id of history object.
-     */
-    override var id: Long? = null
-
-    /**
-     * Chapter id of history object.
-     */
-    override var chapter_id: Long = 0
-
-    /**
-     * Last time chapter was read in time long format
-     */
-    override var last_read: Long = 0
-
-    /**
-     * Total time chapter was read - todo not yet implemented
-     */
-    override var time_read: Long = 0
-}

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

@@ -1,9 +0,0 @@
-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.java

@@ -0,0 +1,213 @@
+package eu.kanade.tachiyomi.data.database.models;
+
+import android.content.Context;
+
+import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteColumn;
+import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteType;
+
+import java.io.Serializable;
+
+import eu.kanade.tachiyomi.R;
+import eu.kanade.tachiyomi.data.database.tables.MangaTable;
+import eu.kanade.tachiyomi.util.UrlUtil;
+
+@StorIOSQLiteType(table = MangaTable.TABLE)
+public class Manga implements Serializable {
+
+    @StorIOSQLiteColumn(name = MangaTable.COL_ID, key = true)
+    public Long id;
+
+    @StorIOSQLiteColumn(name = MangaTable.COL_SOURCE)
+    public int source;
+
+    @StorIOSQLiteColumn(name = MangaTable.COL_URL)
+    public String url;
+
+    @StorIOSQLiteColumn(name = MangaTable.COL_ARTIST)
+    public String artist;
+
+    @StorIOSQLiteColumn(name = MangaTable.COL_AUTHOR)
+    public String author;
+
+    @StorIOSQLiteColumn(name = MangaTable.COL_DESCRIPTION)
+    public String description;
+
+    @StorIOSQLiteColumn(name = MangaTable.COL_GENRE)
+    public String genre;
+
+    @StorIOSQLiteColumn(name = MangaTable.COL_TITLE)
+    public String title;
+
+    @StorIOSQLiteColumn(name = MangaTable.COL_STATUS)
+    public int status;
+
+    @StorIOSQLiteColumn(name = MangaTable.COL_THUMBNAIL_URL)
+    public String thumbnail_url;
+
+    @StorIOSQLiteColumn(name = MangaTable.COL_FAVORITE)
+    public boolean favorite;
+
+    @StorIOSQLiteColumn(name = MangaTable.COL_LAST_UPDATE)
+    public long last_update;
+
+    @StorIOSQLiteColumn(name = MangaTable.COL_INITIALIZED)
+    public boolean initialized;
+
+    @StorIOSQLiteColumn(name = MangaTable.COL_VIEWER)
+    public int viewer;
+
+    @StorIOSQLiteColumn(name = MangaTable.COL_CHAPTER_FLAGS)
+    public int chapter_flags;
+
+    public transient int unread;
+
+    public transient int category;
+
+    public static final int UNKNOWN = 0;
+    public static final int ONGOING = 1;
+    public static final int COMPLETED = 2;
+    public static final int LICENSED = 3;
+
+    public static final int SORT_DESC = 0x00000000;
+    public static final int SORT_ASC  = 0x00000001;
+    public static final int SORT_MASK = 0x00000001;
+
+    // Generic filter that does not filter anything
+    public static final int SHOW_ALL    = 0x00000000;
+
+    public static final int SHOW_UNREAD = 0x00000002;
+    public static final int SHOW_READ   = 0x00000004;
+    public static final int READ_MASK   = 0x00000006;
+
+    public static final int SHOW_DOWNLOADED     = 0x00000008;
+    public static final int SHOW_NOT_DOWNLOADED = 0x00000010;
+    public static final int DOWNLOADED_MASK     = 0x00000018;
+
+    public static final int SORTING_SOURCE = 0x00000000;
+    public static final int SORTING_NUMBER = 0x00000100;
+    public static final int SORTING_MASK   = 0x00000100;
+
+    public static final int DISPLAY_NAME   = 0x00000000;
+    public static final int DISPLAY_NUMBER = 0x00100000;
+    public static final int DISPLAY_MASK   = 0x00100000;
+
+    public Manga() {}
+
+    public static Manga create(String pathUrl) {
+        Manga m = new Manga();
+        m.url = pathUrl;
+        return m;
+    }
+
+    public static Manga create(String pathUrl, int source) {
+        Manga m = new Manga();
+        m.url = pathUrl;
+        m.source = source;
+        return m;
+    }
+
+    public void setUrl(String url) {
+        this.url = UrlUtil.getPath(url);
+    }
+
+    public void copyFrom(Manga other) {
+        if (other.title != null)
+            title = other.title;
+
+        if (other.author != null)
+            author = other.author;
+
+        if (other.artist != null)
+            artist = other.artist;
+
+        if (other.url != null)
+            url = other.url;
+
+        if (other.description != null)
+            description = other.description;
+
+        if (other.genre != null)
+            genre = other.genre;
+
+        if (other.thumbnail_url != null)
+            thumbnail_url = other.thumbnail_url;
+
+        status = other.status;
+
+        initialized = true;
+    }
+
+    public String getStatus(Context context) {
+        switch (status) {
+            case ONGOING:
+                return context.getString(R.string.ongoing);
+            case COMPLETED:
+                return context.getString(R.string.completed);
+            case LICENSED:
+                return context.getString(R.string.licensed);
+            default:
+                return context.getString(R.string.unknown);
+        }
+    }
+
+    public void setChapterOrder(int order) {
+        setFlags(order, SORT_MASK);
+    }
+
+    public void setDisplayMode(int mode) {
+        setFlags(mode, DISPLAY_MASK);
+    }
+
+    public void setReadFilter(int filter) {
+        setFlags(filter, READ_MASK);
+    }
+
+    public void setDownloadedFilter(int filter) {
+        setFlags(filter, DOWNLOADED_MASK);
+    }
+
+    public void setSorting(int sort) {
+        setFlags(sort, SORTING_MASK);
+    }
+
+    private void setFlags(int flag, int mask) {
+        chapter_flags = (chapter_flags & ~mask) | (flag & mask);
+    }
+
+    public boolean sortDescending() {
+        return (chapter_flags & SORT_MASK) == SORT_DESC;
+    }
+
+    // Used to display the chapter's title one way or another
+    public int getDisplayMode() {
+        return chapter_flags & DISPLAY_MASK;
+    }
+
+    public int getReadFilter() {
+        return chapter_flags & READ_MASK;
+    }
+
+    public int getDownloadedFilter() {
+        return chapter_flags & DOWNLOADED_MASK;
+    }
+
+    public int getSorting() {
+        return chapter_flags & SORTING_MASK;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Manga manga = (Manga) o;
+
+        return url.equals(manga.url);
+
+    }
+
+    @Override
+    public int hashCode() {
+        return url.hashCode();
+    }
+}

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

@@ -1,92 +0,0 @@
-package eu.kanade.tachiyomi.data.database.models
-
-import eu.kanade.tachiyomi.source.model.SManga
-
-interface Manga : SManga {
-
-    var id: Long?
-
-    var source: Long
-
-    var favorite: Boolean
-
-    var last_update: Long
-
-    var viewer: Int
-
-    var chapter_flags: 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
-    }
-
-    // Used to display the chapter's title one way or another
-    var displayMode: Int
-        get() = chapter_flags and DISPLAY_MASK
-        set(mode) = setFlags(mode, DISPLAY_MASK)
-
-    var readFilter: Int
-        get() = chapter_flags and READ_MASK
-        set(filter) = setFlags(filter, READ_MASK)
-
-    var downloadedFilter: Int
-        get() = chapter_flags and DOWNLOADED_MASK
-        set(filter) = setFlags(filter, DOWNLOADED_MASK)
-
-    var bookmarkedFilter: Int
-        get() = chapter_flags and BOOKMARKED_MASK
-        set(filter) = setFlags(filter, BOOKMARKED_MASK)
-
-    var sorting: Int
-        get() = chapter_flags and SORTING_MASK
-        set(sort) = setFlags(sort, SORTING_MASK)
-
-    companion object {
-
-        const val SORT_DESC = 0x00000000
-        const val SORT_ASC = 0x00000001
-        const val SORT_MASK = 0x00000001
-
-        // Generic filter that does not filter anything
-        const val SHOW_ALL = 0x00000000
-
-        const val SHOW_UNREAD = 0x00000002
-        const val SHOW_READ = 0x00000004
-        const val READ_MASK = 0x00000006
-
-        const val SHOW_DOWNLOADED = 0x00000008
-        const val SHOW_NOT_DOWNLOADED = 0x00000010
-        const val DOWNLOADED_MASK = 0x00000018
-
-        const val SHOW_BOOKMARKED = 0x00000020
-        const val SHOW_NOT_BOOKMARKED = 0x00000040
-        const val BOOKMARKED_MASK = 0x00000060
-
-        const val SORTING_SOURCE = 0x00000000
-        const val SORTING_NUMBER = 0x00000100
-        const val SORTING_MASK = 0x00000100
-
-        const val DISPLAY_NAME = 0x00000000
-        const val DISPLAY_NUMBER = 0x00100000
-        const val DISPLAY_MASK = 0x00100000
-
-        fun create(source: Long): Manga = MangaImpl().apply {
-            this.source = source
-        }
-
-        fun create(pathUrl: String, title: String, source: Long = 0): Manga = MangaImpl().apply {
-            url = pathUrl
-            this.title = title
-            this.source = source
-        }
-    }
-
-}

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

@@ -0,0 +1,29 @@
+package eu.kanade.tachiyomi.data.database.models;
+
+import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteColumn;
+import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteType;
+
+import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable;
+
+@StorIOSQLiteType(table = MangaCategoryTable.TABLE)
+public class MangaCategory {
+
+    @StorIOSQLiteColumn(name = MangaCategoryTable.COL_ID, key = true)
+    public Long id;
+
+    @StorIOSQLiteColumn(name = MangaCategoryTable.COL_MANGA_ID)
+    public long manga_id;
+
+    @StorIOSQLiteColumn(name = MangaCategoryTable.COL_CATEGORY_ID)
+    public int category_id;
+
+    public MangaCategory() {}
+
+    public static MangaCategory create(Manga manga, Category category) {
+        MangaCategory mc = new MangaCategory();
+        mc.manga_id = manga.id;
+        mc.category_id = category.id;
+        return mc;
+    }
+
+}

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

@@ -1,21 +0,0 @@
-package eu.kanade.tachiyomi.data.database.models
-
-class MangaCategory {
-
-    var id: Long? = null
-
-    var manga_id: Long = 0
-
-    var category_id: Int = 0
-
-    companion object {
-
-        fun create(manga: Manga, category: Category): MangaCategory {
-            val mc = MangaCategory()
-            mc.manga_id = manga.id!!
-            mc.category_id = category.id!!
-            return mc
-        }
-    }
-
-}

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

@@ -0,0 +1,12 @@
+package eu.kanade.tachiyomi.data.database.models;
+
+public class MangaChapter {
+
+    public Manga manga;
+    public Chapter chapter;
+
+    public MangaChapter(Manga manga, Chapter chapter) {
+        this.manga = manga;
+        this.chapter = chapter;
+    }
+}

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

@@ -1,3 +0,0 @@
-package eu.kanade.tachiyomi.data.database.models
-
-class MangaChapter(val manga: Manga, val chapter: Chapter)

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

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

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

@@ -1,49 +0,0 @@
-package eu.kanade.tachiyomi.data.database.models
-
-open class MangaImpl : Manga {
-
-    override var id: Long? = null
-
-    override var source: Long = -1
-
-    override lateinit var url: String
-
-    override lateinit var title: String
-
-    override var artist: String? = null
-
-    override var author: String? = null
-
-    override var description: String? = null
-
-    override var genre: String? = null
-
-    override var status: Int = 0
-
-    override var thumbnail_url: String? = null
-
-    override var favorite: Boolean = false
-
-    override var last_update: Long = 0
-
-    override var initialized: Boolean = false
-
-    override var viewer: Int = 0
-
-    override var chapter_flags: 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
-
-        return url == manga.url
-
-    }
-
-    override fun hashCode(): Int {
-        return url.hashCode()
-    }
-
-}

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

@@ -0,0 +1,78 @@
+package eu.kanade.tachiyomi.data.database.models;
+
+import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteColumn;
+import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteType;
+
+import java.io.Serializable;
+
+import eu.kanade.tachiyomi.data.database.tables.MangaSyncTable;
+import eu.kanade.tachiyomi.data.mangasync.MangaSyncService;
+
+@StorIOSQLiteType(table = MangaSyncTable.TABLE)
+public class MangaSync implements Serializable {
+
+    @StorIOSQLiteColumn(name = MangaSyncTable.COL_ID, key = true)
+    public Long id;
+
+    @StorIOSQLiteColumn(name = MangaSyncTable.COL_MANGA_ID)
+    public long manga_id;
+
+    @StorIOSQLiteColumn(name = MangaSyncTable.COL_SYNC_ID)
+    public int sync_id;
+
+    @StorIOSQLiteColumn(name = MangaSyncTable.COL_REMOTE_ID)
+    public int remote_id;
+
+    @StorIOSQLiteColumn(name = MangaSyncTable.COL_TITLE)
+    public String title;
+
+    @StorIOSQLiteColumn(name = MangaSyncTable.COL_LAST_CHAPTER_READ)
+    public int last_chapter_read;
+
+    @StorIOSQLiteColumn(name = MangaSyncTable.COL_TOTAL_CHAPTERS)
+    public int total_chapters;
+
+    @StorIOSQLiteColumn(name = MangaSyncTable.COL_SCORE)
+    public float score;
+
+    @StorIOSQLiteColumn(name = MangaSyncTable.COL_STATUS)
+    public int status;
+
+    public boolean update;
+
+    public static MangaSync create() {
+        return new MangaSync();
+    }
+
+    public static MangaSync create(MangaSyncService service) {
+        MangaSync mangasync = new MangaSync();
+        mangasync.sync_id = service.getId();
+        return mangasync;
+    }
+
+    public void copyPersonalFrom(MangaSync other) {
+        last_chapter_read = other.last_chapter_read;
+        score = other.score;
+        status = other.status;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        MangaSync mangaSync = (MangaSync) o;
+
+        if (manga_id != mangaSync.manga_id) return false;
+        if (sync_id != mangaSync.sync_id) return false;
+        return remote_id == mangaSync.remote_id;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = (int) (manga_id ^ (manga_id >>> 32));
+        result = 31 * result + sync_id;
+        result = 31 * result + remote_id;
+        return result;
+    }
+}

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

@@ -1,38 +0,0 @@
-package eu.kanade.tachiyomi.data.database.models
-
-import java.io.Serializable
-
-interface Track : Serializable {
-
-    var id: Long?
-
-    var manga_id: Long
-
-    var sync_id: Int
-
-    var remote_id: Int
-
-    var title: String
-
-    var last_chapter_read: Int
-
-    var total_chapters: Int
-
-    var score: Float
-
-    var status: Int
-
-    fun copyPersonalFrom(other: Track) {
-        last_chapter_read = other.last_chapter_read
-        score = other.score
-        status = other.status
-    }
-
-    companion object {
-
-        fun create(serviceId: Int): Track = TrackImpl().apply {
-            sync_id = serviceId
-        }
-    }
-
-}

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

@@ -1,41 +0,0 @@
-package eu.kanade.tachiyomi.data.database.models
-
-class TrackImpl : Track {
-
-    override var id: Long? = null
-
-    override var manga_id: Long = 0
-
-    override var sync_id: Int = 0
-
-    override var remote_id: Int = 0
-
-    override lateinit var title: String
-
-    override var last_chapter_read: Int = 0
-
-    override var total_chapters: Int = 0
-
-    override var score: Float = 0f
-
-    override var status: Int = 0
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other == null || javaClass != other.javaClass) return false
-
-        other as Track
-
-        if (manga_id != other.manga_id) return false
-        if (sync_id != other.sync_id) return false
-        return remote_id == other.remote_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
-        return result
-    }
-
-}

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

@@ -1,12 +1,12 @@
 package eu.kanade.tachiyomi.data.database.queries
 
+import com.pushtorefresh.storio.sqlite.operations.get.PreparedGetObject
 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.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.database.models.MangaChapter
-import eu.kanade.tachiyomi.data.database.resolvers.ChapterBackupPutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.ChapterProgressPutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.ChapterSourceOrderPutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.MangaChapterGetResolver
@@ -34,24 +34,79 @@ interface ChapterQueries : DbProvider {
             .withGetResolver(MangaChapterGetResolver.INSTANCE)
             .prepare()
 
-    fun getChapter(id: Long) = db.get()
+    fun getNextChapter(chapter: Chapter): PreparedGetObject<Chapter> {
+        // Add a delta to the chapter number, because binary decimal representation
+        // can retrieve the same chapter again
+        val chapterNumber = chapter.chapter_number + 0.00001
+
+        return db.get()
+                .`object`(Chapter::class.java)
+                .withQuery(Query.builder()
+                        .table(ChapterTable.TABLE)
+                        .where("${ChapterTable.COL_MANGA_ID} = ? AND " +
+                                "${ChapterTable.COL_CHAPTER_NUMBER} > ? AND " +
+                                "${ChapterTable.COL_CHAPTER_NUMBER} <= ?")
+                        .whereArgs(chapter.manga_id, chapterNumber, chapterNumber + 1)
+                        .orderBy(ChapterTable.COL_CHAPTER_NUMBER)
+                        .limit(1)
+                        .build())
+                .prepare()
+    }
+
+    fun getNextChapterBySource(chapter: Chapter) = db.get()
             .`object`(Chapter::class.java)
             .withQuery(Query.builder()
                     .table(ChapterTable.TABLE)
-                    .where("${ChapterTable.COL_ID} = ?")
-                    .whereArgs(id)
+                    .where("""${ChapterTable.COL_MANGA_ID} = ? AND
+                            ${ChapterTable.COL_SOURCE_ORDER} < ?""")
+                    .whereArgs(chapter.manga_id, chapter.source_order)
+                    .orderBy("${ChapterTable.COL_SOURCE_ORDER} DESC")
+                    .limit(1)
                     .build())
             .prepare()
 
-    fun getChapter(url: String) = db.get()
+    fun getPreviousChapter(chapter: Chapter): PreparedGetObject<Chapter> {
+        // Add a delta to the chapter number, because binary decimal representation
+        // can retrieve the same chapter again
+        val chapterNumber = chapter.chapter_number - 0.00001
+
+        return db.get()
+                .`object`(Chapter::class.java)
+                .withQuery(Query.builder().table(ChapterTable.TABLE)
+                        .where("${ChapterTable.COL_MANGA_ID} = ? AND " +
+                                "${ChapterTable.COL_CHAPTER_NUMBER} < ? AND " +
+                                "${ChapterTable.COL_CHAPTER_NUMBER} >= ?")
+                        .whereArgs(chapter.manga_id, chapterNumber, chapterNumber - 1)
+                        .orderBy("${ChapterTable.COL_CHAPTER_NUMBER} DESC")
+                        .limit(1)
+                        .build())
+                .prepare()
+    }
+
+    fun getPreviousChapterBySource(chapter: Chapter) = db.get()
             .`object`(Chapter::class.java)
             .withQuery(Query.builder()
                     .table(ChapterTable.TABLE)
-                    .where("${ChapterTable.COL_URL} = ?")
-                    .whereArgs(url)
+                    .where("""${ChapterTable.COL_MANGA_ID} = ? AND
+                            ${ChapterTable.COL_SOURCE_ORDER} > ?""")
+                    .whereArgs(chapter.manga_id, chapter.source_order)
+                    .orderBy(ChapterTable.COL_SOURCE_ORDER)
+                    .limit(1)
                     .build())
             .prepare()
 
+    fun getNextUnreadChapter(manga: Manga) = db.get()
+            .`object`(Chapter::class.java)
+            .withQuery(Query.builder()
+                    .table(ChapterTable.TABLE)
+                    .where("${ChapterTable.COL_MANGA_ID} = ? AND " +
+                            "${ChapterTable.COL_READ} = ? AND " +
+                            "${ChapterTable.COL_CHAPTER_NUMBER} >= ?")
+                    .whereArgs(manga.id, 0, 0)
+                    .orderBy(ChapterTable.COL_CHAPTER_NUMBER)
+                    .limit(1)
+                    .build())
+            .prepare()
 
     fun insertChapter(chapter: Chapter) = db.put().`object`(chapter).prepare()
 
@@ -61,11 +116,6 @@ interface ChapterQueries : DbProvider {
 
     fun deleteChapters(chapters: List<Chapter>) = db.delete().objects(chapters).prepare()
 
-    fun updateChaptersBackup(chapters: List<Chapter>) = db.put()
-            .objects(chapters)
-            .withPutResolver(ChapterBackupPutResolver())
-            .prepare()
-
     fun updateChapterProgress(chapter: Chapter) = db.put()
             .`object`(chapter)
             .withPutResolver(ChapterProgressPutResolver())

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

@@ -1,86 +0,0 @@
-package eu.kanade.tachiyomi.data.database.queries
-
-import com.pushtorefresh.storio.sqlite.queries.DeleteQuery
-import com.pushtorefresh.storio.sqlite.queries.RawQuery
-import eu.kanade.tachiyomi.data.database.DbProvider
-import eu.kanade.tachiyomi.data.database.models.History
-import eu.kanade.tachiyomi.data.database.models.MangaChapterHistory
-import eu.kanade.tachiyomi.data.database.resolvers.HistoryLastReadPutResolver
-import eu.kanade.tachiyomi.data.database.resolvers.MangaChapterHistoryGetResolver
-import eu.kanade.tachiyomi.data.database.tables.HistoryTable
-import java.util.*
-
-interface HistoryQueries : DbProvider {
-
-    /**
-     * Insert history into database
-     * @param history object containing history information
-     */
-    fun insertHistory(history: History) = db.put().`object`(history).prepare()
-
-    /**
-     * Returns history of recent manga containing last read chapter
-     * @param date recent date range
-     */
-    fun getRecentManga(date: Date) = db.get()
-            .listOfObjects(MangaChapterHistory::class.java)
-            .withQuery(RawQuery.builder()
-                    .query(getRecentMangasQuery())
-                    .args(date.time)
-                    .observesTables(HistoryTable.TABLE)
-                    .build())
-            .withGetResolver(MangaChapterHistoryGetResolver.INSTANCE)
-            .prepare()
-
-    fun getHistoryByMangaId(mangaId: Long) = db.get()
-            .listOfObjects(History::class.java)
-            .withQuery(RawQuery.builder()
-                    .query(getHistoryByMangaId())
-                    .args(mangaId)
-                    .observesTables(HistoryTable.TABLE)
-                    .build())
-            .prepare()
-
-    fun getHistoryByChapterUrl(chapterUrl: String) = db.get()
-            .`object`(History::class.java)
-            .withQuery(RawQuery.builder()
-                    .query(getHistoryByChapterUrl())
-                    .args(chapterUrl)
-                    .observesTables(HistoryTable.TABLE)
-                    .build())
-            .prepare()
-
-    /**
-     * Updates the history last read.
-     * Inserts history object if not yet in database
-     * @param history history object
-     */
-    fun updateHistoryLastRead(history: History) = db.put()
-            .`object`(history)
-            .withPutResolver(HistoryLastReadPutResolver())
-            .prepare()
-
-    /**
-     * Updates the history last read.
-     * Inserts history object if not yet in database
-     * @param historyList history object list
-     */
-    fun updateHistoryLastRead(historyList: List<History>) = db.put()
-            .objects(historyList)
-            .withPutResolver(HistoryLastReadPutResolver())
-            .prepare()
-
-    fun deleteHistory() = db.delete()
-            .byQuery(DeleteQuery.builder()
-                    .table(HistoryTable.TABLE)
-                    .build())
-            .prepare()
-
-    fun deleteHistoryNoLastRead() = db.delete()
-            .byQuery(DeleteQuery.builder()
-                    .table(HistoryTable.TABLE)
-                    .where("${HistoryTable.COL_LAST_READ} = ?")
-                    .whereArgs(0)
-                    .build())
-            .prepare()
-}

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

@@ -4,12 +4,9 @@ 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.MangaFlagsPutResolver
-import eu.kanade.tachiyomi.data.database.resolvers.MangaLastUpdatedPutResolver
-import eu.kanade.tachiyomi.data.database.tables.CategoryTable
 import eu.kanade.tachiyomi.data.database.tables.ChapterTable
 import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable
 import eu.kanade.tachiyomi.data.database.tables.MangaTable
@@ -24,15 +21,15 @@ interface MangaQueries : DbProvider {
             .prepare()
 
     fun getLibraryMangas() = db.get()
-            .listOfObjects(LibraryManga::class.java)
+            .listOfObjects(Manga::class.java)
             .withQuery(RawQuery.builder()
                     .query(libraryQuery)
-                    .observesTables(MangaTable.TABLE, ChapterTable.TABLE, MangaCategoryTable.TABLE, CategoryTable.TABLE)
+                    .observesTables(MangaTable.TABLE, ChapterTable.TABLE, MangaCategoryTable.TABLE)
                     .build())
             .withGetResolver(LibraryMangaGetResolver.INSTANCE)
             .prepare()
 
-    fun getFavoriteMangas() = db.get()
+    open fun getFavoriteMangas() = db.get()
             .listOfObjects(Manga::class.java)
             .withQuery(Query.builder()
                     .table(MangaTable.TABLE)
@@ -42,7 +39,7 @@ interface MangaQueries : DbProvider {
                     .build())
             .prepare()
 
-    fun getManga(url: String, sourceId: Long) = db.get()
+    fun getManga(url: String, sourceId: Int) = db.get()
             .`object`(Manga::class.java)
             .withQuery(Query.builder()
                     .table(MangaTable.TABLE)
@@ -69,11 +66,6 @@ interface MangaQueries : DbProvider {
             .withPutResolver(MangaFlagsPutResolver())
             .prepare()
 
-    fun updateLastUpdated(manga: Manga) = db.put()
-            .`object`(manga)
-            .withPutResolver(MangaLastUpdatedPutResolver())
-            .prepare()
-
     fun deleteManga(manga: Manga) = db.delete().`object`(manga).prepare()
 
     fun deleteMangas(mangas: List<Manga>) = db.delete().objects(mangas).prepare()
@@ -86,20 +78,4 @@ interface MangaQueries : DbProvider {
                     .build())
             .prepare()
 
-    fun deleteMangas() = db.delete()
-            .byQuery(DeleteQuery.builder()
-                    .table(MangaTable.TABLE)
-                    .build())
-            .prepare()
-
-    fun getLastReadManga() = db.get()
-            .listOfObjects(Manga::class.java)
-            .withQuery(RawQuery.builder()
-                    .query(getLastReadMangaQuery())
-                    .observesTables(MangaTable.TABLE)
-                    .build())
-            .prepare()
-
-    fun getTotalChapterManga() = db.get().listOfObjects(Manga::class.java)
-            .withQuery(RawQuery.builder().query(getTotalChapterMangaQuery()).observesTables(MangaTable.TABLE).build()).prepare();
 }

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

@@ -0,0 +1,46 @@
+package eu.kanade.tachiyomi.data.database.queries
+
+import com.pushtorefresh.storio.sqlite.queries.DeleteQuery
+import com.pushtorefresh.storio.sqlite.queries.Query
+import eu.kanade.tachiyomi.data.database.DbProvider
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.models.MangaSync
+import eu.kanade.tachiyomi.data.database.tables.MangaSyncTable
+import eu.kanade.tachiyomi.data.mangasync.MangaSyncService
+
+interface MangaSyncQueries : DbProvider {
+
+    fun getMangaSync(manga: Manga, sync: MangaSyncService) = db.get()
+            .`object`(MangaSync::class.java)
+            .withQuery(Query.builder()
+                    .table(MangaSyncTable.TABLE)
+                    .where("${MangaSyncTable.COL_MANGA_ID} = ? AND " +
+                            "${MangaSyncTable.COL_SYNC_ID} = ?")
+                    .whereArgs(manga.id, sync.id)
+                    .build())
+            .prepare()
+
+    fun getMangasSync(manga: Manga) = db.get()
+            .listOfObjects(MangaSync::class.java)
+            .withQuery(Query.builder()
+                    .table(MangaSyncTable.TABLE)
+                    .where("${MangaSyncTable.COL_MANGA_ID} = ?")
+                    .whereArgs(manga.id)
+                    .build())
+            .prepare()
+
+    fun insertMangaSync(manga: MangaSync) = db.put().`object`(manga).prepare()
+
+    fun insertMangasSync(mangas: List<MangaSync>) = db.put().objects(mangas).prepare()
+
+    fun deleteMangaSync(manga: MangaSync) = db.delete().`object`(manga).prepare()
+
+    fun deleteMangaSyncForManga(manga: Manga) = db.delete()
+            .byQuery(DeleteQuery.builder()
+                    .table(MangaSyncTable.TABLE)
+                    .where("${MangaSyncTable.COL_MANGA_ID} = ?")
+                    .whereArgs(manga.id)
+                    .build())
+            .prepare()
+
+}

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

@@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.data.database.queries
 
 import eu.kanade.tachiyomi.data.database.tables.CategoryTable as Category
 import eu.kanade.tachiyomi.data.database.tables.ChapterTable as Chapter
-import eu.kanade.tachiyomi.data.database.tables.HistoryTable as History
 import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable as MangaCategory
 import eu.kanade.tachiyomi.data.database.tables.MangaTable as Manga
 
@@ -40,67 +39,6 @@ fun getRecentsQuery() = """
     ORDER BY ${Chapter.COL_DATE_UPLOAD} DESC
 """
 
-/**
- * Query to get the recently read chapters of manga from the library up to a date.
- * The max_last_read table contains the most recent chapters grouped by manga
- * The select statement returns all information of chapters that have the same id as the chapter in max_last_read
- * and are read after the given time period
- * @return return limit is 25
- */
-fun getRecentMangasQuery() = """
-    SELECT ${Manga.TABLE}.${Manga.COL_URL} as mangaUrl, ${Manga.TABLE}.*, ${Chapter.TABLE}.*, ${History.TABLE}.*
-    FROM ${Manga.TABLE}
-    JOIN ${Chapter.TABLE}
-    ON ${Manga.TABLE}.${Manga.COL_ID} = ${Chapter.TABLE}.${Chapter.COL_MANGA_ID}
-    JOIN ${History.TABLE}
-    ON ${Chapter.TABLE}.${Chapter.COL_ID} = ${History.TABLE}.${History.COL_CHAPTER_ID}
-    JOIN (
-    SELECT ${Chapter.TABLE}.${Chapter.COL_MANGA_ID},${Chapter.TABLE}.${Chapter.COL_ID} as ${History.COL_CHAPTER_ID}, MAX(${History.TABLE}.${History.COL_LAST_READ}) as ${History.COL_LAST_READ}
-    FROM ${Chapter.TABLE} JOIN ${History.TABLE}
-    ON ${Chapter.TABLE}.${Chapter.COL_ID} = ${History.TABLE}.${History.COL_CHAPTER_ID}
-    GROUP BY ${Chapter.TABLE}.${Chapter.COL_MANGA_ID}) AS max_last_read
-    ON ${Chapter.TABLE}.${Chapter.COL_MANGA_ID} = max_last_read.${Chapter.COL_MANGA_ID}
-    WHERE ${History.TABLE}.${History.COL_LAST_READ} > ? AND max_last_read.${History.COL_CHAPTER_ID} = ${History.TABLE}.${History.COL_CHAPTER_ID}
-    ORDER BY max_last_read.${History.COL_LAST_READ} DESC
-    LIMIT 25
-"""
-
-fun getHistoryByMangaId() = """
-    SELECT ${History.TABLE}.*
-    FROM ${History.TABLE}
-    JOIN ${Chapter.TABLE}
-    ON ${History.TABLE}.${History.COL_CHAPTER_ID} = ${Chapter.TABLE}.${Chapter.COL_ID}
-    WHERE ${Chapter.TABLE}.${Chapter.COL_MANGA_ID} = ? AND ${History.TABLE}.${History.COL_CHAPTER_ID} = ${Chapter.TABLE}.${Chapter.COL_ID}
-"""
-
-fun getHistoryByChapterUrl() = """
-    SELECT ${History.TABLE}.*
-    FROM ${History.TABLE}
-    JOIN ${Chapter.TABLE}
-    ON ${History.TABLE}.${History.COL_CHAPTER_ID} = ${Chapter.TABLE}.${Chapter.COL_ID}
-    WHERE ${Chapter.TABLE}.${Chapter.COL_URL} = ? AND ${History.TABLE}.${History.COL_CHAPTER_ID} = ${Chapter.TABLE}.${Chapter.COL_ID}
-"""
-
-fun getLastReadMangaQuery() = """
-    SELECT ${Manga.TABLE}.*, MAX(${History.TABLE}.${History.COL_LAST_READ}) AS max
-    FROM ${Manga.TABLE}
-    JOIN ${Chapter.TABLE}
-    ON ${Manga.TABLE}.${Manga.COL_ID} = ${Chapter.TABLE}.${Chapter.COL_MANGA_ID}
-    JOIN ${History.TABLE}
-    ON ${Chapter.TABLE}.${Chapter.COL_ID} = ${History.TABLE}.${History.COL_CHAPTER_ID}
-    WHERE ${Manga.TABLE}.${Manga.COL_FAVORITE} = 1
-    GROUP BY ${Manga.TABLE}.${Manga.COL_ID}
-    ORDER BY max DESC
-"""
-
-fun getTotalChapterMangaQuery()= """
-    SELECT ${Manga.TABLE}.*
-    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 COUNT(*)
-"""
 
 /**
  * Query to get the categories for a manga.

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

@@ -1,34 +0,0 @@
-package eu.kanade.tachiyomi.data.database.queries
-
-import com.pushtorefresh.storio.sqlite.queries.DeleteQuery
-import com.pushtorefresh.storio.sqlite.queries.Query
-import eu.kanade.tachiyomi.data.database.DbProvider
-import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.database.models.Track
-import eu.kanade.tachiyomi.data.database.tables.TrackTable
-import eu.kanade.tachiyomi.data.track.TrackService
-
-interface TrackQueries : DbProvider {
-
-    fun getTracks(manga: Manga) = db.get()
-            .listOfObjects(Track::class.java)
-            .withQuery(Query.builder()
-                    .table(TrackTable.TABLE)
-                    .where("${TrackTable.COL_MANGA_ID} = ?")
-                    .whereArgs(manga.id)
-                    .build())
-            .prepare()
-
-    fun insertTrack(track: Track) = db.put().`object`(track).prepare()
-
-    fun insertTracks(tracks: List<Track>) = db.put().objects(tracks).prepare()
-
-    fun deleteTrackForManga(manga: Manga, sync: TrackService) = db.delete()
-            .byQuery(DeleteQuery.builder()
-                    .table(TrackTable.TABLE)
-                    .where("${TrackTable.COL_MANGA_ID} = ? AND ${TrackTable.COL_SYNC_ID} = ?")
-                    .whereArgs(manga.id, sync.id)
-                    .build())
-            .prepare()
-
-}

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

@@ -1,35 +0,0 @@
-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.Chapter
-import eu.kanade.tachiyomi.data.database.tables.ChapterTable
-
-class ChapterBackupPutResolver : PutResolver<Chapter>() {
-
-    override fun performPut(db: StorIOSQLite, chapter: Chapter) = db.inTransactionReturn {
-        val updateQuery = mapToUpdateQuery(chapter)
-        val contentValues = mapToContentValues(chapter)
-
-        val numberOfRowsUpdated = db.lowLevel().update(updateQuery, contentValues)
-        PutResult.newUpdateResult(numberOfRowsUpdated, updateQuery.table())
-    }
-
-    fun mapToUpdateQuery(chapter: Chapter) = UpdateQuery.builder()
-            .table(ChapterTable.TABLE)
-            .where("${ChapterTable.COL_URL} = ?")
-            .whereArgs(chapter.url)
-            .build()
-
-    fun mapToContentValues(chapter: Chapter) = ContentValues(3).apply {
-        put(ChapterTable.COL_READ, chapter.read)
-        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

@@ -15,7 +15,7 @@ class ChapterProgressPutResolver : PutResolver<Chapter>() {
         val updateQuery = mapToUpdateQuery(chapter)
         val contentValues = mapToContentValues(chapter)
 
-        val numberOfRowsUpdated = db.lowLevel().update(updateQuery, contentValues)
+        val numberOfRowsUpdated = db.internal().update(updateQuery, contentValues)
         PutResult.newUpdateResult(numberOfRowsUpdated, updateQuery.table())
     }
 
@@ -25,9 +25,8 @@ class ChapterProgressPutResolver : PutResolver<Chapter>() {
             .whereArgs(chapter.id)
             .build()
 
-    fun mapToContentValues(chapter: Chapter) = ContentValues(3).apply {
+    fun mapToContentValues(chapter: Chapter) = ContentValues(2).apply {
         put(ChapterTable.COL_READ, chapter.read)
-        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

@@ -15,7 +15,7 @@ class ChapterSourceOrderPutResolver : PutResolver<Chapter>() {
         val updateQuery = mapToUpdateQuery(chapter)
         val contentValues = mapToContentValues(chapter)
 
-        val numberOfRowsUpdated = db.lowLevel().update(updateQuery, contentValues)
+        val numberOfRowsUpdated = db.internal().update(updateQuery, contentValues)
         PutResult.newUpdateResult(numberOfRowsUpdated, updateQuery.table())
     }
 

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

@@ -1,64 +0,0 @@
-package eu.kanade.tachiyomi.data.database.resolvers
-
-import android.content.ContentValues
-import android.support.annotation.NonNull
-import com.pushtorefresh.storio.sqlite.StorIOSQLite
-import com.pushtorefresh.storio.sqlite.operations.put.PutResult
-import com.pushtorefresh.storio.sqlite.queries.Query
-import com.pushtorefresh.storio.sqlite.queries.UpdateQuery
-import eu.kanade.tachiyomi.data.database.inTransactionReturn
-import eu.kanade.tachiyomi.data.database.mappers.HistoryPutResolver
-import eu.kanade.tachiyomi.data.database.models.History
-import eu.kanade.tachiyomi.data.database.tables.HistoryTable
-
-class HistoryLastReadPutResolver : HistoryPutResolver() {
-
-    /**
-     * Updates last_read time of chapter
-     */
-    override fun performPut(@NonNull db: StorIOSQLite, @NonNull history: History): PutResult = db.inTransactionReturn {
-        val updateQuery = mapToUpdateQuery(history)
-
-        val cursor = db.lowLevel().query(Query.builder()
-                .table(updateQuery.table())
-                .where(updateQuery.where())
-                .whereArgs(updateQuery.whereArgs())
-                .build())
-
-        val putResult: PutResult
-
-        try {
-            if (cursor.count == 0) {
-                val insertQuery = mapToInsertQuery(history)
-                val insertedId = db.lowLevel().insert(insertQuery, mapToContentValues(history))
-                putResult = PutResult.newInsertResult(insertedId, insertQuery.table())
-            } else {
-                val numberOfRowsUpdated = db.lowLevel().update(updateQuery, mapToUpdateContentValues(history))
-                putResult = PutResult.newUpdateResult(numberOfRowsUpdated, updateQuery.table())
-            }
-        } finally {
-            cursor.close()
-        }
-
-        putResult
-    }
-
-    /**
-     * Creates update query
-     * @param obj history object
-     */
-    override fun mapToUpdateQuery(obj: History) = UpdateQuery.builder()
-            .table(HistoryTable.TABLE)
-            .where("${HistoryTable.COL_CHAPTER_ID} = ?")
-            .whereArgs(obj.chapter_id)
-            .build()
-
-    /**
-     * Create content query
-     * @param history object
-     */
-    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,23 +1,25 @@
 package eu.kanade.tachiyomi.data.database.resolvers
 
 import android.database.Cursor
-import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
-import eu.kanade.tachiyomi.data.database.mappers.BaseMangaGetResolver
-import eu.kanade.tachiyomi.data.database.models.LibraryManga
+
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.models.MangaStorIOSQLiteGetResolver
 import eu.kanade.tachiyomi.data.database.tables.MangaTable
 
-class LibraryMangaGetResolver : DefaultGetResolver<LibraryManga>(), BaseMangaGetResolver {
+class LibraryMangaGetResolver : MangaStorIOSQLiteGetResolver() {
 
     companion object {
         val INSTANCE = LibraryMangaGetResolver()
     }
 
-    override fun mapFromCursor(cursor: Cursor): LibraryManga {
-        val manga = LibraryManga()
+    override fun mapFromCursor(cursor: Cursor): Manga {
+        val manga = super.mapFromCursor(cursor)
 
-        mapBaseFromCursor(manga, cursor)
-        manga.unread = cursor.getInt(cursor.getColumnIndex(MangaTable.COL_UNREAD))
-        manga.category = cursor.getInt(cursor.getColumnIndex(MangaTable.COL_CATEGORY))
+        val unreadColumn = cursor.getColumnIndex(MangaTable.COL_UNREAD)
+        manga.unread = cursor.getInt(unreadColumn)
+
+        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

@@ -2,9 +2,9 @@ package eu.kanade.tachiyomi.data.database.resolvers
 
 import android.database.Cursor
 import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
-import eu.kanade.tachiyomi.data.database.mappers.ChapterGetResolver
-import eu.kanade.tachiyomi.data.database.mappers.MangaGetResolver
+import eu.kanade.tachiyomi.data.database.models.ChapterStorIOSQLiteGetResolver
 import eu.kanade.tachiyomi.data.database.models.MangaChapter
+import eu.kanade.tachiyomi.data.database.models.MangaStorIOSQLiteGetResolver
 
 class MangaChapterGetResolver : DefaultGetResolver<MangaChapter>() {
 
@@ -12,15 +12,15 @@ class MangaChapterGetResolver : DefaultGetResolver<MangaChapter>() {
         val INSTANCE = MangaChapterGetResolver()
     }
 
-    private val mangaGetResolver = MangaGetResolver()
+    private val mangaGetResolver = MangaStorIOSQLiteGetResolver()
 
-    private val chapterGetResolver = ChapterGetResolver()
+    private val chapterGetResolver = ChapterStorIOSQLiteGetResolver()
 
     override fun mapFromCursor(cursor: Cursor): MangaChapter {
         val manga = mangaGetResolver.mapFromCursor(cursor)
         val chapter = chapterGetResolver.mapFromCursor(cursor)
         manga.id = chapter.manga_id
-        manga.url = cursor.getString(cursor.getColumnIndex("mangaUrl"))
+        manga.url = cursor.getString(cursor.getColumnIndex("mangaUrl"));
 
         return MangaChapter(manga, chapter)
     }

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

@@ -1,51 +0,0 @@
-package eu.kanade.tachiyomi.data.database.resolvers
-
-import android.database.Cursor
-import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
-import eu.kanade.tachiyomi.data.database.mappers.ChapterGetResolver
-import eu.kanade.tachiyomi.data.database.mappers.HistoryGetResolver
-import eu.kanade.tachiyomi.data.database.mappers.MangaGetResolver
-import eu.kanade.tachiyomi.data.database.models.MangaChapterHistory
-
-class MangaChapterHistoryGetResolver : DefaultGetResolver<MangaChapterHistory>() {
-    companion object {
-        val INSTANCE = MangaChapterHistoryGetResolver()
-    }
-
-    /**
-     * Manga get resolver
-     */
-    private val mangaGetResolver = MangaGetResolver()
-
-    /**
-     * Chapter get resolver
-     */
-    private val chapterResolver = ChapterGetResolver()
-
-    /**
-     * History get resolver
-     */
-    private val historyGetResolver = HistoryGetResolver()
-
-    /**
-     * Map correct objects from cursor result
-     */
-    override fun mapFromCursor(cursor: Cursor): MangaChapterHistory {
-        // Get manga object
-        val manga = mangaGetResolver.mapFromCursor(cursor)
-
-        // Get chapter object
-        val chapter = chapterResolver.mapFromCursor(cursor)
-
-        // Get history object
-        val history = historyGetResolver.mapFromCursor(cursor)
-
-        // Make certain column conflicts are dealt with
-        manga.id = chapter.manga_id
-        manga.url = cursor.getString(cursor.getColumnIndex("mangaUrl"))
-        chapter.id = history.chapter_id
-
-        // Return result
-        return MangaChapterHistory(manga, chapter, history)
-    }
-}

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

@@ -15,7 +15,7 @@ class MangaFlagsPutResolver : PutResolver<Manga>() {
         val updateQuery = mapToUpdateQuery(manga)
         val contentValues = mapToContentValues(manga)
 
-        val numberOfRowsUpdated = db.lowLevel().update(updateQuery, contentValues)
+        val numberOfRowsUpdated = db.internal().update(updateQuery, contentValues)
         PutResult.newUpdateResult(numberOfRowsUpdated, updateQuery.table())
     }
 

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

@@ -1,33 +0,0 @@
-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 MangaLastUpdatedPutResolver : 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_LAST_UPDATE, manga.last_update)
-    }
-
-}
-

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

@@ -14,10 +14,6 @@ object ChapterTable {
 
     const val COL_READ = "read"
 
-    const val COL_SCANLATOR = "scanlator"
-
-    const val COL_BOOKMARK = "bookmark"
-
     const val COL_DATE_FETCH = "date_fetch"
 
     const val COL_DATE_UPLOAD = "date_upload"
@@ -34,9 +30,7 @@ object ChapterTable {
             $COL_MANGA_ID INTEGER NOT NULL,
             $COL_URL TEXT NOT NULL,
             $COL_NAME TEXT NOT NULL,
-            $COL_SCANLATOR TEXT,
             $COL_READ BOOLEAN NOT NULL,
-            $COL_BOOKMARK BOOLEAN NOT NULL,
             $COL_LAST_PAGE_READ INT NOT NULL,
             $COL_CHAPTER_NUMBER FLOAT NOT NULL,
             $COL_SOURCE_ORDER INTEGER NOT NULL,
@@ -52,10 +46,4 @@ object ChapterTable {
     val sourceOrderUpdateQuery: String
         get() = "ALTER TABLE $TABLE ADD COLUMN $COL_SOURCE_ORDER INTEGER DEFAULT 0"
 
-    val bookmarkUpdateQuery: String
-        get() = "ALTER TABLE $TABLE ADD COLUMN $COL_BOOKMARK BOOLEAN DEFAULT FALSE"
-
-    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

@@ -1,48 +0,0 @@
-package eu.kanade.tachiyomi.data.database.tables
-
-object HistoryTable {
-
-    /**
-     * Table name
-     */
-    const val TABLE = "history"
-
-    /**
-     * Id column name
-     */
-    const val COL_ID = "${TABLE}_id"
-
-    /**
-     * Chapter id column name
-     */
-    const val COL_CHAPTER_ID = "${TABLE}_chapter_id"
-
-    /**
-     * Last read column name
-     */
-    const val COL_LAST_READ = "${TABLE}_last_read"
-
-    /**
-     * Time read column name
-     */
-    const val COL_TIME_READ = "${TABLE}_time_read"
-
-    /**
-     * query to create history table
-     */
-    val createTableQuery: String
-        get() = """CREATE TABLE $TABLE(
-            $COL_ID INTEGER NOT NULL PRIMARY KEY,
-            $COL_CHAPTER_ID INTEGER NOT NULL UNIQUE,
-            $COL_LAST_READ LONG,
-            $COL_TIME_READ LONG,
-            FOREIGN KEY($COL_CHAPTER_ID) REFERENCES ${ChapterTable.TABLE} (${ChapterTable.COL_ID})
-            ON DELETE CASCADE
-            )"""
-
-    /**
-     * query to index history chapter id
-     */
-    val createChapterIdIndexQuery: String
-        get() = "CREATE INDEX ${TABLE}_${COL_CHAPTER_ID}_index ON $TABLE($COL_CHAPTER_ID)"
-}

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

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.data.database.tables
 
-object TrackTable {
+object MangaSyncTable {
 
     const val TABLE = "manga_sync"
 

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

@@ -1,252 +0,0 @@
-package eu.kanade.tachiyomi.data.download
-
-import android.content.Context
-import android.net.Uri
-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.data.preference.getOrDefault
-import eu.kanade.tachiyomi.source.SourceManager
-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 = Injekt.get(),
-                    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().asObservable()
-                .skip(1)
-                .subscribe {
-                    lastRenew = 0L // invalidate cache
-                    rootDir = RootDirectory(getDirectoryFromPreference())
-                }
-    }
-
-    /**
-     * Returns the downloads directory from the user's preferences.
-     */
-    private fun getDirectoryFromPreference(): UniFile {
-        val dir = preferences.downloadsDirectory().getOrDefault()
-        return UniFile.fromUri(context, Uri.parse(dir))
-    }
-
-    /**
-     * 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.getChapterDirName(chapter) 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.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) == entry.key }?.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
-        val chapterDirName = provider.getChapterDirName(chapter)
-        if (chapterDirName in mangaDir.files) {
-            mangaDir.files -= chapterDirName
-        }
-    }
-
-    /**
-     * 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.put(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.put(key, value)
-            }
-        }
-        return destination
-    }
-
-}

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

@@ -1,169 +1,449 @@
 package eu.kanade.tachiyomi.data.download
 
 import android.content.Context
-import com.hippo.unifile.UniFile
-import com.jakewharton.rxrelay.BehaviorRelay
+import android.net.Uri
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.google.gson.stream.JsonReader
+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.source.Source
-import eu.kanade.tachiyomi.source.model.Page
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.data.preference.getOrDefault
+import eu.kanade.tachiyomi.data.source.Source
+import eu.kanade.tachiyomi.data.source.SourceManager
+import eu.kanade.tachiyomi.data.source.model.Page
+import eu.kanade.tachiyomi.data.source.online.OnlineSource
+import eu.kanade.tachiyomi.util.DiskUtils
+import eu.kanade.tachiyomi.util.DynamicConcurrentMergeOperator
+import eu.kanade.tachiyomi.util.UrlUtil
+import eu.kanade.tachiyomi.util.saveImageTo
 import rx.Observable
+import rx.Subscription
+import rx.android.schedulers.AndroidSchedulers
+import rx.schedulers.Schedulers
+import rx.subjects.BehaviorSubject
+import rx.subjects.PublishSubject
+import timber.log.Timber
+import java.io.File
+import java.io.FileReader
+import java.util.*
+import java.util.concurrent.TimeUnit
 
-/**
- * This class is used to manage chapter downloads in the application. It must be instantiated once
- * and retrieved through dependency injection. You can use this class to queue new chapters or query
- * downloaded chapters.
- *
- * @param context the application context.
- */
-class DownloadManager(context: Context) {
+class DownloadManager(private val context: Context, private val sourceManager: SourceManager, private val preferences: PreferencesHelper) {
 
-    /**
-     * Downloads provider, used to retrieve the folders where the chapters are or should be stored.
-     */
-    private val provider = DownloadProvider(context)
+    private val gson = Gson()
 
-    /**
-     * Cache of downloaded chapters.
-     */
-    private val cache = DownloadCache(context, provider)
+    private val downloadsQueueSubject = PublishSubject.create<List<Download>>()
+    val runningSubject = BehaviorSubject.create<Boolean>()
+    private var downloadsSubscription: Subscription? = null
 
-    /**
-     * Downloader whose only task is to download chapters.
-     */
-    private val downloader = Downloader(context, provider, cache)
+    val downloadNotifier by lazy { DownloadNotifier(context) }
 
-    /**
-     * Downloads queue, where the pending chapters are stored.
-     */
-    val queue: DownloadQueue
-        get() = downloader.queue
+    private val threadsSubject = BehaviorSubject.create<Int>()
+    private var threadsSubscription: Subscription? = null
 
-    /**
-     * Subject for subscribing to downloader status.
-     */
-    val runningRelay: BehaviorRelay<Boolean>
-        get() = downloader.runningRelay
+    val queue = DownloadQueue()
 
-    /**
-     * Tells the downloader to begin downloads.
-     *
-     * @return true if it's started, false otherwise (empty queue).
-     */
-    fun startDownloads(): Boolean {
-        return downloader.start()
-    }
+    val imageFilenameRegex = "[^\\sa-zA-Z0-9.-]".toRegex()
 
-    /**
-     * Tells the downloader to stop downloads.
-     *
-     * @param reason an optional reason for being stopped, used to notify the user.
-     */
-    fun stopDownloads(reason: String? = null) {
-        downloader.stop(reason)
-    }
+    val PAGE_LIST_FILE = "index.json"
 
-    /**
-     * Tells the downloader to pause downloads.
-     */
-    fun pauseDownloads() {
-        downloader.pause()
-    }
+    @Volatile var isRunning: Boolean = false
+        private set
 
-    /**
-     * Empties the download queue.
-     *
-     * @param isNotification value that determines if status is set (needed for view updates)
-     */
-    fun clearQueue(isNotification: Boolean = false) {
-        downloader.clearQueue(isNotification)
-    }
+    private fun initializeSubscriptions() {
 
-    /**
-     * 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.
-     */
-    fun downloadChapters(manga: Manga, chapters: List<Chapter>) {
-        downloader.queueChapters(manga, chapters)
-    }
+        downloadsSubscription?.unsubscribe()
 
-    /**
-     * Builds the page list of a downloaded chapter.
-     *
-     * @param source the source of the chapter.
-     * @param manga the manga of the chapter.
-     * @param chapter the downloaded chapter.
-     * @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(chapter, manga, source))
-    }
+        threadsSubscription = preferences.downloadThreads().asObservable()
+                .subscribe {
+                    threadsSubject.onNext(it)
+                    downloadNotifier.multipleDownloadThreads = it > 1
+                }
 
-    /**
-     * Builds the page list of a downloaded chapter.
-     *
-     * @param chapterDir the file where the chapter is downloaded.
-     * @return an observable containing the list of pages from the chapter.
-     */
-    private fun buildPageList(chapterDir: UniFile?): Observable<List<Page>> {
-        return Observable.fromCallable {
-            val files = chapterDir?.listFiles().orEmpty()
-                    .filter { "image" in it.type.orEmpty() }
-
-            if (files.isEmpty()) {
-                throw Exception("Page list is empty")
-            }
-
-            files.sortedBy { it.name }
-                    .mapIndexed { i, file ->
-                        Page(i, uri = file.uri).apply { status = Page.READY }
+        downloadsSubscription = downloadsQueueSubject.flatMap { Observable.from(it) }
+                .lift(DynamicConcurrentMergeOperator<Download, Download>({ downloadChapter(it) }, threadsSubject))
+                .onBackpressureBuffer()
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe({
+                    // Delete successful downloads from queue
+                    if (it.status == Download.DOWNLOADED) {
+                        // remove downloaded chapter from queue
+                        queue.del(it)
+                        downloadNotifier.onProgressChange(queue)
                     }
+                    if (areAllDownloadsFinished()) {
+                        DownloadService.stop(context)
+                    }
+                }, { e ->
+                    DownloadService.stop(context)
+                    Timber.e(e, e.message)
+                    downloadNotifier.onError(e.message)
+                })
+
+        if (!isRunning) {
+            isRunning = true
+            runningSubject.onNext(true)
         }
     }
 
-    /**
-     * 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 = false): Boolean {
-        return cache.isChapterDownloaded(chapter, manga, skipCache)
+    fun destroySubscriptions() {
+        if (isRunning) {
+            isRunning = false
+            runningSubject.onNext(false)
+        }
+
+        if (downloadsSubscription != null) {
+            downloadsSubscription?.unsubscribe()
+            downloadsSubscription = null
+        }
+
+        if (threadsSubscription != null) {
+            threadsSubscription?.unsubscribe()
+        }
+
     }
 
-    /**
-     * Returns the amount of downloaded chapters for a manga.
-     *
-     * @param manga the manga to check.
-     */
-    fun getDownloadCount(manga: Manga): Int {
-        return cache.getDownloadCount(manga)
+    // Create a download object for every chapter and add them to the downloads queue
+    fun downloadChapters(manga: Manga, chapters: List<Chapter>) {
+        val source = sourceManager.get(manga.source) as? OnlineSource ?: return
+
+        // Add chapters to queue from the start
+        val sortedChapters = chapters.sortedByDescending { it.source_order }
+
+        // Used to avoid downloading chapters with the same name
+        val addedChapters = ArrayList<String>()
+        val pending = ArrayList<Download>()
+
+        for (chapter in sortedChapters) {
+            if (addedChapters.contains(chapter.name))
+                continue
+
+            addedChapters.add(chapter.name)
+            val download = Download(source, manga, chapter)
+
+            if (!prepareDownload(download)) {
+                queue.add(download)
+                pending.add(download)
+            }
+        }
+
+        // Initialize queue size
+        downloadNotifier.initialQueueSize = queue.size
+        // Show notification
+        downloadNotifier.onProgressChange(queue)
+
+        if (isRunning) downloadsQueueSubject.onNext(pending)
     }
 
-    /**
-     * Deletes the directory of a downloaded chapter.
-     *
-     * @param chapter the chapter to delete.
-     * @param manga the manga of the chapter.
-     * @param source the source of the chapter.
-     */
-    fun deleteChapter(chapter: Chapter, manga: Manga, source: Source) {
-        provider.findChapterDir(chapter, manga, source)?.delete()
-        cache.removeChapter(chapter, manga)
+    // Public method to check if a chapter is downloaded
+    fun isChapterDownloaded(source: Source, manga: Manga, chapter: Chapter): Boolean {
+        val directory = getAbsoluteChapterDirectory(source, manga, chapter)
+        if (!directory.exists())
+            return false
+
+        val pages = getSavedPageList(source, manga, chapter)
+        return isChapterDownloaded(directory, pages)
     }
 
-    /**
-     * 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) {
-        provider.findMangaDir(manga, source)?.delete()
-        cache.removeManga(manga)
+    // Prepare the download. Returns true if the chapter is already downloaded
+    private fun prepareDownload(download: Download): Boolean {
+        // If the chapter is already queued, don't add it again
+        for (queuedDownload in queue) {
+            if (download.chapter.id == queuedDownload.chapter.id)
+                return true
+        }
+
+        // Add the directory to the download object for future access
+        download.directory = getAbsoluteChapterDirectory(download)
+
+        // If the directory doesn't exist, the chapter isn't downloaded.
+        if (!download.directory.exists()) {
+            return false
+        }
+
+        // If the page list doesn't exist, the chapter isn't downloaded
+        val savedPages = getSavedPageList(download) ?: return false
+
+        // Add the page list to the download object for future access
+        download.pages = savedPages
+
+        // If the number of files matches the number of pages, the chapter is downloaded.
+        // We have the index file, so we check one file more
+        return isChapterDownloaded(download.directory, download.pages)
     }
+
+    // Check that all the images are downloaded
+    private fun isChapterDownloaded(directory: File, pages: List<Page>?): Boolean {
+        return pages != null && !pages.isEmpty() && pages.size + 1 == directory.listFiles().size
+    }
+
+    // Download the entire chapter
+    private fun downloadChapter(download: Download): Observable<Download> {
+        DiskUtils.createDirectory(download.directory)
+
+        val pageListObservable = if (download.pages == null)
+            // Pull page list from network and add them to download object
+            download.source.fetchPageListFromNetwork(download.chapter)
+                    .doOnNext { pages ->
+                        download.pages = pages
+                        savePageList(download)
+                    }
+        else
+        // Or if the page list already exists, start from the file
+            Observable.just(download.pages)
+
+        return Observable.defer {
+            pageListObservable
+                    .doOnNext { pages ->
+                        download.downloadedImages = 0
+                        download.status = Download.DOWNLOADING
+                    }
+                    // Get all the URLs to the source images, fetch pages if necessary
+                    .flatMap { download.source.fetchAllImageUrlsFromPageList(it) }
+                    // Start downloading images, consider we can have downloaded images already
+                    .concatMap { page -> getOrDownloadImage(page, download) }
+                    // Do when page is downloaded.
+                    .doOnNext {
+                        downloadNotifier.onProgressChange(download, queue)
+                    }
+                    // Do after download completes
+                    .doOnCompleted { onDownloadCompleted(download) }
+                    .toList()
+                    .map { pages -> download }
+                    // If the page list threw, it will resume here
+                    .onErrorResumeNext { error ->
+                        download.status = Download.ERROR
+                        downloadNotifier.onError(error.message, download.chapter.name)
+                        Observable.just(download)
+                    }
+        }.subscribeOn(Schedulers.io())
+    }
+
+    // Get the image from the filesystem if it exists or download from network
+    private fun getOrDownloadImage(page: Page, download: Download): Observable<Page> {
+        // If the image URL is empty, do nothing
+        if (page.imageUrl == null)
+            return Observable.just(page)
+
+        val filename = getImageFilename(page)
+        val imagePath = File(download.directory, filename)
+
+        // If the image is already downloaded, do nothing. Otherwise download from network
+        val pageObservable = if (isImageDownloaded(imagePath))
+            Observable.just(page)
+        else
+            downloadImage(page, download.source, download.directory, filename)
+
+        return pageObservable
+                // When the image is ready, set image path, progress (just in case) and status
+                .doOnNext {
+                    page.imagePath = imagePath.absolutePath
+                    page.progress = 100
+                    download.downloadedImages++
+                    page.status = Page.READY
+                }
+                // Mark this page as error and allow to download the remaining
+                .onErrorResumeNext {
+                    page.progress = 0
+                    page.status = Page.ERROR
+                    Observable.just(page)
+                }
+    }
+
+    // Save image on disk
+    private fun downloadImage(page: Page, source: OnlineSource, directory: File, filename: String): Observable<Page> {
+        page.status = Page.DOWNLOAD_IMAGE
+        return source.imageResponse(page)
+                .flatMap {
+                    try {
+                        val file = File(directory, filename)
+                        file.parentFile.mkdirs()
+                        it.body().source().saveImageTo(file.outputStream(), preferences.reencodeImage())
+                    } catch (e: Exception) {
+                        it.body().close()
+                        throw e
+                    }
+                    Observable.just(page)
+                }
+                .retryWhen {
+                    it.zipWith(Observable.range(1, 3)) { errors, retries -> retries }
+                            .flatMap { retries -> Observable.timer((retries * 2).toLong(), TimeUnit.SECONDS) }
+                }
+    }
+
+    // Public method to get the image from the filesystem. It does NOT provide any way to download the image
+    fun getDownloadedImage(page: Page, chapterDir: File): Observable<Page> {
+        if (page.imageUrl == null) {
+            page.status = Page.ERROR
+            return Observable.just(page)
+        }
+
+        val imagePath = File(chapterDir, getImageFilename(page))
+
+        // When the image is ready, set image path, progress (just in case) and status
+        if (isImageDownloaded(imagePath)) {
+            page.imagePath = imagePath.absolutePath
+            page.progress = 100
+            page.status = Page.READY
+        } else {
+            page.status = Page.ERROR
+        }
+        return Observable.just(page)
+    }
+
+    // Get the filename for an image given the page
+    private fun getImageFilename(page: Page): String {
+        val url = page.imageUrl
+        val number = String.format("%03d", page.pageNumber + 1)
+
+        // Try to preserve file extension
+        return when {
+            UrlUtil.isJpg(url) -> "$number.jpg"
+            UrlUtil.isPng(url) -> "$number.png"
+            UrlUtil.isGif(url) -> "$number.gif"
+            else -> Uri.parse(url).lastPathSegment.replace(imageFilenameRegex, "_")
+        }
+    }
+
+    private fun isImageDownloaded(imagePath: File): Boolean {
+        return imagePath.exists()
+    }
+
+    // Called when a download finishes. This doesn't mean the download was successful, so we check it
+    private fun onDownloadCompleted(download: Download) {
+        checkDownloadIsSuccessful(download)
+        savePageList(download)
+    }
+
+    private fun checkDownloadIsSuccessful(download: Download) {
+        var actualProgress = 0
+        var status = Download.DOWNLOADED
+        // If any page has an error, the download result will be error
+        for (page in download.pages) {
+            actualProgress += page.progress
+            if (page.status != Page.READY) {
+                status = Download.ERROR
+                downloadNotifier.onError(context.getString(R.string.download_notifier_page_ready_error), download.chapter.name)
+            }
+        }
+        // Ensure that the chapter folder has all the images
+        if (!isChapterDownloaded(download.directory, download.pages)) {
+            status = Download.ERROR
+            downloadNotifier.onError(context.getString(R.string.download_notifier_page_error), download.chapter.name)
+        }
+        download.totalProgress = actualProgress
+        download.status = status
+    }
+
+    // Return the page list from the chapter's directory if it exists, null otherwise
+    fun getSavedPageList(source: Source, manga: Manga, chapter: Chapter): List<Page>? {
+        val chapterDir = getAbsoluteChapterDirectory(source, manga, chapter)
+        val pagesFile = File(chapterDir, PAGE_LIST_FILE)
+
+        return try {
+            JsonReader(FileReader(pagesFile)).use {
+                val collectionType = object : TypeToken<List<Page>>() {}.type
+                gson.fromJson(it, collectionType)
+            }
+        } catch (e: Exception) {
+            null
+        }
+    }
+
+    // Shortcut for the method above
+    private fun getSavedPageList(download: Download): List<Page>? {
+        return getSavedPageList(download.source, download.manga, download.chapter)
+    }
+
+    // Save the page list to the chapter's directory
+    fun savePageList(source: Source, manga: Manga, chapter: Chapter, pages: List<Page>) {
+        val chapterDir = getAbsoluteChapterDirectory(source, manga, chapter)
+        val pagesFile = File(chapterDir, PAGE_LIST_FILE)
+
+        pagesFile.outputStream().use {
+            try {
+                it.write(gson.toJson(pages).toByteArray())
+                it.flush()
+            } catch (e: Exception) {
+                Timber.e(e, e.message)
+            }
+        }
+    }
+
+    // Shortcut for the method above
+    private fun savePageList(download: Download) {
+        savePageList(download.source, download.manga, download.chapter, download.pages)
+    }
+
+    fun getAbsoluteMangaDirectory(source: Source, manga: Manga): File {
+        val mangaRelativePath = source.toString() +
+                File.separator +
+                manga.title.replace("[^\\sa-zA-Z0-9.-]".toRegex(), "_")
+
+        return File(preferences.downloadsDirectory().getOrDefault(), mangaRelativePath)
+    }
+
+    // Get the absolute path to the chapter directory
+    fun getAbsoluteChapterDirectory(source: Source, manga: Manga, chapter: Chapter): File {
+        val chapterRelativePath = chapter.name.replace("[^\\sa-zA-Z0-9.-]".toRegex(), "_")
+
+        return File(getAbsoluteMangaDirectory(source, manga), chapterRelativePath)
+    }
+
+    // Shortcut for the method above
+    private fun getAbsoluteChapterDirectory(download: Download): File {
+        return getAbsoluteChapterDirectory(download.source, download.manga, download.chapter)
+    }
+
+    fun deleteChapter(source: Source, manga: Manga, chapter: Chapter) {
+        val path = getAbsoluteChapterDirectory(source, manga, chapter)
+        DiskUtils.deleteFiles(path)
+    }
+
+    fun areAllDownloadsFinished(): Boolean {
+        for (download in queue) {
+            if (download.status <= Download.DOWNLOADING)
+                return false
+        }
+        return true
+    }
+
+    fun startDownloads(): Boolean {
+        if (queue.isEmpty())
+            return false
+
+        if (downloadsSubscription == null || downloadsSubscription!!.isUnsubscribed)
+            initializeSubscriptions()
+
+        val pending = ArrayList<Download>()
+        for (download in queue) {
+            if (download.status != Download.DOWNLOADED) {
+                if (download.status != Download.QUEUE) download.status = Download.QUEUE
+                pending.add(download)
+            }
+        }
+        downloadsQueueSubject.onNext(pending)
+
+        return !pending.isEmpty()
+    }
+
+    fun stopDownloads(errorMessage: String? = null) {
+        destroySubscriptions()
+        for (download in queue) {
+            if (download.status == Download.DOWNLOADING) {
+                download.status = Download.ERROR
+            }
+        }
+        errorMessage?.let { downloadNotifier.onError(it) }
+    }
+
+    fun clearQueue() {
+        queue.clear()
+        downloadNotifier.onClear()
+    }
+
 }

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

@@ -1,31 +1,29 @@
 package eu.kanade.tachiyomi.data.download
 
 import android.content.Context
-import android.graphics.BitmapFactory
 import android.support.v4.app.NotificationCompat
+import eu.kanade.tachiyomi.Constants
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.download.model.Download
 import eu.kanade.tachiyomi.data.download.model.DownloadQueue
-import eu.kanade.tachiyomi.data.notification.NotificationHandler
-import eu.kanade.tachiyomi.data.notification.NotificationReceiver
-import eu.kanade.tachiyomi.data.notification.Notifications
-import eu.kanade.tachiyomi.util.chop
 import eu.kanade.tachiyomi.util.notificationManager
-import java.util.regex.Pattern
 
 /**
  * DownloadNotifier is used to show notifications when downloading one or multiple chapters.
  *
  * @param context context of application
  */
-internal class DownloadNotifier(private val context: Context) {
+class DownloadNotifier(private val context: Context) {
     /**
      * Notification builder.
      */
-    private val notification by lazy {
-        NotificationCompat.Builder(context, Notifications.CHANNEL_DOWNLOADER)
-                .setLargeIcon(BitmapFactory.decodeResource(context.resources, R.mipmap.ic_launcher))
-    }
+    private val notificationBuilder = NotificationCompat.Builder(context)
+
+    /**
+     * Id of the notification.
+     */
+    private val notificationId: Int
+        get() = Constants.NOTIFICATION_DOWNLOAD_CHAPTER_ID
 
     /**
      * Status of download. Used for correct notification icon.
@@ -35,59 +33,12 @@ internal class DownloadNotifier(private val context: Context) {
     /**
      * The size of queue on start download.
      */
-    var initialQueueSize = 0
-        get() = field
-        set(value) {
-            if (value != 0){
-                isSingleChapter = (value == 1)
-            }
-            field = value
-        }
+    internal var initialQueueSize = 0
 
     /**
      * Simultaneous download setting > 1.
      */
-    var multipleDownloadThreads = false
-
-    /**
-     * Updated when error is thrown
-     */
-    var errorThrown = false
-
-    /**
-     * Updated when only single page is downloaded
-     */
-    var isSingleChapter = false
-
-    /**
-     * Updated when paused
-     */
-    var paused = false
-
-    /**
-     * Shows a notification from this builder.
-     *
-     * @param id the id of the notification.
-     */
-    private fun NotificationCompat.Builder.show(id: Int = Notifications.ID_DOWNLOAD_CHAPTER) {
-        context.notificationManager.notify(id, build())
-    }
-
-    /**
-     * Clear old actions if they exist.
-     */
-    private fun clearActions() = with(notification) {
-        if (!mActions.isEmpty())
-            mActions.clear()
-    }
-
-    /**
-     * Dismiss the downloader's notification. Downloader error notifications use a different id, so
-     * those can only be dismissed by the user.
-     */
-    fun dismiss() {
-        context.notificationManager.cancel(Notifications.ID_DOWNLOAD_CHAPTER)
-    }
+    internal var multipleDownloadThreads = false
 
     /**
      * Called when download progress changes.
@@ -95,128 +46,93 @@ internal class DownloadNotifier(private val context: Context) {
      *
      * @param queue the queue containing downloads.
      */
-    fun onProgressChange(queue: DownloadQueue) {
+    internal fun onProgressChange(queue: DownloadQueue) {
         if (multipleDownloadThreads) {
             doOnProgressChange(null, queue)
         }
     }
 
     /**
-     * Called when download progress changes.
-     * Note: Only accepted when single download active.
+     * Called when download progress changes
+     * Note: Only accepted when single download active
      *
-     * @param download download object containing download information.
-     * @param queue the queue containing downloads.
+     * @param download download object containing download information
+     * @param queue the queue containing downloads
      */
-    fun onProgressChange(download: Download, queue: DownloadQueue) {
+    internal fun onProgressChange(download: Download, queue: DownloadQueue) {
         if (!multipleDownloadThreads) {
             doOnProgressChange(download, queue)
         }
     }
 
     /**
-     * Show notification progress of chapter.
+     * Show notification progress of chapter
      *
-     * @param download download object containing download information.
-     * @param queue the queue containing downloads.
+     * @param download download object containing download information
+     * @param queue the queue containing downloads
      */
     private fun doOnProgressChange(download: Download?, queue: DownloadQueue) {
+        // Check if download is completed
+        if (multipleDownloadThreads) {
+            if (queue.isEmpty()) {
+                onComplete(null)
+                return
+            }
+        } else {
+            if (download != null && download.pages.size == download.downloadedImages) {
+                onComplete(download)
+                return
+            }
+        }
+
         // Create notification
-        with(notification) {
-            // Check if first call.
+        with (notificationBuilder) {
+            // Check if icon needs refresh
             if (!isDownloading) {
                 setSmallIcon(android.R.drawable.stat_sys_download)
-                setAutoCancel(false)
-                clearActions()
-                // Open download manager when clicked
-                setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context))
                 isDownloading = true
             }
 
             if (multipleDownloadThreads) {
                 setContentTitle(context.getString(R.string.app_name))
 
-                // Reset the queue size if the download progress is negative
-                if ((initialQueueSize - queue.size) < 0)
-                    initialQueueSize = queue.size
-
                 setContentText(context.getString(R.string.chapter_downloading_progress)
                         .format(initialQueueSize - queue.size, initialQueueSize))
                 setProgress(initialQueueSize, initialQueueSize - queue.size, false)
             } else {
                 download?.let {
-                    val title = it.manga.title.chop(15)
-                    val quotedTitle = Pattern.quote(title)
-                    val chapter = download.chapter.name.replaceFirst("$quotedTitle[\\s]*[-]*[\\s]*".toRegex(RegexOption.IGNORE_CASE), "")
-                    setContentTitle("$title - $chapter".chop(30))
+                    if (it.chapter.name.length >= 33)
+                        setContentTitle(it.chapter.name.slice(IntRange(0, 30)).plus("..."))
+                    else
+                        setContentTitle(it.chapter.name)
+
                     setContentText(context.getString(R.string.chapter_downloading_progress)
-                            .format(it.downloadedImages, it.pages!!.size))
-                    setProgress(it.pages!!.size, it.downloadedImages, false)
+                            .format(it.downloadedImages, it.pages.size))
+                    setProgress(it.pages.size, it.downloadedImages, false)
 
                 }
             }
         }
         // Displays the progress bar on notification
-        notification.show()
+        context.notificationManager.notify(notificationId, notificationBuilder.build())
     }
 
     /**
-     * Show notification when download is paused.
-     */
-    fun onDownloadPaused() {
-        with(notification) {
-            setContentTitle(context.getString(R.string.chapter_paused))
-            setContentText(context.getString(R.string.download_notifier_download_paused))
-            setSmallIcon(R.drawable.ic_av_pause_grey_24dp_img)
-            setAutoCancel(false)
-            setProgress(0, 0, false)
-            clearActions()
-            // Open download manager when clicked
-            setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context))
-            // Resume action
-            addAction(R.drawable.ic_av_play_arrow_grey_img,
-                    context.getString(R.string.action_resume),
-                    NotificationReceiver.resumeDownloadsPendingBroadcast(context))
-            //Clear action
-            addAction(R.drawable.ic_clear_grey_24dp_img,
-                    context.getString(R.string.action_clear),
-                    NotificationReceiver.clearDownloadsPendingBroadcast(context))
-        }
-
-        // Show notification.
-        notification.show()
-
-        // Reset initial values
-        isDownloading = false
-        initialQueueSize = 0
-    }
-
-    /**
-     * Called when chapter is downloaded.
+     * Called when chapter is downloaded
      *
-     * @param download download object containing download information.
+     * @param download download object containing download information
      */
-    fun onDownloadCompleted(download: Download, queue: DownloadQueue) {
-        // Check if last download
-        if (!queue.isEmpty()) {
-            return
-        }
+    private fun onComplete(download: Download?) {
         // Create notification.
-        with(notification) {
-            val title = download.manga.title.chop(15)
-            val quotedTitle = Pattern.quote(title)
-            val chapter = download.chapter.name.replaceFirst("$quotedTitle[\\s]*[-]*[\\s]*".toRegex(RegexOption.IGNORE_CASE), "")
-            setContentTitle("$title - $chapter".chop(30))
+        with(notificationBuilder) {
+            setContentTitle(download?.chapter?.name ?: context.getString(R.string.app_name))
             setContentText(context.getString(R.string.update_check_notification_download_complete))
             setSmallIcon(android.R.drawable.stat_sys_download_done)
-            setAutoCancel(true)
-            clearActions()
-            setContentIntent(NotificationReceiver.openChapterPendingBroadcast(context, download.manga, download.chapter))
             setProgress(0, 0, false)
         }
 
         // Show notification.
-        notification.show()
+        context.notificationManager.notify(notificationId, notificationBuilder.build())
 
         // Reset initial values
         isDownloading = false
@@ -224,48 +140,27 @@ internal class DownloadNotifier(private val context: Context) {
     }
 
     /**
-     * Called when the downloader receives a warning.
-     *
-     * @param reason the text to show.
+     * Clears the notification message
      */
-    fun onWarning(reason: String) {
-        with(notification) {
-            setContentTitle(context.getString(R.string.download_notifier_downloader_title))
-            setContentText(reason)
-            setSmallIcon(android.R.drawable.stat_sys_warning)
-            setAutoCancel(true)
-            clearActions()
-            setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context))
-            setProgress(0, 0, false)
-        }
-        notification.show()
-
-        // Reset download information
-        isDownloading = false
+    internal fun onClear() {
+        context.notificationManager.cancel(notificationId)
     }
 
     /**
-     * Called when the downloader receives an error. It's shown as a separate notification to avoid
-     * being overwritten.
+     * Called on error while downloading chapter
      *
-     * @param error string containing error information.
-     * @param chapter string containing chapter title.
+     * @param error string containing error information
+     * @param chapter string containing chapter title
      */
-    fun onError(error: String? = null, chapter: String? = null) {
+    internal fun onError(error: String? = null, chapter: String? = null) {
         // Create notification
-        with(notification) {
-            setContentTitle(chapter ?: context.getString(R.string.download_notifier_downloader_title))
+        with(notificationBuilder) {
+            setContentTitle(chapter ?: context.getString(R.string.download_notifier_title_error))
             setContentText(error ?: context.getString(R.string.download_notifier_unkown_error))
             setSmallIcon(android.R.drawable.stat_sys_warning)
-            clearActions()
-            setAutoCancel(false)
-            setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context))
             setProgress(0, 0, false)
         }
-        notification.show(Notifications.ID_DOWNLOAD_CHAPTER_ERROR)
-
-        // Reset download information
-        errorThrown = true
+        context.notificationManager.notify(Constants.NOTIFICATION_DOWNLOAD_CHAPTER_ERROR_ID, notificationBuilder.build())
         isDownloading = false
     }
 }

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

@@ -1,111 +0,0 @@
-package eu.kanade.tachiyomi.data.download
-
-import android.content.Context
-import android.net.Uri
-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.data.preference.getOrDefault
-import eu.kanade.tachiyomi.source.Source
-import eu.kanade.tachiyomi.util.DiskUtil
-import uy.kohesive.injekt.injectLazy
-
-/**
- * This class is used to provide the directories where the downloads should be saved.
- * It uses the following path scheme: /<root downloads dir>/<source name>/<manga>/<chapter>
- *
- * @param context the application context.
- */
-class DownloadProvider(private val context: Context) {
-
-    /**
-     * Preferences helper.
-     */
-    private val preferences: PreferencesHelper by injectLazy()
-
-    /**
-     * The root directory for downloads.
-     */
-    private var downloadsDir = preferences.downloadsDirectory().getOrDefault().let {
-        UniFile.fromUri(context, Uri.parse(it))
-    }
-
-    init {
-        preferences.downloadsDirectory().asObservable()
-                .skip(1)
-                .subscribe { downloadsDir = UniFile.fromUri(context, Uri.parse(it)) }
-    }
-
-    /**
-     * Returns the download directory for a manga. For internal use only.
-     *
-     * @param manga the manga to query.
-     * @param source the source of the manga.
-     */
-    internal fun getMangaDir(manga: Manga, source: Source): UniFile {
-        return downloadsDir
-                .createDirectory(getSourceDirName(source))
-                .createDirectory(getMangaDirName(manga))
-    }
-
-    /**
-     * Returns the download directory for a source if it exists.
-     *
-     * @param source the source to query.
-     */
-    fun findSourceDir(source: Source): UniFile? {
-        return downloadsDir.findFile(getSourceDirName(source))
-    }
-
-    /**
-     * Returns the download directory for a manga if it exists.
-     *
-     * @param manga the manga to query.
-     * @param source the source of the manga.
-     */
-    fun findMangaDir(manga: Manga, source: Source): UniFile? {
-        val sourceDir = findSourceDir(source)
-        return sourceDir?.findFile(getMangaDirName(manga))
-    }
-
-    /**
-     * Returns the download directory for a chapter if it exists.
-     *
-     * @param chapter the chapter to query.
-     * @param manga the manga of the chapter.
-     * @param source the source of the chapter.
-     */
-    fun findChapterDir(chapter: Chapter, manga: Manga, source: Source): UniFile? {
-        val mangaDir = findMangaDir(manga, source)
-        return mangaDir?.findFile(getChapterDirName(chapter))
-    }
-
-    /**
-     * Returns the download directory name for a source.
-     *
-     * @param source the source to query.
-     */
-    fun getSourceDirName(source: Source): String {
-        return source.toString()
-    }
-
-    /**
-     * Returns the download directory name for a manga.
-     *
-     * @param manga the manga to query.
-     */
-    fun getMangaDirName(manga: Manga): String {
-        return DiskUtil.buildValidFilename(manga.title)
-    }
-
-    /**
-     * Returns the chapter directory name for a chapter.
-     *
-     * @param chapter the chapter to query.
-     */
-    fun getChapterDirName(chapter: Chapter): String {
-        return DiskUtil.buildValidFilename(chapter.name)
-    }
-
-}

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

@@ -3,177 +3,132 @@ package eu.kanade.tachiyomi.data.download
 import android.app.Service
 import android.content.Context
 import android.content.Intent
-import android.net.NetworkInfo.State.CONNECTED
-import android.net.NetworkInfo.State.DISCONNECTED
 import android.os.IBinder
 import android.os.PowerManager
-import com.github.pwittchen.reactivenetwork.library.Connectivity
+import com.github.pwittchen.reactivenetwork.library.ConnectivityStatus
 import com.github.pwittchen.reactivenetwork.library.ReactiveNetwork
-import com.jakewharton.rxrelay.BehaviorRelay
+import eu.kanade.tachiyomi.App
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.util.connectivityManager
-import eu.kanade.tachiyomi.util.plusAssign
-import eu.kanade.tachiyomi.util.powerManager
 import eu.kanade.tachiyomi.util.toast
+import rx.Subscription
 import rx.android.schedulers.AndroidSchedulers
 import rx.schedulers.Schedulers
-import rx.subscriptions.CompositeSubscription
-import uy.kohesive.injekt.injectLazy
+import javax.inject.Inject
 
-/**
- * This service is used to manage the downloader. The system can decide to stop the service, in
- * which case the downloader is also stopped. It's also stopped while there's no network available.
- * While the downloader is running, a wake lock will be held.
- */
 class DownloadService : Service() {
 
     companion object {
 
-        /**
-         * Relay used to know when the service is running.
-         */
-        val runningRelay: BehaviorRelay<Boolean> = BehaviorRelay.create(false)
-
-        /**
-         * Starts this service.
-         *
-         * @param context the application context.
-         */
         fun start(context: Context) {
             context.startService(Intent(context, DownloadService::class.java))
         }
 
-        /**
-         * Stops this service.
-         *
-         * @param context the application context.
-         */
         fun stop(context: Context) {
             context.stopService(Intent(context, DownloadService::class.java))
         }
     }
 
-    /**
-     * Download manager.
-     */
-    private val downloadManager: DownloadManager by injectLazy()
+    @Inject lateinit var downloadManager: DownloadManager
+    @Inject lateinit var preferences: PreferencesHelper
 
-    /**
-     * Preferences helper.
-     */
-    private val preferences: PreferencesHelper by injectLazy()
+    private var wakeLock: PowerManager.WakeLock? = null
+    private var networkChangeSubscription: Subscription? = null
+    private var queueRunningSubscription: Subscription? = null
+    private var isRunning: Boolean = false
 
-    /**
-     * Wake lock to prevent the device to enter sleep mode.
-     */
-    private val wakeLock by lazy {
-        powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "DownloadService:WakeLock")
-    }
-
-    /**
-     * Subscriptions to store while the service is running.
-     */
-    private lateinit var subscriptions: CompositeSubscription
-
-    /**
-     * Called when the service is created.
-     */
     override fun onCreate() {
         super.onCreate()
-        runningRelay.call(true)
-        subscriptions = CompositeSubscription()
-        listenDownloaderState()
+        App.get(this).component.inject(this)
+
+        createWakeLock()
+
+        listenQueueRunningChanges()
         listenNetworkChanges()
     }
 
-    /**
-     * Called when the service is destroyed.
-     */
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        return Service.START_STICKY
+    }
+
     override fun onDestroy() {
-        runningRelay.call(false)
-        subscriptions.unsubscribe()
-        downloadManager.stopDownloads()
-        wakeLock.releaseIfNeeded()
+        queueRunningSubscription?.unsubscribe()
+        networkChangeSubscription?.unsubscribe()
+        downloadManager.destroySubscriptions()
+        destroyWakeLock()
         super.onDestroy()
     }
 
-    /**
-     * Not used.
-     */
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        return Service.START_NOT_STICKY
-    }
-
-    /**
-     * Not used.
-     */
     override fun onBind(intent: Intent): IBinder? {
         return null
     }
 
-    /**
-     * Listens to network changes.
-     *
-     * @see onNetworkStateChanged
-     */
     private fun listenNetworkChanges() {
-        subscriptions += ReactiveNetwork.observeNetworkConnectivity(applicationContext)
+        networkChangeSubscription = ReactiveNetwork().enableInternetCheck()
+                .observeConnectivity(applicationContext)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ state -> onNetworkStateChanged(state)
-                }, { _ ->
+                .subscribe({ state ->
+                    when (state) {
+                        ConnectivityStatus.WIFI_CONNECTED_HAS_INTERNET -> {
+                            // If there are no remaining downloads, destroy the service
+                            if (!isRunning && !downloadManager.startDownloads()) {
+                                stopSelf()
+                            }
+                        }
+                        ConnectivityStatus.MOBILE_CONNECTED -> {
+                            if (!preferences.downloadOnlyOverWifi()) {
+                                if (!isRunning && !downloadManager.startDownloads()) {
+                                    stopSelf()
+                                }
+                            } else if (isRunning) {
+                                downloadManager.stopDownloads(getString(R.string.download_notifier_text_only_wifi))
+                            }
+                        }
+                        else -> {
+                            if (isRunning) {
+                                downloadManager.stopDownloads(getString(R.string.download_notifier_text_only_wifi))
+                            }
+                        }
+                    }
+                }, { error ->
                     toast(R.string.download_queue_error)
                     stopSelf()
                 })
     }
 
-    /**
-     * Called when the network state changes.
-     *
-     * @param connectivity the new network state.
-     */
-    private fun onNetworkStateChanged(connectivity: Connectivity) {
-        when (connectivity.state) {
-            CONNECTED -> {
-                if (preferences.downloadOnlyOverWifi() && connectivityManager.isActiveNetworkMetered) {
-                    downloadManager.stopDownloads(getString(R.string.download_notifier_text_only_wifi))
-                } else {
-                    val started = downloadManager.startDownloads()
-                    if (!started) stopSelf()
-                }
-            }
-            DISCONNECTED -> {
-                downloadManager.stopDownloads(getString(R.string.download_notifier_no_network))
-            }
-            else -> { /* Do nothing */ }
-        }
-    }
-
-    /**
-     * Listens to downloader status. Enables or disables the wake lock depending on the status.
-     */
-    private fun listenDownloaderState() {
-        subscriptions += downloadManager.runningRelay.subscribe { running ->
+    private fun listenQueueRunningChanges() {
+        queueRunningSubscription = downloadManager.runningSubject.subscribe { running ->
+            isRunning = running
             if (running)
-                wakeLock.acquireIfNeeded()
+                acquireWakeLock()
             else
-                wakeLock.releaseIfNeeded()
+                releaseWakeLock()
         }
     }
 
-    /**
-     * Releases the wake lock if it's held.
-     */
-    fun PowerManager.WakeLock.releaseIfNeeded() {
-        if (isHeld) release()
+    private fun createWakeLock() {
+        wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager).newWakeLock(
+                PowerManager.PARTIAL_WAKE_LOCK, "DownloadService:WakeLock")
     }
 
-    /**
-     * Acquires the wake lock if it's not held.
-     */
-    fun PowerManager.WakeLock.acquireIfNeeded() {
-        if (!isHeld) acquire()
+    private fun destroyWakeLock() {
+        if (wakeLock != null && wakeLock!!.isHeld) {
+            wakeLock!!.release()
+            wakeLock = null
+        }
+    }
+
+    fun acquireWakeLock() {
+        if (wakeLock != null && !wakeLock!!.isHeld) {
+            wakeLock!!.acquire()
+        }
+    }
+
+    fun releaseWakeLock() {
+        if (wakeLock != null && wakeLock!!.isHeld) {
+            wakeLock!!.release()
+        }
     }
 
 }

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

@@ -1,135 +0,0 @@
-package eu.kanade.tachiyomi.data.download
-
-import android.content.Context
-import com.google.gson.Gson
-import eu.kanade.tachiyomi.data.database.DatabaseHelper
-import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.download.model.Download
-import eu.kanade.tachiyomi.source.SourceManager
-import eu.kanade.tachiyomi.source.online.HttpSource
-import uy.kohesive.injekt.injectLazy
-
-/**
- * This class is used to persist active downloads across application restarts.
- *
- * @param context the application context.
- */
-class DownloadStore(context: Context) {
-
-    /**
-     * Preference file where active downloads are stored.
-     */
-    private val preferences = context.getSharedPreferences("active_downloads", Context.MODE_PRIVATE)
-
-    /**
-     * Gson instance to serialize/deserialize downloads.
-     */
-    private val gson: Gson by injectLazy()
-
-    /**
-     * Source manager.
-     */
-    private val sourceManager: SourceManager by injectLazy()
-
-    /**
-     * Database helper.
-     */
-    private val db: DatabaseHelper by injectLazy()
-
-    /**
-     * Counter used to keep the queue order.
-     */
-    private var counter = 0
-
-    /**
-     * Adds a list of downloads to the store.
-     *
-     * @param downloads the list of downloads to add.
-     */
-    fun addAll(downloads: List<Download>) {
-        val editor = preferences.edit()
-        downloads.forEach { editor.putString(getKey(it), serialize(it)) }
-        editor.apply()
-    }
-
-    /**
-     * Removes a download from the store.
-     *
-     * @param download the download to remove.
-     */
-    fun remove(download: Download) {
-        preferences.edit().remove(getKey(download)).apply()
-    }
-
-    /**
-     * Removes all the downloads from the store.
-     */
-    fun clear() {
-        preferences.edit().clear().apply()
-    }
-
-    /**
-     * Returns the preference's key for the given download.
-     *
-     * @param download the download.
-     */
-    private fun getKey(download: Download): String {
-        return download.chapter.id!!.toString()
-    }
-
-    /**
-     * Returns the list of downloads to restore. It should be called in a background thread.
-     */
-    fun restore(): List<Download> {
-        val objs = preferences.all
-                .mapNotNull { it.value as? String }
-                .map { deserialize(it) }
-                .sortedBy { it.order }
-
-        val downloads = mutableListOf<Download>()
-        if (objs.isNotEmpty()) {
-            val cachedManga = mutableMapOf<Long, Manga?>()
-            for ((mangaId, chapterId) in objs) {
-                val manga = cachedManga.getOrPut(mangaId) {
-                    db.getManga(mangaId).executeAsBlocking()
-                } ?: continue
-                val source = sourceManager.get(manga.source) as? HttpSource ?: continue
-                val chapter = db.getChapter(chapterId).executeAsBlocking() ?: continue
-                downloads.add(Download(source, manga, chapter))
-            }
-        }
-
-        // Clear the store, downloads will be added again immediately.
-        clear()
-        return downloads
-    }
-
-    /**
-     * Converts a download to a string.
-     *
-     * @param download the download to serialize.
-     */
-    private fun serialize(download: Download): String {
-        val obj = DownloadObject(download.manga.id!!, download.chapter.id!!, counter++)
-        return gson.toJson(obj)
-    }
-
-    /**
-     * Restore a download from a string.
-     *
-     * @param string the download as string.
-     */
-    private fun deserialize(string: String): DownloadObject {
-        return gson.fromJson(string, DownloadObject::class.java)
-    }
-
-    /**
-     * Class used for download serialization
-     *
-     * @param mangaId the id of the manga.
-     * @param chapterId the id of the chapter.
-     * @param order the order of the download in the queue.
-     */
-    data class DownloadObject(val mangaId: Long, val chapterId: Long, val order: Int)
-
-}

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

@@ -1,465 +0,0 @@
-package eu.kanade.tachiyomi.data.download
-
-import android.content.Context
-import android.webkit.MimeTypeMap
-import com.hippo.unifile.UniFile
-import com.jakewharton.rxrelay.BehaviorRelay
-import com.jakewharton.rxrelay.PublishRelay
-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.data.preference.getOrDefault
-import eu.kanade.tachiyomi.source.SourceManager
-import eu.kanade.tachiyomi.source.model.Page
-import eu.kanade.tachiyomi.source.online.HttpSource
-import eu.kanade.tachiyomi.source.online.fetchAllImageUrlsFromPageList
-import eu.kanade.tachiyomi.util.*
-import kotlinx.coroutines.experimental.async
-import okhttp3.Response
-import rx.Observable
-import rx.android.schedulers.AndroidSchedulers
-import rx.schedulers.Schedulers
-import rx.subjects.BehaviorSubject
-import rx.subscriptions.CompositeSubscription
-import timber.log.Timber
-import uy.kohesive.injekt.injectLazy
-
-/**
- * This class is the one in charge of downloading chapters.
- *
- * Its [queue] contains the list of chapters to download. In order to download them, the downloader
- * subscriptions must be running and the list of chapters must be sent to them by [downloadsRelay].
- *
- * The queue manipulation must be done in one thread (currently the main thread) to avoid unexpected
- * behavior, but it's safe to read it from multiple threads.
- *
- * @param context the application context.
- * @param provider the downloads directory provider.
- * @param cache the downloads cache, used to add the downloads to the cache after their completion.
- */
-class Downloader(private val context: Context,
-                 private val provider: DownloadProvider,
-                 private val cache: DownloadCache) {
-
-    /**
-     * Store for persisting downloads across restarts.
-     */
-    private val store = DownloadStore(context)
-
-    /**
-     * Queue where active downloads are kept.
-     */
-    val queue = DownloadQueue(store)
-
-    /**
-     * Source manager.
-     */
-    private val sourceManager: SourceManager by injectLazy()
-
-    /**
-     * Preferences.
-     */
-    private val preferences: PreferencesHelper by injectLazy()
-
-    /**
-     * Notifier for the downloader state and progress.
-     */
-    private val notifier by lazy { DownloadNotifier(context) }
-
-    /**
-     * Downloader subscriptions.
-     */
-    private val subscriptions = CompositeSubscription()
-
-    /**
-     * Subject to do a live update of the number of simultaneous downloads.
-     */
-    private val threadsSubject = BehaviorSubject.create<Int>()
-
-    /**
-     * Relay to send a list of downloads to the downloader.
-     */
-    private val downloadsRelay = PublishRelay.create<List<Download>>()
-
-    /**
-     * Relay to subscribe to the downloader status.
-     */
-    val runningRelay: BehaviorRelay<Boolean> = BehaviorRelay.create(false)
-
-    /**
-     * Whether the downloader is running.
-     */
-    @Volatile private var isRunning: Boolean = false
-
-    init {
-        launchNow {
-            val chapters = async { store.restore() }
-            queue.addAll(chapters.await())
-        }
-    }
-
-    /**
-     * Starts the downloader. It doesn't do anything if it's already running or there isn't anything
-     * to download.
-     *
-     * @return true if the downloader is started, false otherwise.
-     */
-    fun start(): Boolean {
-        if (isRunning || queue.isEmpty())
-            return false
-
-        if (!subscriptions.hasSubscriptions())
-            initializeSubscriptions()
-
-        val pending = queue.filter { it.status != Download.DOWNLOADED }
-        pending.forEach { if (it.status != Download.QUEUE) it.status = Download.QUEUE }
-
-        // Show download notification when simultaneous download > 1.
-        notifier.onProgressChange(queue)
-
-        downloadsRelay.call(pending)
-        return !pending.isEmpty()
-    }
-
-    /**
-     * Stops the downloader.
-     */
-    fun stop(reason: String? = null) {
-        destroySubscriptions()
-        queue
-                .filter { it.status == Download.DOWNLOADING }
-                .forEach { it.status = Download.ERROR }
-
-        if (reason != null) {
-            notifier.onWarning(reason)
-        } else {
-            if (notifier.paused) {
-                notifier.paused = false
-                notifier.onDownloadPaused()
-            } else if (notifier.isSingleChapter && !notifier.errorThrown) {
-                notifier.isSingleChapter = false
-            } else {
-                notifier.dismiss()
-            }
-        }
-    }
-
-    /**
-     * Pauses the downloader
-     */
-    fun pause() {
-        destroySubscriptions()
-        queue
-                .filter { it.status == Download.DOWNLOADING }
-                .forEach { it.status = Download.QUEUE }
-        notifier.paused = true
-    }
-
-    /**
-     * Removes everything from the queue.
-     *
-     * @param isNotification value that determines if status is set (needed for view updates)
-     */
-    fun clearQueue(isNotification: Boolean = false) {
-        destroySubscriptions()
-
-        //Needed to update the chapter view
-        if (isNotification) {
-            queue
-                    .filter { it.status == Download.QUEUE }
-                    .forEach { it.status = Download.NOT_DOWNLOADED }
-        }
-        queue.clear()
-        notifier.dismiss()
-    }
-
-    /**
-     * Prepares the subscriptions to start downloading.
-     */
-    private fun initializeSubscriptions() {
-        if (isRunning) return
-        isRunning = true
-        runningRelay.call(true)
-
-        subscriptions.clear()
-
-        subscriptions += preferences.downloadThreads().asObservable()
-                .subscribe {
-                    threadsSubject.onNext(it)
-                    notifier.multipleDownloadThreads = it > 1
-                }
-
-        subscriptions += downloadsRelay.flatMap { Observable.from(it) }
-                .lift(DynamicConcurrentMergeOperator<Download, Download>({ downloadChapter(it) }, threadsSubject))
-                .onBackpressureBuffer()
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ completeDownload(it)
-                }, { error ->
-                    DownloadService.stop(context)
-                    Timber.e(error)
-                    notifier.onError(error.message)
-                })
-    }
-
-    /**
-     * Destroys the downloader subscriptions.
-     */
-    private fun destroySubscriptions() {
-        if (!isRunning) return
-        isRunning = false
-        runningRelay.call(false)
-
-        subscriptions.clear()
-    }
-
-    /**
-     * Creates a download object for every chapter and adds them to the downloads queue.
-     *
-     * @param manga the manga of the chapters to download.
-     * @param chapters the list of chapters to download.
-     */
-    fun queueChapters(manga: Manga, chapters: List<Chapter>) = launchUI {
-        val source = sourceManager.get(manga.source) as? HttpSource ?: return@launchUI
-
-        // Called in background thread, the operation can be slow with SAF.
-        val chaptersWithoutDir = async {
-            val mangaDir = provider.findMangaDir(manga, source)
-
-            chapters
-                    // Avoid downloading chapters with the same name.
-                    .distinctBy { it.name }
-                    // Filter out those already downloaded.
-                    .filter { mangaDir?.findFile(provider.getChapterDirName(it)) == null }
-                    // Add chapters to queue from the start.
-                    .sortedByDescending { it.source_order }
-        }
-
-        // Runs in main thread (synchronization needed).
-        val chaptersToQueue = chaptersWithoutDir.await()
-                // Filter out those already enqueued.
-                .filter { chapter -> queue.none { it.chapter.id == chapter.id } }
-                // Create a download for each one.
-                .map { Download(source, manga, it) }
-
-        if (chaptersToQueue.isNotEmpty()) {
-            queue.addAll(chaptersToQueue)
-
-            // Initialize queue size.
-            notifier.initialQueueSize = queue.size
-
-            // Initial multi-thread
-            notifier.multipleDownloadThreads = preferences.downloadThreads().getOrDefault() > 1
-
-            if (isRunning) {
-                // Send the list of downloads to the downloader.
-                downloadsRelay.call(chaptersToQueue)
-            } else {
-                // Show initial notification.
-                notifier.onProgressChange(queue)
-            }
-
-            // Start downloader if needed
-            DownloadService.start(this@Downloader.context)
-        }
-    }
-
-    /**
-     * Returns the observable which downloads a chapter.
-     *
-     * @param download the chapter to be downloaded.
-     */
-    private fun downloadChapter(download: Download): Observable<Download> {
-        val chapterDirname = provider.getChapterDirName(download.chapter)
-        val mangaDir = provider.getMangaDir(download.manga, download.source)
-        val tmpDir = mangaDir.createDirectory("${chapterDirname}_tmp")
-
-        val pageListObservable = if (download.pages == null) {
-            // Pull page list from network and add them to download object
-            download.source.fetchPageList(download.chapter)
-                    .doOnNext { pages ->
-                        if (pages.isEmpty()) {
-                            throw Exception("Page list is empty")
-                        }
-                        download.pages = pages
-                    }
-        } else {
-            // Or if the page list already exists, start from the file
-            Observable.just(download.pages!!)
-        }
-
-        return pageListObservable
-                .doOnNext { _ ->
-                    // Delete all temporary (unfinished) files
-                    tmpDir.listFiles()
-                            ?.filter { it.name!!.endsWith(".tmp") }
-                            ?.forEach { it.delete() }
-
-                    download.downloadedImages = 0
-                    download.status = Download.DOWNLOADING
-                }
-                // Get all the URLs to the source images, fetch pages if necessary
-                .flatMap { download.source.fetchAllImageUrlsFromPageList(it) }
-                // Start downloading images, consider we can have downloaded images already
-                .concatMap { page -> getOrDownloadImage(page, download, tmpDir) }
-                // Do when page is downloaded.
-                .doOnNext { notifier.onProgressChange(download, queue) }
-                .toList()
-                .map { _ -> download }
-                // Do after download completes
-                .doOnNext { ensureSuccessfulDownload(download, mangaDir, tmpDir, chapterDirname) }
-                // If the page list threw, it will resume here
-                .onErrorReturn { error ->
-                    download.status = Download.ERROR
-                    notifier.onError(error.message, download.chapter.name)
-                    download
-                }
-                .subscribeOn(Schedulers.io())
-    }
-
-    /**
-     * Returns the observable which gets the image from the filesystem if it exists or downloads it
-     * otherwise.
-     *
-     * @param page the page to download.
-     * @param download the download of the page.
-     * @param tmpDir the temporary directory of the download.
-     */
-    private fun getOrDownloadImage(page: Page, download: Download, tmpDir: UniFile): Observable<Page> {
-        // If the image URL is empty, do nothing
-        if (page.imageUrl == null)
-            return Observable.just(page)
-
-        val filename = String.format("%03d", page.number)
-        val tmpFile = tmpDir.findFile("$filename.tmp")
-
-        // Delete temp file if it exists.
-        tmpFile?.delete()
-
-        // Try to find the image file.
-        val imageFile = tmpDir.listFiles()!!.find { it.name!!.startsWith("$filename.") }
-
-        // If the image is already downloaded, do nothing. Otherwise download from network
-        val pageObservable = if (imageFile != null)
-            Observable.just(imageFile)
-        else
-            downloadImage(page, download.source, tmpDir, filename)
-
-        return pageObservable
-                // When the image is ready, set image path, progress (just in case) and status
-                .doOnNext { file ->
-                    page.uri = file.uri
-                    page.progress = 100
-                    download.downloadedImages++
-                    page.status = Page.READY
-                }
-                .map { page }
-                // Mark this page as error and allow to download the remaining
-                .onErrorReturn {
-                    page.progress = 0
-                    page.status = Page.ERROR
-                    page
-                }
-    }
-
-    /**
-     * Returns the observable which downloads the image from network.
-     *
-     * @param page the page to download.
-     * @param source the source of the page.
-     * @param tmpDir the temporary directory of the download.
-     * @param filename the filename of the image.
-     */
-    private fun downloadImage(page: Page, source: HttpSource, tmpDir: UniFile, filename: String): Observable<UniFile> {
-        page.status = Page.DOWNLOAD_IMAGE
-        page.progress = 0
-        return source.fetchImage(page)
-                .map { response ->
-                    val file = tmpDir.createFile("$filename.tmp")
-                    try {
-                        response.body()!!.source().saveTo(file.openOutputStream())
-                        val extension = getImageExtension(response, file)
-                        file.renameTo("$filename.$extension")
-                    } catch (e: Exception) {
-                        response.close()
-                        file.delete()
-                        throw e
-                    }
-                    file
-                }
-                // Retry 3 times, waiting 2, 4 and 8 seconds between attempts.
-                .retryWhen(RetryWithDelay(3, { (2 shl it - 1) * 1000 }, Schedulers.trampoline()))
-    }
-
-    /**
-     * Returns the extension of the downloaded image from the network response, or if it's null,
-     * analyze the file. If everything fails, assume it's a jpg.
-     *
-     * @param response the network response of the image.
-     * @param file the file where the image is already downloaded.
-     */
-    private fun getImageExtension(response: Response, file: UniFile): String {
-        // Read content type if available.
-        val mime = response.body()?.contentType()?.let { ct -> "${ct.type()}/${ct.subtype()}" }
-            // Else guess from the uri.
-            ?: context.contentResolver.getType(file.uri)
-            // Else read magic numbers.
-            ?: DiskUtil.findImageMime { file.openInputStream() }
-
-        return MimeTypeMap.getSingleton().getExtensionFromMimeType(mime) ?: "jpg"
-    }
-
-    /**
-     * Checks if the download was successful.
-     *
-     * @param download the download to check.
-     * @param mangaDir the manga directory of the download.
-     * @param tmpDir the directory where the download is currently stored.
-     * @param dirname the real (non temporary) directory name of the download.
-     */
-    private fun ensureSuccessfulDownload(download: Download, mangaDir: UniFile,
-                                         tmpDir: UniFile, dirname: String) {
-
-        // Ensure that the chapter folder has all the images.
-        val downloadedImages = tmpDir.listFiles().orEmpty().filterNot { it.name!!.endsWith(".tmp") }
-
-        download.status = if (downloadedImages.size == download.pages!!.size) {
-            Download.DOWNLOADED
-        } else {
-            Download.ERROR
-        }
-
-        // Only rename the directory if it's downloaded.
-        if (download.status == Download.DOWNLOADED) {
-            tmpDir.renameTo(dirname)
-            cache.addChapter(dirname, mangaDir, download.manga)
-        }
-    }
-
-    /**
-     * Completes a download. This method is called in the main thread.
-     */
-    private fun completeDownload(download: Download) {
-        // Delete successful downloads from queue
-        if (download.status == Download.DOWNLOADED) {
-            // remove downloaded chapter from queue
-            queue.remove(download)
-            notifier.onProgressChange(queue)
-        }
-        if (areAllDownloadsFinished()) {
-            if (notifier.isSingleChapter && !notifier.errorThrown) {
-                notifier.onDownloadCompleted(download, queue)
-            }
-            DownloadService.stop(context)
-        }
-    }
-
-    /**
-     * Returns true if all the queued downloads are in DOWNLOADED or ERROR state.
-     */
-    private fun areAllDownloadsFinished(): Boolean {
-        return queue.none { it.status <= Download.DOWNLOADING }
-    }
-
-}

app/src/main/java/eu/kanade/tachiyomi/data/download/model/Download.java

@@ -0,0 +1,55 @@
+package eu.kanade.tachiyomi.data.download.model;
+
+import java.io.File;
+import java.util.List;
+
+import eu.kanade.tachiyomi.data.database.models.Chapter;
+import eu.kanade.tachiyomi.data.database.models.Manga;
+import eu.kanade.tachiyomi.data.source.model.Page;
+import eu.kanade.tachiyomi.data.source.online.OnlineSource;
+import rx.subjects.PublishSubject;
+
+public class Download {
+    public OnlineSource source;
+    public Manga manga;
+    public Chapter chapter;
+    public List<Page> pages;
+    public File directory;
+
+    public transient volatile int totalProgress;
+    public transient volatile int downloadedImages;
+    private transient volatile int status;
+
+    private transient PublishSubject<Download> statusSubject;
+
+    public static final int NOT_DOWNLOADED = 0;
+    public static final int QUEUE = 1;
+    public static final int DOWNLOADING = 2;
+    public static final int DOWNLOADED = 3;
+    public static final int ERROR = 4;
+
+
+    public Download(OnlineSource source, Manga manga, Chapter chapter) {
+        this.source = source;
+        this.manga = manga;
+        this.chapter = chapter;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+        notifyStatus();
+    }
+
+    public void setStatusSubject(PublishSubject<Download> subject) {
+        this.statusSubject = subject;
+    }
+
+    private void notifyStatus() {
+        if (statusSubject != null)
+            statusSubject.onNext(this);
+    }
+}

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

@@ -1,37 +0,0 @@
-package eu.kanade.tachiyomi.data.download.model
-
-import eu.kanade.tachiyomi.data.database.models.Chapter
-import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.source.model.Page
-import eu.kanade.tachiyomi.source.online.HttpSource
-import rx.subjects.PublishSubject
-
-class Download(val source: HttpSource, val manga: Manga, val chapter: Chapter) {
-
-    var pages: List<Page>? = null
-
-    @Volatile @Transient var totalProgress: Int = 0
-
-    @Volatile @Transient var downloadedImages: Int = 0
-
-    @Volatile @Transient var status: Int = 0
-        set(status) {
-            field = status
-            statusSubject?.onNext(this)
-        }
-
-    @Transient private var statusSubject: PublishSubject<Download>? = null
-
-    fun setStatusSubject(subject: PublishSubject<Download>?) {
-        statusSubject = subject
-    }
-
-    companion object {
-
-        const val NOT_DOWNLOADED = 0
-        const val QUEUE = 1
-        const val DOWNLOADING = 2
-        const val DOWNLOADED = 3
-        const val ERROR = 4
-    }
-}

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

@@ -1,62 +1,34 @@
 package eu.kanade.tachiyomi.data.download.model
 
-import com.jakewharton.rxrelay.PublishRelay
 import eu.kanade.tachiyomi.data.database.models.Chapter
-import eu.kanade.tachiyomi.data.download.DownloadStore
-import eu.kanade.tachiyomi.source.model.Page
+import eu.kanade.tachiyomi.data.source.model.Page
 import rx.Observable
 import rx.subjects.PublishSubject
 import java.util.concurrent.CopyOnWriteArrayList
 
-class DownloadQueue(
-        private val store: DownloadStore,
-        private val queue: MutableList<Download> = CopyOnWriteArrayList<Download>())
-: List<Download> by queue {
+class DownloadQueue : CopyOnWriteArrayList<Download>() {
 
     private val statusSubject = PublishSubject.create<Download>()
 
-    private val updatedRelay = PublishRelay.create<Unit>()
-
-    fun addAll(downloads: List<Download>) {
-        downloads.forEach { download ->
-            download.setStatusSubject(statusSubject)
-            download.status = Download.QUEUE
-        }
-        queue.addAll(downloads)
-        store.addAll(downloads)
-        updatedRelay.call(Unit)
+    override fun add(download: Download): Boolean {
+        download.setStatusSubject(statusSubject)
+        download.status = Download.QUEUE
+        return super.add(download)
     }
 
-    fun remove(download: Download) {
-        val removed = queue.remove(download)
-        store.remove(download)
+    fun del(download: Download) {
+        super.remove(download)
         download.setStatusSubject(null)
-        if (removed) {
-            updatedRelay.call(Unit)
-        }
     }
 
-    fun remove(chapter: Chapter) {
-        find { it.chapter.id == chapter.id }?.let { remove(it) }
+    fun del(chapter: Chapter) {
+        find { it.chapter.id == chapter.id }?.let { del(it) }
     }
 
-    fun clear() {
-        queue.forEach { download ->
-            download.setStatusSubject(null)
-        }
-        queue.clear()
-        store.clear()
-        updatedRelay.call(Unit)
-    }
-
-    fun getActiveDownloads(): Observable<Download> =
+    fun getActiveDownloads() =
         Observable.from(this).filter { download -> download.status == Download.DOWNLOADING }
 
-    fun getStatusObservable(): Observable<Download> = statusSubject.onBackpressureBuffer()
-
-    fun getUpdatedObservable(): Observable<List<Download>> = updatedRelay.onBackpressureBuffer()
-            .startWith(Unit)
-            .map { this }
+    fun getStatusObservable() = statusSubject.onBackpressureBuffer()
 
     fun getProgressObservable(): Observable<Download> {
         return statusSubject.onBackpressureBuffer()
@@ -66,7 +38,6 @@ class DownloadQueue(
                         val pageStatusSubject = PublishSubject.create<Int>()
                         setPagesSubject(download.pages, pageStatusSubject)
                         return@flatMap pageStatusSubject
-                                .onBackpressureBuffer()
                                 .filter { it == Page.READY }
                                 .map { download }
 

app/src/main/java/eu/kanade/tachiyomi/data/glide/AppGlideModule.kt

@@ -0,0 +1,34 @@
+package eu.kanade.tachiyomi.data.glide
+
+import android.content.Context
+import com.bumptech.glide.Glide
+import com.bumptech.glide.GlideBuilder
+import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader
+import com.bumptech.glide.load.engine.cache.InternalCacheDiskCacheFactory
+import com.bumptech.glide.load.model.GlideUrl
+import com.bumptech.glide.module.GlideModule
+import eu.kanade.tachiyomi.App
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.network.NetworkHelper
+import java.io.InputStream
+import javax.inject.Inject
+
+/**
+ * Class used to update Glide module settings
+ */
+class AppGlideModule : GlideModule {
+
+    @Inject lateinit var networkHelper: NetworkHelper
+
+    override fun applyOptions(context: Context, builder: GlideBuilder) {
+        // Set the cache size of Glide to 15 MiB
+        builder.setDiskCache(InternalCacheDiskCacheFactory(context, 15 * 1024 * 1024))
+    }
+
+    override fun registerComponents(context: Context, glide: Glide) {
+        App.get(context).component.inject(this)
+        glide.register(GlideUrl::class.java, InputStream::class.java,
+                OkHttpUrlLoader.Factory(networkHelper.client))
+        glide.register(Manga::class.java, InputStream::class.java, MangaModelLoader.Factory())
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/data/glide/FileFetcher.kt

@@ -1,51 +0,0 @@
-package eu.kanade.tachiyomi.data.glide
-
-import android.content.ContentValues.TAG
-import android.util.Log
-import com.bumptech.glide.Priority
-import com.bumptech.glide.load.DataSource
-import com.bumptech.glide.load.data.DataFetcher
-import java.io.*
-
-open class FileFetcher(private val file: File) : DataFetcher<InputStream> {
-
-    private var data: InputStream? = null
-
-    override fun loadData(priority: Priority, callback: DataFetcher.DataCallback<in InputStream>) {
-        loadFromFile(callback)
-    }
-
-    protected fun loadFromFile(callback: DataFetcher.DataCallback<in InputStream>) {
-        try {
-            data = FileInputStream(file)
-        } catch (e: FileNotFoundException) {
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Log.d(TAG, "Failed to open file", e)
-            }
-            callback.onLoadFailed(e)
-            return
-        }
-
-        callback.onDataReady(data)
-    }
-
-    override fun cleanup() {
-        try {
-            data?.close()
-        } catch (e: IOException) {
-            // Ignored.
-        }
-    }
-
-    override fun cancel() {
-        // Do nothing.
-    }
-
-    override fun getDataClass(): Class<InputStream> {
-        return InputStream::class.java
-    }
-
-    override fun getDataSource(): DataSource {
-        return DataSource.LOCAL
-    }
-}

app/src/main/java/eu/kanade/tachiyomi/data/glide/LibraryMangaUrlFetcher.kt

@@ -1,72 +0,0 @@
-package eu.kanade.tachiyomi.data.glide
-
-import com.bumptech.glide.Priority
-import com.bumptech.glide.load.data.DataFetcher
-import eu.kanade.tachiyomi.data.database.models.Manga
-import java.io.File
-import java.io.FileNotFoundException
-import java.io.InputStream
-
-/**
- * A [DataFetcher] for loading a cover of a library manga.
- * It tries to load the cover from our custom cache, and if it's not found, it fallbacks to network
- * and copies the result to the cache.
- *
- * @param networkFetcher the network fetcher for this cover.
- * @param manga the manga of the cover to load.
- * @param file the file where this cover should be. It may exists or not.
- */
-class LibraryMangaUrlFetcher(private val networkFetcher: DataFetcher<InputStream>,
-                             private val manga: Manga,
-                             private val file: File)
-: FileFetcher(file) {
-
-    override fun loadData(priority: Priority, callback: DataFetcher.DataCallback<in InputStream>) {
-        if (!file.exists()) {
-            networkFetcher.loadData(priority, object : DataFetcher.DataCallback<InputStream> {
-                override fun onDataReady(data: InputStream?) {
-                    if (data != null) {
-                        val tmpFile = File(file.path + ".tmp")
-                        try {
-                            // Retrieve destination stream, create parent folders if needed.
-                            val output = try {
-                                tmpFile.outputStream()
-                            } catch (e: FileNotFoundException) {
-                                tmpFile.parentFile.mkdirs()
-                                tmpFile.outputStream()
-                            }
-
-                            // Copy the file and rename to the original.
-                            data.use { output.use { data.copyTo(output) } }
-                            tmpFile.renameTo(file)
-                            loadFromFile(callback)
-                        } catch (e: Exception) {
-                            tmpFile.delete()
-                            callback.onLoadFailed(e)
-                        }
-                    } else {
-                        callback.onLoadFailed(Exception("Null data"))
-                    }
-                }
-
-                override fun onLoadFailed(e: Exception) {
-                    callback.onLoadFailed(e)
-                }
-
-            })
-        } else {
-            loadFromFile(callback)
-        }
-    }
-
-    override fun cleanup() {
-        super.cleanup()
-        networkFetcher.cleanup()
-    }
-
-    override fun cancel() {
-        super.cancel()
-        networkFetcher.cancel()
-    }
-
-}

app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaDataFetcher.kt

@@ -0,0 +1,67 @@
+package eu.kanade.tachiyomi.data.glide
+
+import com.bumptech.glide.Priority
+import com.bumptech.glide.load.data.DataFetcher
+import eu.kanade.tachiyomi.data.database.models.Manga
+import java.io.File
+import java.io.FileInputStream
+import java.io.InputStream
+
+/**
+ * A [DataFetcher] for loading a cover of a manga depending on its favorite status.
+ * If the manga is favorite, it tries to load the cover from our cache, and if it's not found, it
+ * fallbacks to network and copies it to the cache.
+ * If the manga is not favorite, it tries to delete the cover from our cache and always fallback
+ * to network for fetching.
+ *
+ * @param networkFetcher the network fetcher for this cover.
+ * @param file the file where this cover should be. It may exists or not.
+ * @param manga the manga of the cover to load.
+ */
+class MangaDataFetcher(private val networkFetcher: DataFetcher<InputStream>,
+                       private val file: File,
+                       private val manga: Manga)
+: DataFetcher<InputStream> {
+
+    @Throws(Exception::class)
+    override fun loadData(priority: Priority): InputStream? {
+        if (manga.favorite) {
+            if (!file.exists()) {
+                file.parentFile.mkdirs()
+                networkFetcher.loadData(priority)?.let {
+                    it.use { input ->
+                        file.outputStream().use { output ->
+                            input.copyTo(output)
+                        }
+                    }
+                }
+            }
+            return FileInputStream(file)
+        } else {
+            if (file.exists()) {
+                file.delete()
+            }
+            return networkFetcher.loadData(priority)
+        }
+    }
+
+    /**
+     * Returns the id for this manga's cover.
+     *
+     * Appending the file's modified date to the url, we can force Glide to skip its memory and disk
+     * lookup step and fetch from our custom cache. This allows us to invalidate Glide's cache when
+     * the file has changed. If the file doesn't exist it will append a 0.
+     */
+    override fun getId(): String {
+        return manga.thumbnail_url + file.lastModified()
+    }
+
+    override fun cancel() {
+        networkFetcher.cancel()
+    }
+
+    override fun cleanup() {
+        networkFetcher.cleanup()
+    }
+
+}

app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaModelLoader.kt

@@ -1,24 +1,22 @@
 package eu.kanade.tachiyomi.data.glide
 
-import android.util.LruCache
-import com.bumptech.glide.integration.okhttp3.OkHttpStreamFetcher
-import com.bumptech.glide.load.Options
+import android.content.Context
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.data.DataFetcher
 import com.bumptech.glide.load.model.*
+import com.bumptech.glide.load.model.stream.StreamModelLoader
+import eu.kanade.tachiyomi.App
 import eu.kanade.tachiyomi.data.cache.CoverCache
 import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.network.NetworkHelper
-import eu.kanade.tachiyomi.source.SourceManager
-import eu.kanade.tachiyomi.source.online.HttpSource
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-import uy.kohesive.injekt.injectLazy
+import eu.kanade.tachiyomi.data.source.SourceManager
+import eu.kanade.tachiyomi.data.source.online.OnlineSource
 import java.io.File
 import java.io.InputStream
-
+import javax.inject.Inject
 
 /**
  * A class for loading a cover associated with a [Manga] that can be present in our own cache.
- * Coupled with [LibraryMangaUrlFetcher], this class allows to implement the following flow:
+ * Coupled with [MangaDataFetcher], this class allows to implement the following flow:
  *
  * - Check in RAM LRU.
  * - Check in disk LRU.
@@ -27,90 +25,78 @@ import java.io.InputStream
  *
  * @param context the application context.
  */
-class MangaModelLoader : ModelLoader<Manga, InputStream> {
+class MangaModelLoader(context: Context) : StreamModelLoader<Manga> {
 
     /**
      * Cover cache where persistent covers are stored.
      */
-    private val coverCache: CoverCache by injectLazy()
+    @Inject lateinit var coverCache: CoverCache
 
     /**
      * Source manager.
      */
-    private val sourceManager: SourceManager by injectLazy()
+    @Inject lateinit var sourceManager: SourceManager
 
     /**
-     * Default network client.
+     * Base network loader.
      */
-    private val defaultClient = Injekt.get<NetworkHelper>().client
+    private val baseLoader = Glide.buildModelLoader(GlideUrl::class.java,
+            InputStream::class.java, context)
 
     /**
      * LRU cache whose key is the thumbnail url of the manga, and the value contains the request url
      * and the file where it should be stored in case the manga is a favorite.
      */
-    private val lruCache = LruCache<GlideUrl, File>(100)
+    private val modelCache = ModelCache<String, Pair<GlideUrl, File>>(100)
 
     /**
      * Map where request headers are stored for a source.
      */
-    private val cachedHeaders = hashMapOf<Long, LazyHeaders>()
+    private val cachedHeaders = hashMapOf<Int, LazyHeaders>()
+
+    init {
+        App.get(context).component.inject(this)
+    }
 
     /**
      * Factory class for creating [MangaModelLoader] instances.
      */
     class Factory : ModelLoaderFactory<Manga, InputStream> {
 
-        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<Manga, InputStream> {
-            return MangaModelLoader()
-        }
+        override fun build(context: Context, factories: GenericLoaderFactory)
+                = MangaModelLoader(context)
 
         override fun teardown() {}
     }
 
-    override fun handles(model: Manga): Boolean {
-        return true
-    }
-
     /**
-     * Returns a fetcher for the given manga or null if the url is empty.
+     * Returns a [MangaDataFetcher] for the given manga or null if the url is empty.
      *
      * @param manga the model.
      * @param width the width of the view where the resource will be loaded.
      * @param height the height of the view where the resource will be loaded.
      */
-    override fun buildLoadData(manga: Manga, width: Int, height: Int,
-                               options: Options?): ModelLoader.LoadData<InputStream>? {
+    override fun getResourceFetcher(manga: Manga,
+                                    width: Int,
+                                    height: Int): DataFetcher<InputStream>? {
         // Check thumbnail is not null or empty
         val url = manga.thumbnail_url
-        if (url == null || url.isEmpty()) {
+        if (url.isNullOrEmpty()) {
             return null
         }
 
-        if (url.startsWith("http")) {
-            val source = sourceManager.get(manga.source) as? HttpSource
-            val glideUrl = GlideUrl(url, getHeaders(manga, source))
-
-            // Get the resource fetcher for this request url.
-            val networkFetcher = OkHttpStreamFetcher(source?.client ?: defaultClient, glideUrl)
-
-            if (!manga.favorite) {
-                return ModelLoader.LoadData(glideUrl, networkFetcher)
+        // Obtain the request url and the file for this url from the LRU cache, or calculate it
+        // and add them to the cache.
+        val (glideUrl, file) = modelCache.get(url, width, height) ?:
+            Pair(GlideUrl(url, getHeaders(manga)), coverCache.getCoverFile(url)).apply {
+                modelCache.put(url, width, height, this)
             }
 
-            // Obtain the file for this url from the LRU cache, or retrieve and add it to the cache.
-            val file = lruCache.getOrPut(glideUrl) { coverCache.getCoverFile(url) }
+        // Get the network fetcher for this request url.
+        val networkFetcher = baseLoader.getResourceFetcher(glideUrl, width, height)
 
-            val libraryFetcher = LibraryMangaUrlFetcher(networkFetcher, manga, file)
-
-            // Return an instance of the fetcher providing the needed elements.
-            return ModelLoader.LoadData(MangaSignature(manga, file), libraryFetcher)
-        } else {
-            // Get the file from the url, removing the scheme if present.
-            val file = File(url.substringAfter("file://"))
-
-            // Return an instance of the fetcher providing the needed elements.
-            return ModelLoader.LoadData(MangaSignature(manga, file), FileFetcher(file))
-        }
+        // Return an instance of our fetcher providing the needed elements.
+        return MangaDataFetcher(networkFetcher, file, manga)
     }
 
     /**
@@ -118,13 +104,11 @@ class MangaModelLoader : ModelLoader<Manga, InputStream> {
      *
      * @param manga the model.
      */
-    fun getHeaders(manga: Manga, source: HttpSource?): Headers {
-        if (source == null) return LazyHeaders.DEFAULT
-
+    fun getHeaders(manga: Manga): Headers {
+        val source = sourceManager.get(manga.source) as? OnlineSource ?: return LazyHeaders.DEFAULT
         return cachedHeaders.getOrPut(manga.source) {
             LazyHeaders.Builder().apply {
-                val nullStr: String? = null
-                setHeader("User-Agent", nullStr)
+                setHeader("User-Agent", null as? String)
                 for ((key, value) in source.headers.toMultimap()) {
                     addHeader(key, value[0])
                 }
@@ -132,15 +116,4 @@ class MangaModelLoader : ModelLoader<Manga, InputStream> {
         }
     }
 
-    private inline fun <K, V> LruCache<K, V>.getOrPut(key: K, defaultValue: () -> V): V {
-        val value = get(key)
-        return if (value == null) {
-            val answer = defaultValue()
-            put(key, answer)
-            answer
-        } else {
-            value
-        }
-    }
-
 }

app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaSignature.kt

@@ -1,27 +0,0 @@
-package eu.kanade.tachiyomi.data.glide
-
-import com.bumptech.glide.load.Key
-import eu.kanade.tachiyomi.data.database.models.Manga
-import java.io.File
-import java.security.MessageDigest
-
-class MangaSignature(manga: Manga, file: File) : Key {
-
-    private val key = manga.thumbnail_url + file.lastModified()
-
-    override fun equals(other: Any?): Boolean {
-        return if (other is MangaSignature) {
-            key == other.key
-        } else {
-            false
-        }
-    }
-
-    override fun hashCode(): Int {
-        return key.hashCode()
-    }
-
-    override fun updateDiskCacheKey(md: MessageDigest) {
-        md.update(key.toByteArray(Key.CHARSET))
-    }
-}

app/src/main/java/eu/kanade/tachiyomi/data/glide/TachiGlideModule.kt

@@ -1,41 +0,0 @@
-package eu.kanade.tachiyomi.data.glide
-
-import android.content.Context
-import android.graphics.drawable.Drawable
-import com.bumptech.glide.Glide
-import com.bumptech.glide.GlideBuilder
-import com.bumptech.glide.Registry
-import com.bumptech.glide.annotation.GlideModule
-import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader
-import com.bumptech.glide.load.DecodeFormat
-import com.bumptech.glide.load.engine.cache.InternalCacheDiskCacheFactory
-import com.bumptech.glide.load.model.GlideUrl
-import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
-import com.bumptech.glide.module.AppGlideModule
-import com.bumptech.glide.request.RequestOptions
-import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.network.NetworkHelper
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-import java.io.InputStream
-
-/**
- * Class used to update Glide module settings
- */
-@GlideModule
-class TachiGlideModule : AppGlideModule() {
-
-    override fun applyOptions(context: Context, builder: GlideBuilder) {
-        builder.setDiskCache(InternalCacheDiskCacheFactory(context, 50 * 1024 * 1024))
-        builder.setDefaultRequestOptions(RequestOptions().format(DecodeFormat.PREFER_RGB_565))
-        builder.setDefaultTransitionOptions(Drawable::class.java,
-                DrawableTransitionOptions.withCrossFade())
-    }
-
-    override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
-        val networkFactory = OkHttpUrlLoader.Factory(Injekt.get<NetworkHelper>().client)
-
-        registry.replace(GlideUrl::class.java, InputStream::class.java, networkFactory)
-        registry.append(Manga::class.java, InputStream::class.java, MangaModelLoader.Factory())
-    }
-}

app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateAlarm.kt

@@ -0,0 +1,82 @@
+package eu.kanade.tachiyomi.data.library
+
+import android.app.AlarmManager
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.os.SystemClock
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.util.alarmManager
+
+/**
+ * This class is used to update the library by firing an alarm after a specified time.
+ * It has a receiver reacting to system's boot and the intent fired by this alarm.
+ * See [onReceive] for more information.
+ */
+class LibraryUpdateAlarm : BroadcastReceiver() {
+
+    companion object {
+        const val LIBRARY_UPDATE_ACTION = "eu.kanade.UPDATE_LIBRARY"
+
+        /**
+         * Sets the alarm to run the intent that updates the library.
+         * @param context the application context.
+         * @param intervalInHours the time in hours when it will be executed. Defaults to the
+         * value stored in preferences.
+         */
+        @JvmStatic
+        @JvmOverloads
+        fun startAlarm(context: Context,
+                       intervalInHours: Int = PreferencesHelper.getLibraryUpdateInterval(context)) {
+            // Stop previous running alarms if needed, and do not restart it if the interval is 0.
+            stopAlarm(context)
+            if (intervalInHours == 0)
+                return
+
+            // Get the time the alarm should fire the event to update.
+            val intervalInMillis = intervalInHours * 60 * 60 * 1000
+            val nextRun = SystemClock.elapsedRealtime() + intervalInMillis
+
+            // Start the alarm.
+            val pendingIntent = getPendingIntent(context)
+            context.alarmManager.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP,
+                    nextRun, intervalInMillis.toLong(), pendingIntent)
+        }
+
+        /**
+         * Stops the alarm if it's running.
+         * @param context the application context.
+         */
+        fun stopAlarm(context: Context) {
+            val pendingIntent = getPendingIntent(context)
+            context.alarmManager.cancel(pendingIntent)
+        }
+
+        /**
+         * Get the intent the alarm should run when it's fired.
+         * @param context the application context.
+         * @return the intent that will run when the alarm is fired.
+         */
+        private fun getPendingIntent(context: Context): PendingIntent {
+            val intent = Intent(context, LibraryUpdateAlarm::class.java)
+            intent.action = LIBRARY_UPDATE_ACTION
+            return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+        }
+    }
+
+    /**
+     * Handle the intents received by this [BroadcastReceiver].
+     * @param context the application context.
+     * @param intent the intent to process.
+     */
+    override fun onReceive(context: Context, intent: Intent) {
+        when (intent.action) {
+            // Start the alarm when the system is booted.
+            Intent.ACTION_BOOT_COMPLETED -> startAlarm(context)
+            // Update the library when the alarm fires an event.
+            LIBRARY_UPDATE_ACTION -> LibraryUpdateService.start(context)
+        }
+    }
+
+}

app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt

@@ -1,47 +0,0 @@
-package eu.kanade.tachiyomi.data.library
-
-import com.evernote.android.job.Job
-import com.evernote.android.job.JobManager
-import com.evernote.android.job.JobRequest
-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
-
-class LibraryUpdateJob : Job() {
-
-    override fun onRunJob(params: Params): Result {
-        LibraryUpdateService.start(context)
-        return Job.Result.SUCCESS
-    }
-
-    companion object {
-        const val TAG = "LibraryUpdate"
-
-        fun setupTask(prefInterval: Int? = null) {
-            val preferences = Injekt.get<PreferencesHelper>()
-            val interval = prefInterval ?: preferences.libraryUpdateInterval().getOrDefault()
-            if (interval > 0) {
-                val restrictions = preferences.libraryUpdateRestriction()
-                val acRestriction = "ac" in restrictions
-                val wifiRestriction = if ("wifi" in restrictions)
-                    JobRequest.NetworkType.UNMETERED
-                else
-                    JobRequest.NetworkType.CONNECTED
-
-                JobRequest.Builder(TAG)
-                        .setPeriodic(interval * 60 * 60 * 1000L, 10 * 60 * 1000)
-                        .setRequiredNetworkType(wifiRestriction)
-                        .setRequiresCharging(acRestriction)
-                        .setRequirementsEnforced(true)
-                        .setUpdateCurrent(true)
-                        .build()
-                        .schedule()
-            }
-        }
-
-        fun cancelTask() {
-            JobManager.instance().cancelAllForTag(TAG)
-        }
-    }
-}

app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt

@@ -1,42 +1,32 @@
 package eu.kanade.tachiyomi.data.library
 
-import android.app.Notification
 import android.app.PendingIntent
 import android.app.Service
+import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.graphics.BitmapFactory
-import android.os.Build
 import android.os.IBinder
 import android.os.PowerManager
 import android.support.v4.app.NotificationCompat
+import com.github.pwittchen.reactivenetwork.library.ConnectivityStatus
+import com.github.pwittchen.reactivenetwork.library.ReactiveNetwork
+import eu.kanade.tachiyomi.App
+import eu.kanade.tachiyomi.Constants
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.Category
-import eu.kanade.tachiyomi.data.database.models.Chapter
-import eu.kanade.tachiyomi.data.database.models.LibraryManga
 import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.download.DownloadManager
-import eu.kanade.tachiyomi.data.download.DownloadService
-import eu.kanade.tachiyomi.data.library.LibraryUpdateService.Companion.start
-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.data.preference.getOrDefault
-import eu.kanade.tachiyomi.data.track.TrackManager
-import eu.kanade.tachiyomi.source.SourceManager
-import eu.kanade.tachiyomi.source.model.SManga
-import eu.kanade.tachiyomi.source.online.HttpSource
+import eu.kanade.tachiyomi.data.source.SourceManager
+import eu.kanade.tachiyomi.data.source.online.OnlineSource
 import eu.kanade.tachiyomi.ui.main.MainActivity
 import eu.kanade.tachiyomi.util.*
 import rx.Observable
 import rx.Subscription
 import rx.schedulers.Schedulers
-import timber.log.Timber
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import java.util.*
 import java.util.concurrent.atomic.AtomicInteger
+import javax.inject.Inject
 
 /**
  * This class will take care of updating the chapters of the manga from the library. It can be
@@ -46,13 +36,22 @@ import java.util.concurrent.atomic.AtomicInteger
  * progress of the update, and if case of an unexpected error, this service will be silently
  * destroyed.
  */
-class LibraryUpdateService(
-        val db: DatabaseHelper = Injekt.get(),
-        val sourceManager: SourceManager = Injekt.get(),
-        val preferences: PreferencesHelper = Injekt.get(),
-        val downloadManager: DownloadManager = Injekt.get(),
-        val trackManager: TrackManager = Injekt.get()
-) : Service() {
+class LibraryUpdateService : Service() {
+
+    /**
+     * Database helper.
+     */
+    @Inject lateinit var db: DatabaseHelper
+
+    /**
+     * Source manager.
+     */
+    @Inject lateinit var sourceManager: SourceManager
+
+    /**
+     * Preferences.
+     */
+    @Inject lateinit var preferences: PreferencesHelper
 
     /**
      * Wake lock that will be held until the service is destroyed.
@@ -65,51 +64,22 @@ class LibraryUpdateService(
     private var subscription: Subscription? = null
 
     /**
-     * Pending intent of action that cancels the library update
+     * Id of the library update notification.
      */
-    private val cancelIntent by lazy {
-        NotificationReceiver.cancelLibraryUpdatePendingBroadcast(this)
-    }
+    private val notificationId: Int
+        get() = Constants.NOTIFICATION_LIBRARY_ID
 
-    /**
-     * Bitmap of the app for notifications.
-     */
-    private val notificationBitmap by lazy {
-        BitmapFactory.decodeResource(resources, R.mipmap.ic_launcher)
-    }
-
-    /**
-     * Cached progress notification to avoid creating a lot.
-     */
-    private val progressNotification by lazy { NotificationCompat.Builder(this, Notifications.CHANNEL_LIBRARY)
-            .setContentTitle(getString(R.string.app_name))
-            .setSmallIcon(R.drawable.ic_refresh_white_24dp_img)
-            .setLargeIcon(notificationBitmap)
-            .setOngoing(true)
-            .setOnlyAlertOnce(true)
-            .addAction(R.drawable.ic_clear_grey_24dp_img, getString(android.R.string.cancel), cancelIntent)
-    }
-
-    /**
-     * Defines what should be updated within a service execution.
-     */
-    enum class Target {
-        CHAPTERS, // Manga chapters
-        DETAILS,  // Manga metadata
-        TRACKING  // Tracking metadata
-    }
 
     companion object {
+        /**
+         * Key for manual library update.
+         */
+        const val UPDATE_IS_MANUAL = "is_manual"
 
         /**
          * Key for category to update.
          */
-        const val KEY_CATEGORY = "category"
-
-        /**
-         * Key that defines what should be updated.
-         */
-        const val KEY_TARGET = "target"
+        const val UPDATE_CATEGORY = "category"
 
         /**
          * Returns the status of the service.
@@ -118,7 +88,7 @@ class LibraryUpdateService(
          * @return true if the service is running, false otherwise.
          */
         fun isRunning(context: Context): Boolean {
-            return context.isServiceRunning(LibraryUpdateService::class.java)
+            return AndroidComponentUtil.isServiceRunning(context, LibraryUpdateService::class.java)
         }
 
         /**
@@ -126,20 +96,16 @@ class LibraryUpdateService(
          * running.
          *
          * @param context the application context.
-         * @param category a specific category to update, or null for global update.
-         * @param target defines what should be updated.
+         * @param isManual whether the update has been manually triggered.
+         * @param category a specific category to update, or null for all in the library.
          */
-        fun start(context: Context, category: Category? = null, target: Target = Target.CHAPTERS) {
+        fun start(context: Context, isManual: Boolean = false, category: Category? = null) {
             if (!isRunning(context)) {
                 val intent = Intent(context, LibraryUpdateService::class.java).apply {
-                    putExtra(KEY_TARGET, target)
-                    category?.let { putExtra(KEY_CATEGORY, it.id) }
-                }
-                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-                    context.startService(intent)
-                } else {
-                    context.startForegroundService(intent)
+                    putExtra(UPDATE_IS_MANUAL, isManual)
+                    category?.let { putExtra(UPDATE_CATEGORY, it.id) }
                 }
+                context.startService(intent)
             }
         }
 
@@ -160,21 +126,18 @@ class LibraryUpdateService(
      */
     override fun onCreate() {
         super.onCreate()
-        startForeground(Notifications.ID_LIBRARY_PROGRESS, progressNotification.build())
-        wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager).newWakeLock(
-                PowerManager.PARTIAL_WAKE_LOCK, "LibraryUpdateService:WakeLock")
-        wakeLock.acquire()
+        App.get(this).component.inject(this)
+        createAndAcquireWakeLock()
     }
 
     /**
-     * Method called when the service is destroyed. It destroys subscriptions and releases the wake
-     * lock.
+     * Method called when the service is destroyed. It destroys the running subscription, resets
+     * the alarm and release the wake lock.
      */
     override fun onDestroy() {
         subscription?.unsubscribe()
-        if (wakeLock.isHeld) {
-            wakeLock.release()
-        }
+        LibraryUpdateAlarm.startAlarm(this)
+        destroyWakeLock()
         super.onDestroy()
     }
 
@@ -194,64 +157,82 @@ class LibraryUpdateService(
      * @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 target = intent.getSerializableExtra(KEY_TARGET) as? Target
-                ?: return Service.START_NOT_STICKY
+
+        // Get connectivity status
+        val connection = ReactiveNetwork().getConnectivityStatus(this, true)
+
+        // Get library update restrictions
+        val restrictions = preferences.libraryUpdateRestriction()
+
+        // Check if users updates library manual
+        val isManualUpdate = intent?.getBooleanExtra(UPDATE_IS_MANUAL, false) ?: false
+
+        // Whether to cancel the update.
+        var cancelUpdate = false
+
+        // Check if device has internet connection
+        // Check if device has wifi connection if only wifi is enabled
+        if (connection == ConnectivityStatus.OFFLINE || (!isManualUpdate && "wifi" in restrictions
+                && connection != ConnectivityStatus.WIFI_CONNECTED_HAS_INTERNET)) {
+
+            if (isManualUpdate) {
+                toast(R.string.notification_no_connection_title)
+            }
+
+            // Enable library update when connection available
+            AndroidComponentUtil.toggleComponent(this, SyncOnConnectionAvailable::class.java, true)
+            cancelUpdate = true
+        }
+        if (!isManualUpdate && "ac" in restrictions && !DeviceUtil.isPowerConnected(this)) {
+            AndroidComponentUtil.toggleComponent(this, SyncOnPowerConnected::class.java, true)
+            cancelUpdate = true
+        }
+
+        if (cancelUpdate) {
+            stopSelf(startId)
+            return Service.START_NOT_STICKY
+        }
+
+        // Stop enabled components.
+        AndroidComponentUtil.toggleComponent(this, SyncOnConnectionAvailable::class.java, false)
+        AndroidComponentUtil.toggleComponent(this, SyncOnPowerConnected::class.java, false)
 
         // Unsubscribe from any previous subscription if needed.
         subscription?.unsubscribe()
 
         // Update favorite manga. Destroy service when completed or in case of an error.
-        subscription = Observable
-                .defer {
-                    val mangaList = getMangaToUpdate(intent, target)
-
-                    // Update either chapter list or manga details.
-                    when (target) {
-                        Target.CHAPTERS -> updateChapterList(mangaList)
-                        Target.DETAILS -> updateDetails(mangaList)
-                        Target.TRACKING -> updateTrackings(mangaList)
-                    }
-                }
+        subscription = Observable.defer { updateMangaList(getMangaToUpdate(intent)) }
                 .subscribeOn(Schedulers.io())
-                .subscribe({
-                }, {
-                    Timber.e(it)
-                    stopSelf(startId)
-                }, {
+                .subscribe({},
+                        {
+                            showNotification(getString(R.string.notification_update_error), "")
+                            stopSelf(startId)
+                        }, {
                     stopSelf(startId)
                 })
 
-        return Service.START_REDELIVER_INTENT
+        return Service.START_STICKY
     }
 
     /**
      * Returns the list of manga to be updated.
      *
      * @param intent the update intent.
-     * @param target the target to update.
      * @return a list of manga to update
      */
-    fun getMangaToUpdate(intent: Intent, target: Target): List<LibraryManga> {
-        val categoryId = intent.getIntExtra(KEY_CATEGORY, -1)
+    fun getMangaToUpdate(intent: Intent?): List<Manga> {
+        val categoryId = intent?.getIntExtra(UPDATE_CATEGORY, -1) ?: -1
 
-        var listToUpdate = if (categoryId != -1)
+        var toUpdate = if (categoryId != -1)
             db.getLibraryMangas().executeAsBlocking().filter { it.category == categoryId }
-        else {
-            val categoriesToUpdate = preferences.libraryUpdateCategories().getOrDefault().map(String::toInt)
-            if (categoriesToUpdate.isNotEmpty())
-                db.getLibraryMangas().executeAsBlocking()
-                        .filter { it.category in categoriesToUpdate }
-                        .distinctBy { it.id }
-            else
-                db.getLibraryMangas().executeAsBlocking().distinctBy { it.id }
+        else
+            db.getFavoriteMangas().executeAsBlocking()
+
+        if (preferences.updateOnlyNonCompleted()) {
+            toUpdate = toUpdate.filter { it.status != Manga.COMPLETED }
         }
 
-        if (target == Target.CHAPTERS && preferences.updateOnlyNonCompleted()) {
-            listToUpdate = listToUpdate.filter { it.status != SManga.COMPLETED }
-        }
-
-        return listToUpdate
+        return toUpdate
     }
 
     /**
@@ -263,158 +244,117 @@ class LibraryUpdateService(
      * @param mangaToUpdate the list to update
      * @return an observable delivering the progress of each update.
      */
-    fun updateChapterList(mangaToUpdate: List<LibraryManga>): Observable<LibraryManga> {
+    fun updateMangaList(mangaToUpdate: List<Manga>): Observable<Manga> {
         // Initialize the variables holding the progress of the updates.
         val count = AtomicInteger(0)
-        // List containing new updates
         val newUpdates = ArrayList<Manga>()
-        // list containing failed updates
         val failedUpdates = ArrayList<Manga>()
-        // List containing categories that get included in downloads.
-        val categoriesToDownload = preferences.downloadNewCategories().getOrDefault().map(String::toInt)
-        // Boolean to determine if user wants to automatically download new chapters.
-        val downloadNew = preferences.downloadNew().getOrDefault()
-        // Boolean to determine if DownloadManager has downloads
-        var hasDownloads = false
+
+        val cancelIntent = PendingIntent.getBroadcast(this, 0,
+                Intent(this, CancelUpdateReceiver::class.java), 0)
 
         // Emit each manga and update it sequentially.
         return Observable.from(mangaToUpdate)
                 // Notify manga that will update.
-                .doOnNext { showProgressNotification(it, count.andIncrement, mangaToUpdate.size) }
+                .doOnNext { showProgressNotification(it, count.andIncrement, mangaToUpdate.size, cancelIntent) }
                 // Update the chapters of the manga.
                 .concatMap { manga ->
                     updateManga(manga)
                             // If there's any error, return empty update and continue.
                             .onErrorReturn {
                                 failedUpdates.add(manga)
-                                Pair(emptyList(), emptyList())
+                                Pair(0, 0)
                             }
                             // Filter out mangas without new chapters (or failed).
-                            .filter { pair -> pair.first.isNotEmpty() }
-                            .doOnNext {
-                                if (downloadNew && (categoriesToDownload.isEmpty() ||
-                                        manga.category in categoriesToDownload)) {
-
-                                    downloadChapters(manga, it.first)
-                                    hasDownloads = true
-                                }
-                            }
+                            .filter { pair -> pair.first > 0 }
                             // Convert to the manga that contains new chapters.
                             .map { manga }
                 }
                 // Add manga with new chapters to the list.
-                .doOnNext { manga ->
-                    // Set last updated time
-                    manga.last_update = Date().time
-                    db.updateLastUpdated(manga).executeAsBlocking()
-                    // Add to the list
-                    newUpdates.add(manga)
-                }
+                .doOnNext { newUpdates.add(it) }
                 // Notify result of the overall update.
                 .doOnCompleted {
-                    if (newUpdates.isNotEmpty()) {
-                        showResultNotification(newUpdates)
-                        if (downloadNew && hasDownloads) {
-                            DownloadService.start(this)
-                        }
+                    if (newUpdates.isEmpty()) {
+                        cancelNotification()
+                    } else {
+                        showResultNotification(newUpdates, failedUpdates)
                     }
-
-                    if (failedUpdates.isNotEmpty()) {
-                        Timber.e("Failed updating: ${failedUpdates.map { it.title }}")
-                    }
-
-                    cancelProgressNotification()
                 }
     }
 
-    fun downloadChapters(manga: Manga, chapters: List<Chapter>) {
-        // we need to get the chapters from the db so we have chapter ids
-        val mangaChapters = db.getChapters(manga).executeAsBlocking()
-        val dbChapters = chapters.map {
-            mangaChapters.find { mangaChapter -> mangaChapter.url == it.url }!!
-        }
-        downloadManager.downloadChapters(manga, dbChapters)
-    }
-
     /**
      * Updates the chapters for the given manga and adds them to the database.
      *
      * @param manga the manga to update.
      * @return a pair of the inserted and removed chapters.
      */
-    fun updateManga(manga: Manga): Observable<Pair<List<Chapter>, List<Chapter>>> {
-        val source = sourceManager.get(manga.source) as? HttpSource ?: return Observable.empty()
+    fun updateManga(manga: Manga): Observable<Pair<Int, Int>> {
+        val source = sourceManager.get(manga.source) as? OnlineSource ?: return Observable.empty()
         return source.fetchChapterList(manga)
                 .map { syncChaptersWithSource(db, it, manga, source) }
     }
 
     /**
-     * Method that updates the details of the given list of manga. It's called in a background
-     * thread, so it's safe to do heavy operations or network calls here.
+     * Returns the text that will be displayed in the notification when there are new chapters.
      *
-     * @param mangaToUpdate the list to update
-     * @return an observable delivering the progress of each update.
+     * @param updates a list of manga that contains new chapters.
+     * @param failedUpdates a list of manga that failed to update.
+     * @return the body of the notification to display.
      */
-    fun updateDetails(mangaToUpdate: List<LibraryManga>): Observable<LibraryManga> {
-        // Initialize the variables holding the progress of the updates.
-        val count = AtomicInteger(0)
-
-        // Emit each manga and update it sequentially.
-        return Observable.from(mangaToUpdate)
-                // Notify manga that will update.
-                .doOnNext { showProgressNotification(it, count.andIncrement, mangaToUpdate.size) }
-                // Update the details of the manga.
-                .concatMap { manga ->
-                    val source = sourceManager.get(manga.source) as? HttpSource
-                            ?: return@concatMap Observable.empty<LibraryManga>()
-
-                    source.fetchMangaDetails(manga)
-                            .map { networkManga ->
-                                manga.copyFrom(networkManga)
-                                db.insertManga(manga).executeAsBlocking()
-                                manga
-                            }
-                            .onErrorReturn { manga }
+    private fun getUpdatedMangasBody(updates: List<Manga>, failedUpdates: List<Manga>): String {
+        return with(StringBuilder()) {
+            if (updates.isEmpty()) {
+                append(getString(R.string.notification_no_new_chapters))
+                append("\n")
+            } else {
+                append(getString(R.string.notification_new_chapters))
+                for (manga in updates) {
+                    append("\n")
+                    append(manga.title)
                 }
-                .doOnCompleted {
-                    cancelProgressNotification()
+            }
+            if (!failedUpdates.isEmpty()) {
+                append("\n\n")
+                append(getString(R.string.notification_manga_update_failed))
+                for (manga in failedUpdates) {
+                    append("\n")
+                    append(manga.title)
                 }
+            }
+            toString()
+        }
     }
 
     /**
-     * Method that updates the metadata of the connected tracking services. It's called in a
-     * background thread, so it's safe to do heavy operations or network calls here.
+     * Creates and acquires a wake lock until the library is updated.
      */
-    private fun updateTrackings(mangaToUpdate: List<LibraryManga>): Observable<LibraryManga> {
-        // Initialize the variables holding the progress of the updates.
-        var count = 0
+    private fun createAndAcquireWakeLock() {
+        wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager).newWakeLock(
+                PowerManager.PARTIAL_WAKE_LOCK, "LibraryUpdateService:WakeLock")
+        wakeLock.acquire()
+    }
 
-        val loggedServices = trackManager.services.filter { it.isLogged }
+    /**
+     * Releases the wake lock if it's held.
+     */
+    private fun destroyWakeLock() {
+        if (wakeLock.isHeld) {
+            wakeLock.release()
+        }
+    }
 
-        // Emit each manga and update it sequentially.
-        return Observable.from(mangaToUpdate)
-                // Notify manga that will update.
-                .doOnNext { showProgressNotification(it, count++, mangaToUpdate.size) }
-                // Update the tracking details.
-                .concatMap { manga ->
-                    val tracks = db.getTracks(manga).executeAsBlocking()
-
-                    Observable.from(tracks)
-                            .concatMap { track ->
-                                val service = trackManager.getService(track.sync_id)
-                                if (service != null && service in loggedServices) {
-                                    service.refresh(track)
-                                            .doOnNext { db.insertTrack(it).executeAsBlocking() }
-                                            .onErrorReturn { track }
-                                } else {
-                                    Observable.empty()
-                                }
-                            }
-                            .map { manga }
-                }
-                .doOnCompleted {
-                    cancelProgressNotification()
-                }
+    /**
+     * Shows the notification with the given title and body.
+     *
+     * @param title the title of the notification.
+     * @param body the body of the notification.
+     */
+    private fun showNotification(title: String, body: String) {
+        notificationManager.notify(notificationId, notification() {
+            setSmallIcon(R.drawable.ic_refresh_white_24dp_img)
+            setContentTitle(title)
+            setContentText(body)
+        })
     }
 
     /**
@@ -424,67 +364,100 @@ class LibraryUpdateService(
      * @param current the current progress.
      * @param total the total progress.
      */
-    private fun showProgressNotification(manga: Manga, current: Int, total: Int) {
-        notificationManager.notify(Notifications.ID_LIBRARY_PROGRESS, progressNotification
-                .setContentTitle(manga.title)
-                .setProgress(total, current, false)
-                .build())
+    private fun showProgressNotification(manga: Manga, current: Int, total: Int, cancelIntent: PendingIntent) {
+        notificationManager.notify(notificationId, notification() {
+            setSmallIcon(R.drawable.ic_refresh_white_24dp_img)
+            setContentTitle(manga.title)
+            setProgress(total, current, false)
+            setOngoing(true)
+            addAction(R.drawable.ic_clear_grey_24dp_img, getString(android.R.string.cancel), cancelIntent)
+        })
     }
 
+
     /**
      * Shows the notification containing the result of the update done by the service.
      *
      * @param updates a list of manga with new updates.
+     * @param failed a list of manga that failed to update.
      */
-    private fun showResultNotification(updates: List<Manga>) {
-        val newUpdates = updates.map { it.title.chop(45) }.toMutableSet()
+    private fun showResultNotification(updates: List<Manga>, failed: List<Manga>) {
+        val title = getString(R.string.notification_update_completed)
+        val body = getUpdatedMangasBody(updates, failed)
 
-        // Append new chapters from a previous, existing notification
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            val previousNotification = notificationManager.activeNotifications
-                    .find { it.id == Notifications.ID_LIBRARY_RESULT }
-
-            if (previousNotification != null) {
-                val oldUpdates = previousNotification.notification.extras
-                        .getString(Notification.EXTRA_BIG_TEXT)
-
-                if (!oldUpdates.isNullOrEmpty()) {
-                    newUpdates += oldUpdates.split("\n")
-                }
-            }
-        }
-
-        notificationManager.notify(Notifications.ID_LIBRARY_RESULT, notification(Notifications.CHANNEL_LIBRARY) {
-            setSmallIcon(R.drawable.ic_book_white_24dp)
-            setLargeIcon(notificationBitmap)
-            setContentTitle(getString(R.string.notification_new_chapters))
-            if (newUpdates.size > 1) {
-                setContentText(getString(R.string.notification_new_chapters_text, newUpdates.size))
-                setStyle(NotificationCompat.BigTextStyle().bigText(newUpdates.joinToString("\n")))
-            } else {
-                setContentText(newUpdates.first())
-            }
-            priority = NotificationCompat.PRIORITY_HIGH
-            setContentIntent(getNotificationIntent())
+        notificationManager.notify(notificationId, notification() {
+            setSmallIcon(R.drawable.ic_refresh_white_24dp_img)
+            setContentTitle(title)
+            setStyle(NotificationCompat.BigTextStyle().bigText(body))
+            setContentIntent(notificationIntent)
             setAutoCancel(true)
         })
     }
 
     /**
-     * Cancels the progress notification.
+     * Cancels the notification.
      */
-    private fun cancelProgressNotification() {
-        notificationManager.cancel(Notifications.ID_LIBRARY_PROGRESS)
+    private fun cancelNotification() {
+        notificationManager.cancel(notificationId)
     }
 
     /**
-     * Returns an intent to open the main activity.
+     * Property that returns an intent to open the main activity.
      */
-    private fun getNotificationIntent(): PendingIntent {
-        val intent = Intent(this, MainActivity::class.java)
-        intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
-        intent.action = MainActivity.SHORTCUT_RECENTLY_UPDATED
-        return PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+    private val notificationIntent: PendingIntent
+        get() {
+            val intent = Intent(this, MainActivity::class.java)
+            intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
+            return PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+        }
+
+    /**
+     * Class that triggers the library to update when a connection is available. It receives
+     * network changes.
+     */
+    class SyncOnConnectionAvailable : BroadcastReceiver() {
+        /**
+         * Method called when a network change occurs.
+         *
+         * @param context the application context.
+         * @param intent the intent received.
+         */
+        override fun onReceive(context: Context, intent: Intent) {
+            if (DeviceUtil.isNetworkConnected(context)) {
+                AndroidComponentUtil.toggleComponent(context, this.javaClass, false)
+                start(context)
+            }
+        }
     }
 
+    /**
+     * Class that triggers the library to update when connected to power.
+     */
+    class SyncOnPowerConnected: BroadcastReceiver() {
+        /**
+         * Method called when AC is connected.
+         *
+         * @param context the application context.
+         * @param intent the intent received.
+         */
+        override fun onReceive(context: Context, intent: Intent) {
+            AndroidComponentUtil.toggleComponent(context, this.javaClass, false)
+            start(context)
+        }
+    }
+
+    /**
+     * Class that stops updating the library.
+     */
+    class CancelUpdateReceiver : BroadcastReceiver() {
+        /**
+         * Method called when user wants a library update.
+         * @param context the application context.
+         * @param intent the intent received.
+         */
+        override fun onReceive(context: Context, intent: Intent) {
+            LibraryUpdateService.stop(context)
+            context.notificationManager.cancel(Constants.NOTIFICATION_LIBRARY_ID)
+        }
+    }
 }