Release 0.6.3

Actually convert file uri to content uri
Disable file exposure detection to allow sharing from the local cache ¯\_(ツ)_/¯
2025-06-26 19:17:51 +02:00 · 2017-09-10 12:29:17 +02:00 · 2017-09-10 12:29:04 +02:00 · 2017-09-10 12:03:44 +02:00 · 2017-09-10 10:51:21 +02:00 · 2017-09-10 10:14:40 +02:00
550 changed files with 27192 additions and 17221 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@ -1,20 +1,27 @@
+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), 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).**
+* If it could be device-dependent, try reproducing on another device (if possible)
 * For large logs use http://pastebin.com/ (or similar)
-* 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
+* Don't group unrelated requests into one issue

 DO: https://github.com/inorichi/tachiyomi/issues/24 https://github.com/inorichi/tachiyomi/issues/71

@ -24,8 +31,3 @@ 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)
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@ -1,7 +1 @@
 **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)
--- a/.travis.yml
+++ b/.travis.yml
@ -12,11 +12,21 @@ android:
    - extra-android-support
    - extra-google-google_play_services

+  licenses:
+    - android-sdk-license-.+
+    - '.+'
+
 jdk:
  - oraclejdk8

 before_script:
-    - chmod +x gradlew
+  - chmod +x gradlew
+
+before_install:
+  - mkdir "$ANDROID_HOME/licenses" || true
+  - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
+  - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
+
 #Build, and run tests
 script: "./gradlew clean buildStandardDebug"
 sudo: false
--- a/README.md
+++ b/README.md
@ -1,10 +1,11 @@
-| 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=3600&label=stable)](https://github.com/inorichi/tachiyomi/releases) [![latest dev build](https://img.shields.io/badge/dev-latest%20build-blue.svg)](http://tachiyomi.kanade.eu/latest/app-debug.apk) | [![fdroid release](https://img.shields.io/badge/stable-F--Droid-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-dev-versions) |
+| Build | Download | F-Droid | Contribute | Contact |
+|-------|----------|---------|------------|---------|
+| [![TeamCity (simple build status)](https://img.shields.io/teamcity/https/teamcity.kanade.eu/s/tachiyomi_Build.svg)](https://teamcity.kanade.eu/project.html?projectId=tachiyomi) [![Travis](https://img.shields.io/travis/inorichi/tachiyomi.svg)](https://travis-ci.org/inorichi/tachiyomi) | [![stable release](https://img.shields.io/github/release/inorichi/tachiyomi.svg?maxAge=3600&label=stable)](https://github.com/inorichi/tachiyomi/releases) [![latest dev build](https://img.shields.io/badge/dev-latest%20build-blue.svg)](http://tachiyomi.kanade.eu/latest/app-debug.apk) | [![fdroid release](https://img.shields.io/badge/stable-f--droid.org-blue.svg)](https://f-droid.org/repository/browse/?fdid=eu.kanade.tachiyomi) [![fdroid dev](https://img.shields.io/badge/dev-wiki-blue.svg)](//github.com/inorichi/tachiyomi/wiki/FDroid-for-dev-versions) | [![Translation status](http://weblate.j2ghz.com/widgets/tachiyomi/-/svg-badge.svg)](https://github.com/inorichi/tachiyomi/wiki/Translation) | [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/WrBkRk4) |

-## [Report an issue](https://github.com/inorichi/tachiyomi/blob/master/.github/CONTRIBUTING.md)
+### **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.

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

--- a/app/build.gradle
+++ b/app/build.gradle
@ -30,7 +30,7 @@ ext {

 android {
    compileSdkVersion 25
-    buildToolsVersion "25.0.1"
+    buildToolsVersion "25.0.2"
    publishNonDefault true

    defaultConfig {
@ -38,17 +38,18 @@ android {
        minSdkVersion 16
        targetSdkVersion 25
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        versionCode 17
-        versionName "0.4.1"
+        versionCode 26
+        versionName "0.6.3"

        buildConfigField "String", "COMMIT_COUNT", "\"${getCommitCount()}\""
        buildConfigField "String", "COMMIT_SHA", "\"${getGitSha()}\""
        buildConfigField "String", "BUILD_TIME", "\"${getBuildTime()}\""
+        buildConfigField "boolean", "INCLUDE_UPDATER", "false"

        vectorDrawables.useSupportLibrary = true

        ndk {
-            abiFilters "armeabi", "armeabi-v7a", "x86"
+            abiFilters "armeabi-v7a", "arm64-v8a", "x86"
        }
    }

@ -70,9 +71,11 @@ android {
        standard {
            buildConfigField "boolean", "INCLUDE_UPDATER", "true"
        }
-
        fdroid {
-            buildConfigField "boolean", "INCLUDE_UPDATER", "false"
+        }
+        dev {
+            minSdkVersion 21
+            resConfigs "en", "xxhdpi"
        }
    }

@ -89,19 +92,17 @@ android {
        checkReleaseBuilds false
    }

-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
-
 }

 dependencies {

    // Modified dependencies
-    compile 'com.github.inorichi:subsampling-scale-image-view:f687b74'
+    compile 'com.github.inorichi:subsampling-scale-image-view:01e5385'
+    compile 'com.github.inorichi:tachimage:68cd311'
+    compile 'com.github.inorichi:junrar-android:634c1f5'

    // Android support library
-    final support_library_version = '25.0.1'
+    final support_library_version = '25.4.0'
    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"
@ -110,28 +111,30 @@ dependencies {
    compile "com.android.support:support-annotations:$support_library_version"
    compile "com.android.support:customtabs:$support_library_version"

+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+
    compile 'com.android.support:multidex:1.0.1'

    // ReactiveX
    compile 'io.reactivex:rxandroid:1.2.1'
-    compile 'io.reactivex:rxjava:1.2.3'
+    compile 'io.reactivex:rxjava:1.3.0'
    compile 'com.jakewharton.rxrelay:rxrelay:1.2.0'
    compile 'com.f2prateek.rx.preferences:rx-preferences:1.0.2'
-    compile 'com.github.pwittchen:reactivenetwork:0.6.0'
+    compile 'com.github.pwittchen:reactivenetwork:0.7.0'

    // Network client
-    compile "com.squareup.okhttp3:okhttp:3.5.0"
-    compile 'com.squareup.okio:okio:1.11.0'
+    compile "com.squareup.okhttp3:okhttp:3.8.1"
+    compile 'com.squareup.okio:okio:1.13.0'

    // REST
-    final retrofit_version = '2.1.0'
+    final retrofit_version = '2.3.0'
    compile "com.squareup.retrofit2:retrofit:$retrofit_version"
    compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
    compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"

    // JSON
-    compile 'com.google.code.gson:gson:2.8.0'
-    compile 'com.github.salomonbrys.kotson:kotson:2.4.0'
+    compile 'com.google.code.gson:gson:2.8.1'
+    compile 'com.github.salomonbrys.kotson:kotson:2.5.0'

    // YAML
    compile 'com.github.bmoliveira:snake-yaml:v1.18-android'
@ -144,49 +147,61 @@ dependencies {
    compile 'com.github.seven332:unifile:1.0.0'

    // HTML parser
-    compile 'org.jsoup:jsoup:1.10.1'
+    compile 'org.jsoup:jsoup:1.10.2'

    // Job scheduling
-    compile 'com.evernote:android-job:1.1.3'
-    compile 'com.google.android.gms:play-services-gcm:10.0.1'
+    compile 'com.evernote:android-job:1.1.11'
+    compile 'com.google.android.gms:play-services-gcm:11.0.1'

    // Changelog
    compile 'com.github.gabrielemariotti.changeloglib:changelog:2.1.0'

    // Database
-    compile "com.pushtorefresh.storio:sqlite:1.11.0"
+    compile "com.pushtorefresh.storio:sqlite:1.13.0"

    // Model View Presenter
    final nucleus_version = '3.0.0'
    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
    compile "uy.kohesive.injekt:injekt-core:1.16.1"

    // Image library
-    compile 'com.github.bumptech.glide:glide:3.7.0'
-    compile 'com.github.bumptech.glide:okhttp3-integration:1.4.0@aar'
+    compile 'com.github.bumptech.glide:glide:3.8.0'
+    compile 'com.github.bumptech.glide:okhttp3-integration:1.5.0@aar'
    // Transformations
-    compile 'jp.wasabeef:glide-transformations:2.0.1'
+    compile 'jp.wasabeef:glide-transformations:2.0.2'

    // Logging
-    compile 'com.jakewharton.timber:timber:4.3.1'
+    compile 'com.jakewharton.timber:timber:4.5.1'

    // Crash reports
-    compile 'ch.acra:acra:4.9.1'
+    compile 'ch.acra:acra:4.9.2'
+
+    // Sort
+    compile 'com.github.gpanther:java-nat-sort:natural-comparator-1.1'

    // UI
    compile 'com.dmitrymalkovich.android:material-design-dimens:1.4'
    compile 'com.github.dmytrodanylyk.android-process-button:library:1.0.4'
-    compile 'eu.davidea:flexible-adapter:4.2.0'
+    compile 'eu.davidea:flexible-adapter:5.0.0-rc1'
    compile 'com.nononsenseapps:filepicker:2.5.2'
    compile 'com.github.amulyakhare:TextDrawable:558677e'
-    compile 'com.afollestad.material-dialogs:core:0.9.1.0'
-    compile 'net.xpece.android:support-preference:1.2.0'
+    compile 'com.afollestad.material-dialogs:core:0.9.4.5'
    compile 'me.zhanghai.android.systemuihelper:library:1.0.0'
-    compile 'de.hdodenhof:circleimageview:2.1.0'
+    compile 'com.nightlynexus.viewstatepageradapter:viewstatepageradapter:1.0.4'
+
+    // Conductor
+    compile "com.bluelinelabs:conductor:2.1.4"
+    compile 'com.github.inorichi:conductor-support-preference:9e36460'
+
+    // RxBindings
+    final rxbindings_version = '1.0.1'
+    compile "com.jakewharton.rxbinding:rxbinding-kotlin:$rxbindings_version"
+    compile "com.jakewharton.rxbinding:rxbinding-appcompat-v7-kotlin:$rxbindings_version"
+    compile "com.jakewharton.rxbinding:rxbinding-support-v4-kotlin:$rxbindings_version"
+    compile "com.jakewharton.rxbinding:rxbinding-recyclerview-v7-kotlin:$rxbindings_version"

    // Tests
    testCompile 'junit:junit:4.12'
@ -202,7 +217,7 @@ dependencies {
 }

 buildscript {
-    ext.kotlin_version = '1.0.5-2'
+    ext.kotlin_version = '1.1.4'
    repositories {
        mavenCentral()
    }
@ -214,3 +229,50 @@ buildscript {
 repositories {
    mavenCentral()
 }
+
+// Workaround to force a support lib version
+configurations.all {
+    resolutionStrategy.eachDependency { details ->
+        def requested = details.requested
+        if (requested.group == 'com.android.support') {
+            if (!requested.name.startsWith("multidex")) {
+                details.useVersion '25.4.0'
+            }
+        }
+    }
+}
+
+// add support for placeholders in resource files
+//https://code.google.com/p/android/issues/detail?id=69224
+def replacePlaceholdersInFile(basePath, fileName, placeholders) {
+    def file = new File(basePath, fileName);
+
+    if (!file.exists()) {
+        logger.quiet("Unable to replace placeholders in " + file.toString() + ". File cannot be found.")
+        return;
+    }
+
+    logger.debug("Replacing placeholders in " + file.toString())
+    logger.debug("Placeholders: " + placeholders.toString())
+
+    def content = file.getText('UTF-8')
+
+    placeholders.each { entry ->
+        content = content.replaceAll("\\\$\\{${entry.key}\\}", entry.value)
+    }
+
+    file.write(content, 'UTF-8')
+}
+
+afterEvaluate {
+    android.applicationVariants.all { variant ->
+        variant.outputs.each { output ->
+            output.processResources.doFirst {
+                // prepare placeholder map from manifestPlaceholders including applicationId placeholder
+                def placeholders = variant.mergedFlavor.manifestPlaceholders + [applicationId: variant.applicationId]
+
+                replacePlaceholdersInFile(resDir, 'xml-v25/shortcuts.xml', placeholders)
+            }
+        }
+    }
+}
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@ -1,23 +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.** { *; }

-# OkHttp
-keepattributes Signature
-keepattributes *Annotation*
+# Extensions may require methods unused in the core app
+-keep class org.jsoup.** { *; }
+-keep class kotlin.** { *; }
 -keep class okhttp3.** { *; }
-keep interface okhttp3.** { *; }
+-keep class com.google.gson.** { *; }
+-keep class com.github.salomonbrys.kotson.** { *; }
+
+# OkHttp
 -dontwarn okhttp3.**
 -dontwarn okio.**
-
-# Okio
-keep class sun.misc.Unsafe { *; }
-dontwarn java.nio.file.*
-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
-dontwarn okio.**
+-dontwarn javax.annotation.**
+-dontwarn retrofit2.Platform$Java8

 # Glide specific rules #
 # https://github.com/bumptech/glide
@ -43,27 +44,26 @@
    rx.internal.util.atomic.LinkedQueueNode consumerNode;
 }

-# Retrofit 2.X
-## https://square.github.io/retrofit/ ##
+### 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 { *; }

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

@ -73,15 +73,8 @@
 # removes such information by default, so configure it to keep all of it.
 -keepattributes Signature

-# For using GSON @Expose annotation
-keepattributes *Annotation*
-
 # Gson specific classes
 -keep class sun.misc.Unsafe { *; }
-#-keep class com.google.gson.stream.** { *; }
-
-# Application classes that will be serialized/deserialized over Gson
-keep class com.google.gson.examples.android.model.** { *; }

 # Prevent proguard from stripping interface information from TypeAdapterFactory,
 # JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
@ -91,7 +84,6 @@

 # SnakeYaml
 -keep class org.yaml.snakeyaml.** { public protected private *; }
-keep class org.yaml.snakeyaml.** { public protected private *; }
 -dontwarn org.yaml.snakeyaml.**

 # Duktape
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    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="android.permission.READ_PHONE_STATE" tools:node="remove" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />

    <application
@ -18,40 +15,41 @@
        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:name=".ui.main.MainActivity"
+            android:launchMode="singleTop">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
-        </activity>
-        <activity
-            android:name=".ui.manga.MangaActivity"
-            android:parentActivityName=".ui.main.MainActivity"
-            android:exported="true">
+            <meta-data android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts"/>
        </activity>
        <activity
            android:name=".ui.reader.ReaderActivity"
-            android:theme="@style/Theme.Reader">
-        </activity>
+            android:theme="@style/Theme.Reader" />
        <activity
-            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:name=".widget.CustomLayoutPickerActivity"
            android:label="@string/app_name"
-            android:theme="@style/FilePickerTheme">
+            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>
        </activity>

        <provider
@ -61,27 +59,43 @@
            android:grantUriPermissions="true">
            <meta-data
                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths"/>
+                android:resource="@xml/provider_paths" />
        </provider>

-        <service android:name=".data.library.LibraryUpdateService"
+        <provider
+            android:name="eu.kanade.tachiyomi.util.ZipContentProvider"
+            android:authorities="${applicationId}.zip-provider"
+            android:exported="false" />
+
+        <provider
+            android:name="eu.kanade.tachiyomi.util.RarContentProvider"
+            android:authorities="${applicationId}.rar-provider"
+            android:exported="false" />
+
+        <receiver
+            android:name=".data.notification.NotificationReceiver"
+            android:exported="false" />
+
+        <service
+            android:name=".data.library.LibraryUpdateService"
+            android:exported="false" />
+
+        <service
+            android:name=".data.download.DownloadService"
+            android:exported="false" />
+
+        <service
+            android:name=".data.updater.UpdateDownloaderService"
+            android:exported="false" />
+
+        <service
+            android:name=".data.backup.BackupCreateService"
            android:exported="false"/>

-        <service android:name=".data.download.DownloadService"
+        <service
+            android:name=".data.backup.BackupRestoreService"
            android:exported="false"/>

-        <service android:name=".data.mangasync.UpdateMangaSyncService"
-            android:exported="false"/>
-
-        <service android:name=".data.updater.UpdateDownloaderService"
-            android:exported="false"/>
-
-        <receiver android:name=".data.updater.UpdateNotificationReceiver"/>
-
-        <receiver android:name=".data.library.LibraryUpdateService$CancelUpdateReceiver" />
-
-        <receiver android:name=".ui.reader.notification.ImageNotificationReceiver" />
-
        <meta-data
            android:name="eu.kanade.tachiyomi.data.glide.AppGlideModule"
            android:value="GlideModule" />
--- a/app/src/main/ic_launcher-web.png
+++ b/app/src/main/ic_launcher-web.png
--- a/app/src/main/java/eu/kanade/tachiyomi/App.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/App.kt
@ -5,6 +5,7 @@ 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.updater.UpdateCheckerJob
 import eu.kanade.tachiyomi.util.LocaleHelper
@ -20,7 +21,7 @@ import uy.kohesive.injekt.registry.default.DefaultRegistrar
        reportType = org.acra.sender.HttpSender.Type.JSON,
        httpMethod = org.acra.sender.HttpSender.Method.PUT,
        buildConfigClass = BuildConfig::class,
-        excludeMatchingSharedPreferencesKeys = arrayOf(".*username.*", ".*password.*")
+        excludeMatchingSharedPreferencesKeys = arrayOf(".*username.*", ".*password.*", ".*token.*")
 )
 open class App : Application() {

@ -34,7 +35,7 @@ open class App : Application() {
        setupAcra()
        setupJobManager()

-        LocaleHelper.updateCfg(this, baseContext.resources.configuration)
+        LocaleHelper.updateConfiguration(this, resources.configuration)
    }

    override fun attachBaseContext(base: Context) {
@ -46,7 +47,7 @@ open class App : Application() {

    override fun onConfigurationChanged(newConfig: Configuration) {
        super.onConfigurationChanged(newConfig)
-        LocaleHelper.updateCfg(this, newConfig)
+        LocaleHelper.updateConfiguration(this, newConfig, true)
    }

    protected open fun setupAcra() {
@ -58,6 +59,7 @@ open class App : Application() {
            when (tag) {
                LibraryUpdateJob.TAG -> LibraryUpdateJob()
                UpdateCheckerJob.TAG -> UpdateCheckerJob()
+                BackupCreatorJob.TAG -> BackupCreatorJob()
                else -> null
            }
        }
--- a/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
@ -6,10 +6,10 @@ 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.mangasync.MangaSyncManager
-import eu.kanade.tachiyomi.data.network.NetworkHelper
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.data.source.SourceManager
+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
@ -32,7 +32,7 @@ class AppModule(val app: Application) : InjektModule {

            addSingletonFactory { DownloadManager(app) }

-            addSingletonFactory { MangaSyncManager(app) }
+            addSingletonFactory { TrackManager(app) }

            addSingletonFactory { Gson() }

--- a/app/src/main/java/eu/kanade/tachiyomi/Constants.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/Constants.kt
@ -1,10 +1,10 @@
 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
-    const val NOTIFICATION_DOWNLOAD_IMAGE_ID = 5
-
+    const val NOTIFICATION_LIBRARY_PROGRESS_ID = 1
+    const val NOTIFICATION_LIBRARY_RESULT_ID = 2
+    const val NOTIFICATION_UPDATER_ID = 3
+    const val NOTIFICATION_DOWNLOAD_CHAPTER_ID = 4
+    const val NOTIFICATION_DOWNLOAD_CHAPTER_ERROR_ID = 5
+    const val NOTIFICATION_DOWNLOAD_IMAGE_ID = 6
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt
@ -0,0 +1,63 @@
+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
+    }
+
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupConst.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupConst.kt
@ -0,0 +1,23 @@
+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"
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreateService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreateService.kt
@ -0,0 +1,164 @@
+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 path 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
+     */
+    fun createBackupFromApp(uri: Uri, flags: Int, isJob: Boolean) {
+        // Create root object
+        val root = JsonObject()
+
+        // Create information object
+        val information = 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
+                val dir = UniFile.fromUri(this, uri)
+
+                // 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)
+            }
+        }
+    }
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreatorJob.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreatorJob.kt
@ -0,0 +1,43 @@
+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
+import java.io.File
+
+class BackupCreatorJob : Job() {
+
+    override fun onRunJob(params: Params): Result {
+        val preferences = Injekt.get<PreferencesHelper>()
+        val uri = Uri.fromFile(File(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)
+                        .setPersisted(true)
+                        .setUpdateCurrent(true)
+                        .build()
+                        .schedule()
+            }
+        }
+
+        fun cancelTask() {
+            JobManager.instance().cancelAllForTag(TAG)
+        }
+    }
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt
@ -1,203 +1,212 @@
 package eu.kanade.tachiyomi.data.backup

-import com.github.salomonbrys.kotson.fromJson
+import android.content.Context
+import com.github.salomonbrys.kotson.*
 import com.google.gson.*
-import com.google.gson.stream.JsonReader
-import eu.kanade.tachiyomi.data.backup.serializer.BooleanSerializer
-import eu.kanade.tachiyomi.data.backup.serializer.IdExclusion
-import eu.kanade.tachiyomi.data.backup.serializer.IntegerSerializer
-import eu.kanade.tachiyomi.data.backup.serializer.LongSerializer
+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 eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.*
-import java.io.*
-import java.util.*
+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

-/**
- * 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(java.lang.Integer::class.java, IntegerSerializer())
-            .registerTypeAdapter(java.lang.Boolean::class.java, BooleanSerializer())
-            .registerTypeAdapter(java.lang.Long::class.java, LongSerializer())
-            .setExclusionStrategies(IdExclusion())
-            .create()
+class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {

    /**
-     * Backups the data of the application to a file.
-     *
-     * @param file the file where the backup will be saved.
-     * @throws IOException if there's any IO error.
+     * Database.
     */
-    @Throws(IOException::class)
-    fun backupToFile(file: File) {
-        val root = backupToJson()
+    internal val databaseHelper: DatabaseHelper by injectLazy()

-        FileWriter(file).use {
-            gson.toJson(root, it)
+    /**
+     * 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
+     *
+     * @param version version of parser
+     */
+    internal fun setVersion(version: Int) {
+        this.version = version
+        parser = initParser()
+    }
+
+    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")
        }
    }

    /**
-     * Creates a JSON object containing the backup of the app's data.
+     * Backup the categories of library
     *
-     * @return the backup as a JSON object.
+     * @param root root of categories json
     */
-    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
+    internal fun backupCategories(root: JsonArray) {
+        val categories = databaseHelper.getCategories().executeAsBlocking()
+        categories.forEach { root.add(parser.toJsonTree(it)) }
    }

    /**
-     * Backups a manga and its related data (chapters, categories this manga is in, sync...).
+     * Convert a manga to Json
     *
-     * @param manga the manga to backup.
-     * @return a JSON object containing all the data of the manga.
+     * @param manga manga that gets converted
+     * @return [JsonElement] containing manga information
     */
-    private fun backupManga(manga: Manga): JsonObject {
+    internal fun backupMangaObject(manga: Manga, options: Int): JsonElement {
        // Entry for this manga
        val entry = JsonObject()

        // Backup manga fields
-        entry.add(MANGA, gson.toJsonTree(manga))
+        entry[MANGA] = parser.toJsonTree(manga)

-        // Backup all the chapters
-        val chapters = db.getChapters(manga).executeAsBlocking()
-        if (!chapters.isEmpty()) {
-            entry.add(CHAPTERS, gson.toJsonTree(chapters))
-        }
-
-        // Backup manga sync
-        val mangaSync = db.getMangasSync(manga).executeAsBlocking()
-        if (!mangaSync.isEmpty()) {
-            entry.add(MANGA_SYNC, gson.toJsonTree(mangaSync))
-        }
-
-        // 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)
+        // 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
+                }
+            }
+        }
+
+        // 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)
+            }
+        }
+
+        // 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
+                }
            }
-            entry.add(CATEGORIES, gson.toJsonTree(categoriesNames))
        }

        return entry
    }

-    /**
-     * 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)
+    fun restoreMangaNoFetch(manga: Manga, dbManga: Manga) {
+        manga.id = dbManga.id
+        manga.copyFrom(dbManga)
+        manga.favorite = true
+        insertManga(manga)
    }

    /**
-     * Restores a backup from a file.
+     * [Observable] that fetches manga information
     *
-     * @param file the file containing the backup.
-     * @throws IOException if there's any IO error.
+     * @param source source of manga
+     * @param manga manga that needs updating
+     * @return [Observable] that contains manga
     */
-    @Throws(IOException::class)
-    fun restoreFromFile(file: File) {
-        JsonReader(FileReader(file)).use {
-            val root = JsonParser().parse(it).asJsonObject
-            restoreFromJson(root)
-        }
+    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
+                }
    }

    /**
-     * Restores a backup from an input stream.
+     * [Observable] that fetches chapter information
     *
-     * @param stream the stream containing the backup.
-     * @throws IOException if there's any IO error.
+     * @param source source of manga
+     * @param manga manga that needs updating
+     * @return [Observable] that contains manga
     */
-    @Throws(IOException::class)
-    fun restoreFromStream(stream: InputStream) {
-        JsonReader(InputStreamReader(stream)).use {
-            val root = JsonParser().parse(it).asJsonObject
-            restoreFromJson(root)
-        }
+    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)
+                    }
+                }
    }

    /**
-     * Restores a backup from a JSON object. Everything executes in a single transaction so that
-     * nothing is modified if there's an error.
+     * Restore the categories from Json
     *
-     * @param root the root of the JSON.
+     * @param jsonCategories array containing categories
     */
-    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) {
+    internal fun restoreCategories(jsonCategories: JsonArray) {
        // Get categories from file and from db
-        val dbCategories = db.getCategories().executeAsBlocking()
-        val backupCategories = gson.fromJson<List<CategoryImpl>>(jsonCategories)
+        val dbCategories = databaseHelper.getCategories().executeAsBlocking()
+        val backupCategories = parser.fromJson<List<CategoryImpl>>(jsonCategories)

        // Iterate over them
-        for (category in backupCategories) {
+        backupCategories.forEach { category ->
            // Used to know if the category is already in the db
            var found = false
            for (dbCategory in dbCategories) {
@ -214,102 +223,20 @@ class BackupManager(private val db: DatabaseHelper) {
            if (!found) {
                // Let the db assign the id
                category.id = null
-                val result = db.insertCategory(category).executeAsBlocking()
+                val result = databaseHelper.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) {
-        for (backupManga in jsonMangas) {
-            // Map every entry to objects
-            val element = backupManga.asJsonObject
-            val manga = gson.fromJson(element.get(MANGA), MangaImpl::class.java)
-            val chapters = gson.fromJson<List<ChapterImpl>>(element.get(CHAPTERS) ?: JsonArray())
-            val sync = gson.fromJson<List<MangaSyncImpl>>(element.get(MANGA_SYNC) ?: JsonArray())
-            val categories = gson.fromJson<List<String>>(element.get(CATEGORIES) ?: JsonArray())
-
-            // 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.
     */
-    private fun restoreCategoriesForManga(manga: Manga, categories: List<String>) {
-        val dbCategories = db.getCategories().executeAsBlocking()
+    internal fun restoreCategoriesForManga(manga: Manga, categories: List<String>) {
+        val dbCategories = databaseHelper.getCategories().executeAsBlocking()
        val mangaCategoriesToUpdate = ArrayList<MangaCategory>()
        for (backupCategoryStr in categories) {
            for (dbCategory in dbCategories) {
@ -324,45 +251,151 @@ class BackupManager(private val db: DatabaseHelper) {
        if (!mangaCategoriesToUpdate.isEmpty()) {
            val mangaAsList = ArrayList<Manga>()
            mangaAsList.add(manga)
-            db.deleteOldMangasCategories(mangaAsList).executeAsBlocking()
-            db.insertMangasCategories(mangaCategoriesToUpdate).executeAsBlocking()
+            databaseHelper.deleteOldMangasCategories(mangaAsList).executeAsBlocking()
+            databaseHelper.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 sync the sync to restore.
+     * @param tracks the track list to restore.
     */
-    private fun restoreSyncForManga(manga: Manga, sync: List<MangaSync>) {
+    internal fun restoreTrackForManga(manga: Manga, tracks: List<Track>) {
        // Fix foreign keys with the current manga id
-        for (mangaSync in sync) {
-            mangaSync.manga_id = manga.id!!
-        }
+        tracks.map { it.manga_id = manga.id!! }

-        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) {
-                // 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 {
+        // 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
-                backupSync.id = null
-                syncToUpdate.add(backupSync)
+                track.id = null
+                trackToUpdate.add(track)
            }
        }
-
        // Update database
-        if (!syncToUpdate.isEmpty()) {
-            db.insertMangasSync(syncToUpdate).executeAsBlocking()
+        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)
+            if (pos != -1) {
+                val dbChapter = dbChapters[pos]
+                chapter.id = dbChapter.id
+                chapter.copyFrom(dbChapter)
+                break
+            }
+        }
+        // Filter the chapters that couldn't be found.
+        chapters.filter { it.id != null }
+        chapters.map { it.manga_id = manga.id }
+
+        insertChapters(chapters)
+        return true
+    }
+
+    /**
+     * Returns manga
+     *
+     * @return [Manga], null if not found
+     */
+    internal fun getMangaFromDatabase(manga: Manga): Manga? {
+        return databaseHelper.getManga(manga.url, manga.source).executeAsBlocking()
+    }
+
+    /**
+     * 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()
+    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
@ -0,0 +1,406 @@
+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()
+
+        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)
+        }
+
+        return Observable.from(mangasJson)
+                .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 { manga ->
+                    chapterFetchObservable(source, manga, chapters)
+                            // Convert to the manga that contains new chapters.
+                            .map { manga }
+                }
+                .doOnNext {
+                    // Restore categories
+                    backupManager.restoreCategoriesForManga(it, categories)
+
+                    // Restore history
+                    backupManager.restoreHistoryForManga(history)
+
+                    // Restore tracking
+                    backupManager.restoreTrackForManga(it, tracks)
+                }
+                .doOnCompleted {
+                    restoreProgress += 1
+                    showRestoreProgress(restoreProgress, restoreAmount, manga.title, errors.size)
+                }
+    }
+
+    private fun mangaNoFetchObservable(source: Source, backupManga: Manga, chapters: List<Chapter>,
+                                       categories: List<String>, history: List<DHistory>,
+                                       tracks: List<Track>): Observable<Manga> {
+
+        return Observable.just(backupManga)
+                .flatMap { manga ->
+                    if (!backupManager.restoreChaptersForManga(manga, chapters)) {
+                        chapterFetchObservable(source, manga, chapters)
+                                .map { manga }
+                    } else {
+                        Observable.just(manga)
+                    }
+                }
+                .doOnNext {
+                    // Restore categories
+                    backupManager.restoreCategoriesForManga(it, categories)
+
+                    // Restore history
+                    backupManager.restoreHistoryForManga(history)
+
+                    // Restore tracking
+                    backupManager.restoreTrackForManga(it, tracks)
+                }
+                .doOnCompleted {
+                    restoreProgress += 1
+                    showRestoreProgress(restoreProgress, restoreAmount, backupManga.title, errors.size)
+                }
+    }
+
+    /**
+     * [Observable] that fetches chapter information
+     *
+     * @param source source of manga
+     * @param manga manga that needs updating
+     * @return [Observable] that contains manga
+     */
+    private fun chapterFetchObservable(source: Source, manga: Manga, chapters: List<Chapter>): Observable<Pair<List<Chapter>, List<Chapter>>> {
+        return backupManager.restoreChapterFetchObservable(source, manga, chapters)
+                // If there's any error, return empty update and continue.
+                .onErrorReturn {
+                    errors.add(Date() to "${manga.title} - ${it.message}")
+                    Pair(emptyList<Chapter>(), emptyList<Chapter>())
+                }
+    }
+
+
+    /**
+     * Called to update dialog in [BackupConst]
+     *
+     * @param progress restore progress
+     * @param amount total restoreAmount of manga
+     * @param title title of restored manga
+     */
+    private fun showRestoreProgress(progress: Int, amount: Int, title: String, errors: Int,
+                                    content: String = getString(R.string.dialog_restoring_backup, title.chop(15))) {
+        val intent = Intent(BackupConst.INTENT_FILTER).apply {
+            putExtra(BackupConst.EXTRA_PROGRESS, progress)
+            putExtra(BackupConst.EXTRA_AMOUNT, amount)
+            putExtra(BackupConst.EXTRA_CONTENT, content)
+            putExtra(BackupConst.EXTRA_ERRORS, errors)
+            putExtra(BackupConst.ACTION, BackupConst.ACTION_SET_PROGRESS_DIALOG)
+        }
+        sendLocalBroadcast(intent)
+    }
+
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/Backup.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/Backup.kt
@ -0,0 +1,23 @@
+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"
+    }
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/DHistory.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/DHistory.kt
@ -0,0 +1,3 @@
+package eu.kanade.tachiyomi.data.backup.models
+
+data class DHistory(val url: String,val lastRead: Long)
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/BooleanSerializer.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/BooleanSerializer.kt
@ -1,16 +0,0 @@
-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 BooleanSerializer : JsonSerializer<Boolean> {
-
-    override fun serialize(value: Boolean?, type: Type, context: JsonSerializationContext): JsonElement? {
-        if (value != null && value != false)
-            return JsonPrimitive(value)
-        return null
-    }
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/CategoryTypeAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/CategoryTypeAdapter.kt
@ -0,0 +1,31 @@
+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
+            }
+        }
+    }
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/ChapterTypeAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/ChapterTypeAdapter.kt
@ -0,0 +1,61 @@
+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
+            }
+        }
+    }
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/HistoryTypeAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/HistoryTypeAdapter.kt
@ -0,0 +1,32 @@
+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)
+            }
+        }
+    }
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/IdExclusion.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/IdExclusion.kt
@ -1,27 +0,0 @@
-package eu.kanade.tachiyomi.data.backup.serializer
-
-import com.google.gson.ExclusionStrategy
-import com.google.gson.FieldAttributes
-import eu.kanade.tachiyomi.data.database.models.CategoryImpl
-import eu.kanade.tachiyomi.data.database.models.ChapterImpl
-import eu.kanade.tachiyomi.data.database.models.MangaImpl
-import eu.kanade.tachiyomi.data.database.models.MangaSyncImpl
-
-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) {
-        MangaImpl::class.java -> mangaExclusions.contains(f.name)
-        ChapterImpl::class.java -> chapterExclusions.contains(f.name)
-        MangaSyncImpl::class.java -> syncExclusions.contains(f.name)
-        CategoryImpl::class.java -> categoryExclusions.contains(f.name)
-        else -> false
-    }
-
-    override fun shouldSkipClass(clazz: Class<*>) = false
-
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/IntegerSerializer.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/IntegerSerializer.kt
@ -1,17 +0,0 @@
-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
-    }
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/LongSerializer.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/LongSerializer.kt
@ -1,16 +0,0 @@
-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 LongSerializer : JsonSerializer<Long> {
-
-    override fun serialize(value: Long?, type: Type, context: JsonSerializationContext): JsonElement? {
-        if (value != null && value !== 0L)
-            return JsonPrimitive(value)
-        return null
-    }
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/MangaTypeAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/MangaTypeAdapter.kt
@ -0,0 +1,37 @@
+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
+            }
+        }
+    }
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/TrackTypeAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/TrackTypeAdapter.kt
@ -0,0 +1,53 @@
+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
+            }
+        }
+    }
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/cache/ChapterCache.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/cache/ChapterCache.kt
@ -5,7 +5,8 @@ import android.text.format.Formatter
 import com.github.salomonbrys.kotson.fromJson
 import com.google.gson.Gson
 import com.jakewharton.disklrucache.DiskLruCache
-import eu.kanade.tachiyomi.data.source.model.Page
+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 okhttp3.Response
@ -44,8 +45,7 @@ class ChapterCache(private val context: Context) {
    private val gson: Gson by injectLazy()

    /** Cache class used for cache management.  */
-    private val diskCache = DiskLruCache.open(
-            File(context.externalCacheDir, PARAMETER_CACHE_DIRECTORY),
+    private val diskCache = DiskLruCache.open(File(context.cacheDir, PARAMETER_CACHE_DIRECTORY),
            PARAMETER_APP_VERSION,
            PARAMETER_VALUE_COUNT,
            PARAMETER_CACHE_SIZE)
@ -81,10 +81,10 @@ class ChapterCache(private val context: Context) {

        try {
            // Remove the extension from the file to get the key of the cache
-            val key = file.substring(0, file.lastIndexOf("."))
+            val key = file.substringBeforeLast(".")
            // Remove file from cache.
            return diskCache.remove(key)
-        } catch (e: IOException) {
+        } catch (e: Exception) {
            return false
        }
    }
@ -92,13 +92,13 @@ class ChapterCache(private val context: Context) {
    /**
     * Get page list from cache.
     *
-     * @param chapterUrl the url of the chapter.
+     * @param chapter the chapter.
     * @return an observable of the list of pages.
     */
-    fun getPageListFromCache(chapterUrl: String): Observable<List<Page>> {
-        return Observable.fromCallable<List<Page>> {
+    fun getPageListFromCache(chapter: Chapter): Observable<List<Page>> {
+        return Observable.fromCallable {
            // Get the key for the chapter.
-            val key = DiskUtil.hashKeyForDisk(chapterUrl)
+            val key = DiskUtil.hashKeyForDisk(getKey(chapter))

            // Convert JSON string to list of objects. Throws an exception if snapshot is null
            diskCache.get(key).use {
@ -110,10 +110,10 @@ class ChapterCache(private val context: Context) {
    /**
     * Add page list to disk cache.
     *
-     * @param chapterUrl the url of the chapter.
+     * @param chapter the chapter.
     * @param pages list of pages.
     */
-    fun putPageListToCache(chapterUrl: String, pages: List<Page>) {
+    fun putPageListToCache(chapter: Chapter, pages: List<Page>) {
        // Convert list of pages to json string.
        val cachedValue = gson.toJson(pages)

@ -122,7 +122,7 @@ class ChapterCache(private val context: Context) {

        try {
            // Get editor from md5 key.
-            val key = DiskUtil.hashKeyForDisk(chapterUrl)
+            val key = DiskUtil.hashKeyForDisk(getKey(chapter))
            editor = diskCache.edit(key) ?: return

            // Write chapter urls to cache.
@ -186,15 +186,18 @@ class ChapterCache(private val context: Context) {
            editor = diskCache.edit(key) ?: throw IOException("Unable to edit key")

            // Get OutputStream and write image with Okio.
-            response.body().source().saveTo(editor.newOutputStream(0))
+            response.body()!!.source().saveTo(editor.newOutputStream(0))

            diskCache.flush()
            editor.commit()
        } finally {
-            response.body().close()
+            response.body()?.close()
            editor?.abortUnlessCommitted()
        }
    }

+    private fun getKey(chapter: Chapter): String {
+        return "${chapter.manga_id}${chapter.url}"
+    }
 }

--- a/app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverCache.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverCache.kt
@ -20,7 +20,7 @@ class CoverCache(private val context: Context) {
    /**
     * Cache directory used for cache management.
     */
-    private val cacheDir: File = File(context.externalCacheDir, "cover_disk_cache")
+    private val cacheDir = context.getExternalFilesDir("covers")

    /**
     * Returns the cover from cache.
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt
@ -10,13 +10,13 @@ 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, MangaSyncQueries, CategoryQueries, MangaCategoryQueries, HistoryQueries {
+: MangaQueries, ChapterQueries, TrackQueries, CategoryQueries, MangaCategoryQueries, HistoryQueries {

    override val db = DefaultStorIOSQLite.builder()
            .sqliteOpenHelper(DbOpenHelper(context))
            .addTypeMapping(Manga::class.java, MangaTypeMapping())
            .addTypeMapping(Chapter::class.java, ChapterTypeMapping())
-            .addTypeMapping(MangaSync::class.java, MangaSyncTypeMapping())
+            .addTypeMapping(Track::class.java, TrackTypeMapping())
            .addTypeMapping(Category::class.java, CategoryTypeMapping())
            .addTypeMapping(MangaCategory::class.java, MangaCategoryTypeMapping())
            .addTypeMapping(History::class.java, HistoryTypeMapping())
@ -24,4 +24,6 @@ open class DatabaseHelper(context: Context)

    inline fun inTransaction(block: () -> Unit) = db.inTransaction(block)

+    fun lowLevel() = db.lowLevel()
+
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenHelper.kt
@ -17,13 +17,13 @@ class DbOpenHelper(context: Context)
        /**
         * Version of the database.
         */
-        const val DATABASE_VERSION = 4
+        const val DATABASE_VERSION = 5
    }

    override fun onCreate(db: SQLiteDatabase) = with(db) {
        execSQL(MangaTable.createTableQuery)
        execSQL(ChapterTable.createTableQuery)
-        execSQL(MangaSyncTable.createTableQuery)
+        execSQL(TrackTable.createTableQuery)
        execSQL(CategoryTable.createTableQuery)
        execSQL(MangaCategoryTable.createTableQuery)
        execSQL(HistoryTable.createTableQuery)
@ -51,6 +51,9 @@ class DbOpenHelper(context: Context)
        if (oldVersion < 4) {
            db.execSQL(ChapterTable.bookmarkUpdateQuery)
        }
+        if (oldVersion < 5) {
+            db.execSQL(ChapterTable.addScanlator)
+        }
    }

    override fun onConfigure(db: SQLiteDatabase) {
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/ChapterTypeMapping.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/ChapterTypeMapping.kt
@ -20,6 +20,7 @@ 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
@ -48,6 +49,7 @@ class ChapterPutResolver : DefaultPutResolver<Chapter>() {
        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)
@ -64,6 +66,7 @@ class ChapterGetResolver : DefaultGetResolver<Chapter>() {
        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))
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/HistoryTypeMapping.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/HistoryTypeMapping.kt
@ -10,6 +10,7 @@ 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
@ -44,7 +45,7 @@ open class HistoryPutResolver : DefaultPutResolver<History>() {

 class HistoryGetResolver : DefaultGetResolver<History>() {

-    override fun mapFromCursor(cursor: Cursor): History = History().apply {
+    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))
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaTypeMapping.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaTypeMapping.kt
@ -69,7 +69,7 @@ open class MangaGetResolver : DefaultGetResolver<Manga>() {

    override fun mapFromCursor(cursor: Cursor): Manga = MangaImpl().apply {
        id = cursor.getLong(cursor.getColumnIndex(COL_ID))
-        source = cursor.getInt(cursor.getColumnIndex(COL_SOURCE))
+        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))
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaSyncTypeMapping.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaSyncTypeMapping.kt
@ -9,38 +9,38 @@ 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.MangaSync
-import eu.kanade.tachiyomi.data.database.models.MangaSyncImpl
-import eu.kanade.tachiyomi.data.database.tables.MangaSyncTable.COL_ID
-import eu.kanade.tachiyomi.data.database.tables.MangaSyncTable.COL_LAST_CHAPTER_READ
-import eu.kanade.tachiyomi.data.database.tables.MangaSyncTable.COL_MANGA_ID
-import eu.kanade.tachiyomi.data.database.tables.MangaSyncTable.COL_REMOTE_ID
-import eu.kanade.tachiyomi.data.database.tables.MangaSyncTable.COL_SCORE
-import eu.kanade.tachiyomi.data.database.tables.MangaSyncTable.COL_STATUS
-import eu.kanade.tachiyomi.data.database.tables.MangaSyncTable.COL_SYNC_ID
-import eu.kanade.tachiyomi.data.database.tables.MangaSyncTable.COL_TITLE
-import eu.kanade.tachiyomi.data.database.tables.MangaSyncTable.COL_TOTAL_CHAPTERS
-import eu.kanade.tachiyomi.data.database.tables.MangaSyncTable.TABLE
+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 MangaSyncTypeMapping : SQLiteTypeMapping<MangaSync>(
-        MangaSyncPutResolver(),
-        MangaSyncGetResolver(),
-        MangaSyncDeleteResolver()
+class TrackTypeMapping : SQLiteTypeMapping<Track>(
+        TrackPutResolver(),
+        TrackGetResolver(),
+        TrackDeleteResolver()
 )

-class MangaSyncPutResolver : DefaultPutResolver<MangaSync>() {
+class TrackPutResolver : DefaultPutResolver<Track>() {

-    override fun mapToInsertQuery(obj: MangaSync) = InsertQuery.builder()
+    override fun mapToInsertQuery(obj: Track) = InsertQuery.builder()
            .table(TABLE)
            .build()

-    override fun mapToUpdateQuery(obj: MangaSync) = UpdateQuery.builder()
+    override fun mapToUpdateQuery(obj: Track) = UpdateQuery.builder()
            .table(TABLE)
            .where("$COL_ID = ?")
            .whereArgs(obj.id)
            .build()

-    override fun mapToContentValues(obj: MangaSync) = ContentValues(9).apply {
+    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)
@ -53,9 +53,9 @@ class MangaSyncPutResolver : DefaultPutResolver<MangaSync>() {
    }
 }

-class MangaSyncGetResolver : DefaultGetResolver<MangaSync>() {
+class TrackGetResolver : DefaultGetResolver<Track>() {

-    override fun mapFromCursor(cursor: Cursor): MangaSync = MangaSyncImpl().apply {
+    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))
@ -68,9 +68,9 @@ class MangaSyncGetResolver : DefaultGetResolver<MangaSync>() {
    }
 }

-class MangaSyncDeleteResolver : DefaultDeleteResolver<MangaSync>() {
+class TrackDeleteResolver : DefaultDeleteResolver<Track>() {

-    override fun mapToDeleteQuery(obj: MangaSync) = DeleteQuery.builder()
+    override fun mapToDeleteQuery(obj: Track) = DeleteQuery.builder()
            .table(TABLE)
            .where("$COL_ID = ?")
            .whereArgs(obj.id)
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Chapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Chapter.kt
@ -1,17 +1,14 @@
 package eu.kanade.tachiyomi.data.database.models

+import eu.kanade.tachiyomi.source.model.SChapter
 import java.io.Serializable

-interface Chapter : Serializable {
+interface Chapter : SChapter, Serializable {

    var id: Long?

    var manga_id: Long?

-    var url: String
-
-    var name: String
-
    var read: Boolean

    var bookmark: Boolean
@ -20,10 +17,6 @@ interface Chapter : Serializable {

    var date_fetch: Long

-    var date_upload: Long
-
-    var chapter_number: Float
-
    var source_order: Int

    val isRecognizedNumber: Boolean
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/ChapterImpl.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/ChapterImpl.kt
@ -10,6 +10,8 @@ class ChapterImpl : Chapter {

    override lateinit var name: String

+    override var scanlator: String? = null
+
    override var read: Boolean = false

    override var bookmark: Boolean = false
@ -29,9 +31,7 @@ class ChapterImpl : Chapter {
        if (other == null || javaClass != other.javaClass) return false

        val chapter = other as Chapter
-
        return url == chapter.url
-
    }

    override fun hashCode(): Int {
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/History.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/History.kt
@ -5,27 +5,27 @@ import java.io.Serializable
 /**
 * Object containing the history statistics of a chapter
 */
-class History : Serializable {
+interface History : Serializable {

    /**
     * Id of history object.
     */
-    var id: Long? = null
+    var id: Long?

    /**
     * Chapter id of history object.
     */
-    var chapter_id: Long = 0
+    var chapter_id: Long

    /**
     * Last time chapter was read in time long format
     */
-    var last_read: Long = 0
+    var last_read: Long

    /**
     * Total time chapter was read - todo not yet implemented
     */
-    var time_read: Long = 0
+    var time_read: Long

    companion object {

@ -35,10 +35,8 @@ class History : Serializable {
         * @param chapter chapter object
         * @return history object
         */
-        fun create(chapter: Chapter): History {
-            val history = History()
-            history.chapter_id = chapter.id!!
-            return history
+        fun create(chapter: Chapter): History =  HistoryImpl().apply {
+            this.chapter_id = chapter.id!!
        }
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/HistoryImpl.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/HistoryImpl.kt
@ -0,0 +1,27 @@
+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
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
@ -1,35 +1,17 @@
 package eu.kanade.tachiyomi.data.database.models

-import java.io.Serializable
+import eu.kanade.tachiyomi.source.model.SManga

-interface Manga : Serializable {
+interface Manga : SManga {

    var id: Long?

-    var source: Int
-
-    var url: String
-
-    var title: String
-
-    var artist: String?
-
-    var author: String?
-
-    var description: String?
-
-    var genre: String?
-
-    var status: Int
-
-    var thumbnail_url: String?
+    var source: Long

    var favorite: Boolean

    var last_update: Long

-    var initialized: Boolean
-
    var viewer: Int

    var chapter_flags: Int
@ -38,27 +20,6 @@ interface Manga : Serializable {

    var category: Int

-    fun copyFrom(other: Manga) {
-        if (other.author != null)
-            author = other.author
-
-        if (other.artist != null)
-            artist = other.artist
-
-        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
-    }
-
    fun setChapterOrder(order: Int) {
        setFlags(order, SORT_MASK)
    }
@ -94,11 +55,6 @@ interface Manga : Serializable {

    companion object {

-        const val UNKNOWN = 0
-        const val ONGOING = 1
-        const val COMPLETED = 2
-        const val LICENSED = 3
-
        const val SORT_DESC = 0x00000000
        const val SORT_ASC = 0x00000001
        const val SORT_MASK = 0x00000001
@ -126,12 +82,13 @@ interface Manga : Serializable {
        const val DISPLAY_NUMBER = 0x00100000
        const val DISPLAY_MASK = 0x00100000

-        fun create(source: Int): Manga = MangaImpl().apply {
+        fun create(source: Long): Manga = MangaImpl().apply {
            this.source = source
        }

-        fun create(pathUrl: String, source: Int = 0): Manga = MangaImpl().apply {
+        fun create(pathUrl: String, title: String, source: Long = 0): Manga = MangaImpl().apply {
            url = pathUrl
+            this.title = title
            this.source = source
        }
    }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaChapterHistory.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaChapterHistory.kt
@ -7,4 +7,4 @@ package eu.kanade.tachiyomi.data.database.models
 * @param chapter object containing chater
 * @param history      object containing history
 */
-class MangaChapterHistory(val manga: Manga, val chapter: Chapter, val history: History)
+data class MangaChapterHistory(val manga: Manga, val chapter: Chapter, val history: History)
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaImpl.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaImpl.kt
@ -4,7 +4,7 @@ class MangaImpl : Manga {

    override var id: Long? = null

-    override var source: Int = 0
+    override var source: Long = -1

    override lateinit var url: String

--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaSync.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaSync.kt
@ -2,7 +2,7 @@ package eu.kanade.tachiyomi.data.database.models

 import java.io.Serializable

-interface MangaSync : Serializable {
+interface Track : Serializable {

    var id: Long?

@ -22,9 +22,7 @@ interface MangaSync : Serializable {

    var status: Int

-    var update: Boolean
-
-    fun copyPersonalFrom(other: MangaSync) {
+    fun copyPersonalFrom(other: Track) {
        last_chapter_read = other.last_chapter_read
        score = other.score
        status = other.status
@ -32,7 +30,7 @@ interface MangaSync : Serializable {

    companion object {

-        fun create(serviceId: Int): MangaSync = MangaSyncImpl().apply {
+        fun create(serviceId: Int): Track = TrackImpl().apply {
            sync_id = serviceId
        }
    }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaSyncImpl.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaSyncImpl.kt
@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.data.database.models

-class MangaSyncImpl : MangaSync {
+class TrackImpl : Track {

    override var id: Long? = null

@ -20,17 +20,15 @@ class MangaSyncImpl : MangaSync {

    override var status: Int = 0

-    override var update: Boolean = false
-
    override fun equals(other: Any?): Boolean {
        if (this === other) return true
        if (other == null || javaClass != other.javaClass) return false

-        val mangaSync = other as MangaSync
+        other as Track

-        if (manga_id != mangaSync.manga_id) return false
-        if (sync_id != mangaSync.sync_id) return false
-        return remote_id == mangaSync.remote_id
+        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 {
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/ChapterQueries.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/ChapterQueries.kt
@ -6,6 +6,7 @@ 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
@ -42,6 +43,16 @@ interface ChapterQueries : DbProvider {
                    .build())
            .prepare()

+    fun getChapter(url: String) = db.get()
+            .`object`(Chapter::class.java)
+            .withQuery(Query.builder()
+                    .table(ChapterTable.TABLE)
+                    .where("${ChapterTable.COL_URL} = ?")
+                    .whereArgs(url)
+                    .build())
+            .prepare()
+
+
    fun insertChapter(chapter: Chapter) = db.put().`object`(chapter).prepare()

    fun insertChapters(chapters: List<Chapter>) = db.put().objects(chapters).prepare()
@ -50,6 +61,11 @@ 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())
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/HistoryQueries.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/HistoryQueries.kt
@ -1,5 +1,6 @@
 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
@ -40,6 +41,15 @@ interface HistoryQueries : DbProvider {
                    .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
@ -59,4 +69,18 @@ interface HistoryQueries : DbProvider {
            .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()
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt
@ -8,6 +8,7 @@ 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
@ -25,7 +26,7 @@ interface MangaQueries : DbProvider {
            .listOfObjects(Manga::class.java)
            .withQuery(RawQuery.builder()
                    .query(libraryQuery)
-                    .observesTables(MangaTable.TABLE, ChapterTable.TABLE, MangaCategoryTable.TABLE)
+                    .observesTables(MangaTable.TABLE, ChapterTable.TABLE, MangaCategoryTable.TABLE, CategoryTable.TABLE)
                    .build())
            .withGetResolver(LibraryMangaGetResolver.INSTANCE)
            .prepare()
@ -40,7 +41,7 @@ interface MangaQueries : DbProvider {
                    .build())
            .prepare()

-    fun getManga(url: String, sourceId: Int) = db.get()
+    fun getManga(url: String, sourceId: Long) = db.get()
            .`object`(Manga::class.java)
            .withQuery(Query.builder()
                    .table(MangaTable.TABLE)
@ -84,6 +85,12 @@ 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()
@ -91,4 +98,7 @@ interface MangaQueries : DbProvider {
                    .observesTables(MangaTable.TABLE)
                    .build())
            .prepare()
+
+    fun getTotalChapterManga() = db.get().listOfObjects(Manga::class.java)
+            .withQuery(RawQuery.builder().query(getTotalChapterMangaQuery()).observesTables(MangaTable.TABLE).build()).prepare();
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaSyncQueries.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaSyncQueries.kt
@ -1,46 +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.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()
-
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/RawQueries.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/RawQueries.kt
@ -73,6 +73,14 @@ fun getHistoryByMangaId() = """
    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}
@ -85,6 +93,15 @@ fun getLastReadMangaQuery() = """
    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.
 */
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/TrackQueries.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/TrackQueries.kt
@ -0,0 +1,34 @@
+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()
+
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterBackupPutResolver.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterBackupPutResolver.kt
@ -0,0 +1,35 @@
+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)
+    }
+
+}
+
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/ChapterTable.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/ChapterTable.kt
@ -14,6 +14,8 @@ object ChapterTable {

    const val COL_READ = "read"

+    const val COL_SCANLATOR = "scanlator"
+
    const val COL_BOOKMARK = "bookmark"

    const val COL_DATE_FETCH = "date_fetch"
@ -32,6 +34,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,
@ -52,4 +55,7 @@ object ChapterTable {
    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"
+
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/MangaSyncTable.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/MangaSyncTable.kt
@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.data.database.tables

-object MangaSyncTable {
+object TrackTable {

    const val TABLE = "manga_sync"

--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
@ -6,8 +6,8 @@ import com.jakewharton.rxrelay.BehaviorRelay
 import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.download.model.DownloadQueue
-import eu.kanade.tachiyomi.data.source.Source
-import eu.kanade.tachiyomi.data.source.model.Page
+import eu.kanade.tachiyomi.source.Source
+import eu.kanade.tachiyomi.source.model.Page
 import rx.Observable

 /**
@ -60,10 +60,19 @@ class DownloadManager(context: Context) {
    }

    /**
-     * Empties the download queue.
+     * Tells the downloader to pause downloads.
     */
-    fun clearQueue() {
-        downloader.clearQueue()
+    fun pauseDownloads() {
+        downloader.pause()
+    }
+
+    /**
+     * 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)
    }

    /**
@ -168,5 +177,4 @@ class DownloadManager(context: Context) {
    fun deleteChapter(source: Source, manga: Manga, chapter: Chapter) {
        provider.findChapterDir(source, manga, chapter)?.delete()
    }
-
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt
@ -7,8 +7,11 @@ 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.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.
@ -33,12 +36,34 @@ 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
+        }

    /**
     * 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.
     *
@ -48,6 +73,14 @@ internal class DownloadNotifier(private val context: Context) {
        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.
@ -88,24 +121,15 @@ internal class DownloadNotifier(private val context: Context) {
     * @param queue the queue containing downloads.
     */
    private fun doOnProgressChange(download: Download?, queue: DownloadQueue) {
-        // Check if download is completed
-        if (multipleDownloadThreads) {
-            if (queue.isEmpty()) {
-                onChapterCompleted(null)
-                return
-            }
-        } else {
-            if (download != null && download.pages!!.size == download.downloadedImages) {
-                onChapterCompleted(download)
-                return
-            }
-        }
-
        // Create notification
        with(notification) {
-            // Check if icon needs refresh
+            // Check if first call.
            if (!isDownloading) {
                setSmallIcon(android.R.drawable.stat_sys_download)
+                setAutoCancel(false)
+                clearActions()
+                // Open download manager when clicked
+                setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context))
                isDownloading = true
            }

@ -121,7 +145,10 @@ internal class DownloadNotifier(private val context: Context) {
                setProgress(initialQueueSize, initialQueueSize - queue.size, false)
            } else {
                download?.let {
-                    setContentTitle(it.chapter.name.chop(30))
+                    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))
                    setContentText(context.getString(R.string.chapter_downloading_progress)
                            .format(it.downloadedImages, it.pages!!.size))
                    setProgress(it.pages!!.size, it.downloadedImages, false)
@ -133,17 +160,58 @@ internal class DownloadNotifier(private val context: Context) {
        notification.show()
    }

+    /**
+     * 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.
     *
     * @param download download object containing download information.
     */
-    private fun onChapterCompleted(download: Download?) {
+    fun onDownloadCompleted(download: Download, queue: DownloadQueue) {
+        // Check if last download
+        if (!queue.isEmpty()) {
+            return
+        }
        // Create notification.
        with(notification) {
-            setContentTitle(download?.chapter?.name ?: context.getString(R.string.app_name))
+            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))
            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)
        }

@ -165,9 +233,15 @@ internal class DownloadNotifier(private val context: Context) {
            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
    }

    /**
@ -183,11 +257,15 @@ internal class DownloadNotifier(private val context: Context) {
            setContentTitle(chapter ?: context.getString(R.string.download_notifier_downloader_title))
            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(Constants.NOTIFICATION_DOWNLOAD_CHAPTER_ERROR_ID)

        // Reset download information
+        errorThrown = true
        isDownloading = false
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt
@ -7,7 +7,7 @@ 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.data.source.Source
+import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.util.DiskUtil
 import uy.kohesive.injekt.injectLazy

--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadStore.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadStore.kt
@ -5,8 +5,8 @@ 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.data.source.SourceManager
-import eu.kanade.tachiyomi.data.source.online.OnlineSource
+import eu.kanade.tachiyomi.source.SourceManager
+import eu.kanade.tachiyomi.source.online.HttpSource
 import uy.kohesive.injekt.injectLazy

 /**
@ -93,7 +93,7 @@ class DownloadStore(context: Context) {
                val manga = cachedManga.getOrPut(mangaId) {
                    db.getManga(mangaId).executeAsBlocking()
                } ?: continue
-                val source = sourceManager.get(manga.source) as? OnlineSource ?: continue
+                val source = sourceManager.get(manga.source) as? HttpSource ?: continue
                val chapter = db.getChapter(chapterId).executeAsBlocking() ?: continue
                downloads.add(Download(source, manga, chapter))
            }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
@ -10,13 +10,12 @@ 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.source.SourceManager
-import eu.kanade.tachiyomi.data.source.model.Page
-import eu.kanade.tachiyomi.data.source.online.OnlineSource
-import eu.kanade.tachiyomi.util.DynamicConcurrentMergeOperator
-import eu.kanade.tachiyomi.util.RetryWithDelay
-import eu.kanade.tachiyomi.util.plusAssign
-import eu.kanade.tachiyomi.util.saveTo
+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 okhttp3.Response
 import rx.Observable
 import rx.android.schedulers.AndroidSchedulers
@ -25,7 +24,6 @@ import rx.subjects.BehaviorSubject
 import rx.subscriptions.CompositeSubscription
 import timber.log.Timber
 import uy.kohesive.injekt.injectLazy
-import java.net.URLConnection

 /**
 * This class is the one in charge of downloading chapters.
@ -116,6 +114,9 @@ class Downloader(private val context: Context, private val provider: DownloadPro
        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()
    }
@ -132,15 +133,42 @@ class Downloader(private val context: Context, private val provider: DownloadPro
        if (reason != null) {
            notifier.onWarning(reason)
        } else {
-            notifier.dismiss()
+            if (notifier.paused) {
+                notifier.paused = false
+                notifier.onDownloadPaused()
+            } else if (notifier.isSingleChapter && !notifier.errorThrown) {
+                notifier.isSingleChapter = false
+            } else {
+                notifier.dismiss()
+            }
        }
    }

    /**
-     * Removes everything from the queue.
+     * Pauses the downloader
     */
-    fun clearQueue() {
+    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()
    }
@ -192,7 +220,7 @@ class Downloader(private val context: Context, private val provider: DownloadPro
     * @param chapters the list of chapters to download.
     */
    fun queueChapters(manga: Manga, chapters: List<Chapter>) {
-        val source = sourceManager.get(manga.source) as? OnlineSource ?: return
+        val source = sourceManager.get(manga.source) as? HttpSource ?: return

        val chaptersToQueue = chapters
                // Avoid downloading chapters with the same name.
@ -213,6 +241,9 @@ class Downloader(private val context: Context, private val provider: DownloadPro
        // 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)
@ -251,8 +282,11 @@ class Downloader(private val context: Context, private val provider: DownloadPro

        val pageListObservable = if (download.pages == null) {
            // Pull page list from network and add them to download object
-            download.source.fetchPageListFromNetwork(download.chapter)
+            download.source.fetchPageList(download.chapter)
                    .doOnNext { pages ->
+                        if (pages.isEmpty()) {
+                            throw Exception("Page list is empty")
+                        }
                        download.pages = pages
                    }
        } else {
@ -309,7 +343,7 @@ class Downloader(private val context: Context, private val provider: DownloadPro
        tmpFile?.delete()

        // Try to find the image file.
-        val imageFile = tmpDir.listFiles()!!.find { it.name!!.startsWith("$filename.")}
+        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)
@ -342,14 +376,14 @@ class Downloader(private val context: Context, private val provider: DownloadPro
     * @param tmpDir the temporary directory of the download.
     * @param filename the filename of the image.
     */
-    private fun downloadImage(page: Page, source: OnlineSource, tmpDir: UniFile, filename: String): Observable<UniFile> {
+    private fun downloadImage(page: Page, source: HttpSource, tmpDir: UniFile, filename: String): Observable<UniFile> {
        page.status = Page.DOWNLOAD_IMAGE
        page.progress = 0
-        return source.imageResponse(page)
+        return source.fetchImage(page)
                .map { response ->
                    val file = tmpDir.createFile("$filename.tmp")
                    try {
-                        response.body().source().saveTo(file.openOutputStream())
+                        response.body()!!.source().saveTo(file.openOutputStream())
                        val extension = getImageExtension(response, file)
                        file.renameTo("$filename.$extension")
                    } catch (e: Exception) {
@ -372,13 +406,11 @@ class Downloader(private val context: Context, private val provider: DownloadPro
     */
    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.
-        ?: file.openInputStream().buffered().use {
-            URLConnection.guessContentTypeFromStream(it)
-        }
+        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"
    }
@ -417,6 +449,9 @@ class Downloader(private val context: Context, private val provider: DownloadPro
            notifier.onProgressChange(queue)
        }
        if (areAllDownloadsFinished()) {
+            if (notifier.isSingleChapter && !notifier.errorThrown) {
+                notifier.onDownloadCompleted(download, queue)
+            }
            DownloadService.stop(context)
        }
    }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/model/Download.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/model/Download.kt
@ -2,11 +2,11 @@ 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.data.source.model.Page
-import eu.kanade.tachiyomi.data.source.online.OnlineSource
+import eu.kanade.tachiyomi.source.model.Page
+import eu.kanade.tachiyomi.source.online.HttpSource
 import rx.subjects.PublishSubject

-class Download(val source: OnlineSource, val manga: Manga, val chapter: Chapter) {
+class Download(val source: HttpSource, val manga: Manga, val chapter: Chapter) {

    var pages: List<Page>? = null

--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/model/DownloadQueue.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/model/DownloadQueue.kt
@ -3,7 +3,7 @@ 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.data.source.model.Page
+import eu.kanade.tachiyomi.source.model.Page
 import rx.Observable
 import rx.subjects.PublishSubject
 import java.util.concurrent.CopyOnWriteArrayList
--- a/app/src/main/java/eu/kanade/tachiyomi/data/glide/AppGlideModule.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/glide/AppGlideModule.kt
@ -8,7 +8,7 @@ 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.data.database.models.Manga
-import eu.kanade.tachiyomi.data.network.NetworkHelper
+import eu.kanade.tachiyomi.network.NetworkHelper
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.io.InputStream
--- a/app/src/main/java/eu/kanade/tachiyomi/data/glide/FileFetcher.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/glide/FileFetcher.kt
@ -0,0 +1,35 @@
+package eu.kanade.tachiyomi.data.glide
+
+import com.bumptech.glide.Priority
+import com.bumptech.glide.load.data.DataFetcher
+import java.io.File
+import java.io.IOException
+import java.io.InputStream
+
+open class FileFetcher(private val file: File) : DataFetcher<InputStream> {
+
+    private var data: InputStream? = null
+
+    override fun loadData(priority: Priority): InputStream {
+        data = file.inputStream()
+        return data!!
+    }
+
+    override fun cleanup() {
+        data?.let { data ->
+            try {
+                data.close()
+            } catch (e: IOException) {
+                // Ignore
+            }
+        }
+    }
+
+    override fun cancel() {
+        // Do nothing.
+    }
+
+    override fun getId(): String {
+        return file.toString()
+    }
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaFileFetcher.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaFileFetcher.kt
@ -0,0 +1,18 @@
+package eu.kanade.tachiyomi.data.glide
+
+import eu.kanade.tachiyomi.data.database.models.Manga
+import java.io.File
+
+open class MangaFileFetcher(private val file: File, private val manga: Manga) : FileFetcher(file) {
+
+    /**
+     * 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()
+    }
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaModelLoader.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaModelLoader.kt
@ -3,20 +3,21 @@ package eu.kanade.tachiyomi.data.glide
 import android.content.Context
 import android.util.LruCache
 import com.bumptech.glide.Glide
+import com.bumptech.glide.integration.okhttp3.OkHttpStreamFetcher
 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.data.cache.CoverCache
 import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.source.SourceManager
-import eu.kanade.tachiyomi.data.source.online.OnlineSource
+import eu.kanade.tachiyomi.source.SourceManager
+import eu.kanade.tachiyomi.source.online.HttpSource
 import uy.kohesive.injekt.injectLazy
 import java.io.File
 import java.io.InputStream

 /**
 * A class for loading a cover associated with a [Manga] that can be present in our own cache.
- * Coupled with [MangaDataFetcher], this class allows to implement the following flow:
+ * Coupled with [MangaUrlFetcher], this class allows to implement the following flow:
 *
 * - Check in RAM LRU.
 * - Check in disk LRU.
@ -30,17 +31,17 @@ class MangaModelLoader(context: Context) : StreamModelLoader<Manga> {
    /**
     * Cover cache where persistent covers are stored.
     */
-    val coverCache: CoverCache by injectLazy()
+    private val coverCache: CoverCache by injectLazy()

    /**
     * Source manager.
     */
-    val sourceManager: SourceManager by injectLazy()
+    private val sourceManager: SourceManager by injectLazy()

    /**
     * Base network loader.
     */
-    private val baseLoader = Glide.buildModelLoader(GlideUrl::class.java,
+    private val baseUrlLoader = Glide.buildModelLoader(GlideUrl::class.java,
            InputStream::class.java, context)

    /**
@ -52,7 +53,7 @@ class MangaModelLoader(context: Context) : StreamModelLoader<Manga> {
    /**
     * Map where request headers are stored for a source.
     */
-    private val cachedHeaders = hashMapOf<Int, LazyHeaders>()
+    private val cachedHeaders = hashMapOf<Long, LazyHeaders>()

    /**
     * Factory class for creating [MangaModelLoader] instances.
@ -66,7 +67,7 @@ class MangaModelLoader(context: Context) : StreamModelLoader<Manga> {
    }

    /**
-     * Returns a [MangaDataFetcher] for the given manga or null if the url is empty.
+     * Returns a fetcher 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.
@ -78,22 +79,33 @@ class MangaModelLoader(context: Context) : StreamModelLoader<Manga> {

        // Check thumbnail is not null or empty
        val url = manga.thumbnail_url
-        if (url.isNullOrEmpty()) {
+        if (url == null || url.isEmpty()) {
            return null
        }

-        // 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) = lruCache.get(url) ?:
-            Pair(GlideUrl(url, getHeaders(manga)), coverCache.getCoverFile(url!!)).apply {
-                lruCache.put(url, this)
-            }
+        if (url.startsWith("http")) {
+            val source = sourceManager.get(manga.source) as? HttpSource

-        // Get the network fetcher for this request url.
-        val networkFetcher = baseLoader.getResourceFetcher(glideUrl, width, height)
+            // 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) = lruCache.get(url) ?:
+                    Pair(GlideUrl(url, getHeaders(manga, source)), coverCache.getCoverFile(url)).apply {
+                        lruCache.put(url, this)
+                    }

-        // Return an instance of our fetcher providing the needed elements.
-        return MangaDataFetcher(networkFetcher, file, manga)
+            // Get the resource fetcher for this request url.
+            val networkFetcher = source?.let { OkHttpStreamFetcher(it.client, glideUrl) }
+                ?: baseUrlLoader.getResourceFetcher(glideUrl, width, height)
+
+            // Return an instance of the fetcher providing the needed elements.
+            return MangaUrlFetcher(networkFetcher, file, manga)
+        } 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 MangaFileFetcher(file, manga)
+        }
    }

    /**
@ -101,8 +113,9 @@ class MangaModelLoader(context: Context) : StreamModelLoader<Manga> {
     *
     * @param manga the model.
     */
-    fun getHeaders(manga: Manga): Headers {
-        val source = sourceManager.get(manga.source) as? OnlineSource ?: return LazyHeaders.DEFAULT
+    fun getHeaders(manga: Manga, source: HttpSource?): Headers {
+        if (source == null) return LazyHeaders.DEFAULT
+
        return cachedHeaders.getOrPut(manga.source) {
            LazyHeaders.Builder().apply {
                val nullStr: String? = null
--- a/app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaDataFetcher.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaDataFetcher.kt
@ -18,13 +18,12 @@ import java.io.InputStream
 * @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> {
+class MangaUrlFetcher(private val networkFetcher: DataFetcher<InputStream>,
+                      private val file: File,
+                      private val manga: Manga)
+: MangaFileFetcher(file, manga) {

-    @Throws(Exception::class)
-    override fun loadData(priority: Priority): InputStream? {
+    override fun loadData(priority: Priority): InputStream {
        if (manga.favorite) {
            synchronized(file) {
                if (!file.exists()) {
@ -51,7 +50,7 @@ class MangaDataFetcher(private val networkFetcher: DataFetcher<InputStream>,
                    }
                }
            }
-            return file.inputStream()
+            return super.loadData(priority)
        } else {
            if (file.exists()) {
                file.delete()
@ -60,22 +59,12 @@ class MangaDataFetcher(private val networkFetcher: DataFetcher<InputStream>,
        }
    }

-    /**
-     * 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() {
+        super.cleanup()
        networkFetcher.cleanup()
    }

--- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
@ -1,11 +1,12 @@
 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
@ -18,16 +19,21 @@ 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.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.preference.getOrDefault
-import eu.kanade.tachiyomi.data.source.SourceManager
-import eu.kanade.tachiyomi.data.source.online.OnlineSource
+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.ui.main.MainActivity
 import eu.kanade.tachiyomi.util.*
 import rx.Observable
 import rx.Subscription
 import rx.schedulers.Schedulers
-import uy.kohesive.injekt.injectLazy
+import timber.log.Timber
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
 import java.util.*
 import java.util.concurrent.atomic.AtomicInteger

@ -39,24 +45,13 @@ 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 : Service() {
-
-    /**
-     * Database helper.
-     */
-    val db: DatabaseHelper by injectLazy()
-
-    /**
-     * Source manager.
-     */
-    val sourceManager: SourceManager by injectLazy()
-
-    /**
-     * Preferences.
-     */
-    val preferences: PreferencesHelper by injectLazy()
-
-    val downloadManager: DownloadManager by injectLazy()
+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() {

    /**
     * Wake lock that will be held until the service is destroyed.
@ -69,26 +64,49 @@ class LibraryUpdateService : Service() {
    private var subscription: Subscription? = null

    /**
-     * Id of the library update notification.
+     * Pending intent of action that cancels the library update
     */
-    private val notificationId: Int
-        get() = Constants.NOTIFICATION_LIBRARY_ID
+    private val cancelIntent by lazy {
+        NotificationReceiver.cancelLibraryUpdatePendingBroadcast(this)
+    }

+    /**
+     * 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)
+            .setSmallIcon(R.drawable.ic_refresh_white_24dp_img)
+            .setLargeIcon(notificationBitmap)
+            .setOngoing(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 category to update.
         */
-        const val UPDATE_CATEGORY = "category"
+        const val KEY_CATEGORY = "category"

        /**
-         * Key for updating the details instead of the chapters.
+         * Key that defines what should be updated.
         */
-        const val UPDATE_DETAILS = "details"
+        const val KEY_TARGET = "target"

        /**
         * Returns the status of the service.
@ -97,7 +115,7 @@ class LibraryUpdateService : Service() {
         * @return true if the service is running, false otherwise.
         */
        fun isRunning(context: Context): Boolean {
-            return AndroidComponentUtil.isServiceRunning(context, LibraryUpdateService::class.java)
+            return context.isServiceRunning(LibraryUpdateService::class.java)
        }

        /**
@ -106,13 +124,13 @@ class LibraryUpdateService : Service() {
         *
         * @param context the application context.
         * @param category a specific category to update, or null for global update.
-         * @param details whether to update the details instead of the list of chapters.
+         * @param target defines what should be updated.
         */
-        fun start(context: Context, category: Category? = null, details: Boolean = false) {
+        fun start(context: Context, category: Category? = null, target: Target = Target.CHAPTERS) {
            if (!isRunning(context)) {
                val intent = Intent(context, LibraryUpdateService::class.java).apply {
-                    putExtra(UPDATE_DETAILS, details)
-                    category?.let { putExtra(UPDATE_CATEGORY, it.id) }
+                    putExtra(KEY_TARGET, target)
+                    category?.let { putExtra(KEY_CATEGORY, it.id) }
                }
                context.startService(intent)
            }
@ -135,16 +153,20 @@ class LibraryUpdateService : Service() {
     */
    override fun onCreate() {
        super.onCreate()
-        createAndAcquireWakeLock()
+        wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager).newWakeLock(
+                PowerManager.PARTIAL_WAKE_LOCK, "LibraryUpdateService:WakeLock")
+        wakeLock.acquire()
    }

    /**
-     * Method called when the service is destroyed. It destroys the running subscription, resets
-     * the alarm and release the wake lock.
+     * Method called when the service is destroyed. It destroys subscriptions and releases the wake
+     * lock.
     */
    override fun onDestroy() {
        subscription?.unsubscribe()
-        destroyWakeLock()
+        if (wakeLock.isHeld) {
+            wakeLock.release()
+        }
        super.onDestroy()
    }

@ -165,6 +187,8 @@ class LibraryUpdateService : Service() {
     */
    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

        // Unsubscribe from any previous subscription if needed.
        subscription?.unsubscribe()
@ -172,18 +196,19 @@ class LibraryUpdateService : Service() {
        // Update favorite manga. Destroy service when completed or in case of an error.
        subscription = Observable
                .defer {
-                    val mangaList = getMangaToUpdate(intent)
+                    val mangaList = getMangaToUpdate(intent, target)

                    // Update either chapter list or manga details.
-                    if (!intent.getBooleanExtra(UPDATE_DETAILS, false))
-                        updateChapterList(mangaList)
-                    else
-                        updateDetails(mangaList)
+                    when (target) {
+                        Target.CHAPTERS -> updateChapterList(mangaList)
+                        Target.DETAILS -> updateDetails(mangaList)
+                        Target.TRACKING -> updateTrackings(mangaList)
+                    }
                }
                .subscribeOn(Schedulers.io())
                .subscribe({
                }, {
-                    showNotification(getString(R.string.notification_update_error), "")
+                    Timber.e(it)
                    stopSelf(startId)
                }, {
                    stopSelf(startId)
@ -196,25 +221,26 @@ class LibraryUpdateService : Service() {
     * 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): List<Manga> {
-        val categoryId = intent.getIntExtra(UPDATE_CATEGORY, -1)
+    fun getMangaToUpdate(intent: Intent, target: Target): List<Manga> {
+        val categoryId = intent.getIntExtra(KEY_CATEGORY, -1)

        var listToUpdate = if (categoryId != -1)
            db.getLibraryMangas().executeAsBlocking().filter { it.category == categoryId }
        else {
-            val categoriesToUpdate = preferences.libraryUpdateCategories().getOrDefault().map { it.toInt() }
+            val categoriesToUpdate = preferences.libraryUpdateCategories().getOrDefault().map(String::toInt)
            if (categoriesToUpdate.isNotEmpty())
                db.getLibraryMangas().executeAsBlocking()
                        .filter { it.category in categoriesToUpdate }
                        .distinctBy { it.id }
            else
-                db.getFavoriteMangas().executeAsBlocking().distinctBy { it.id }
+                db.getLibraryMangas().executeAsBlocking().distinctBy { it.id }
        }

-        if (!intent.getBooleanExtra(UPDATE_DETAILS, false) && preferences.updateOnlyNonCompleted()) {
-            listToUpdate = listToUpdate.filter { it.status != Manga.COMPLETED }
+        if (target == Target.CHAPTERS && preferences.updateOnlyNonCompleted()) {
+            listToUpdate = listToUpdate.filter { it.status != SManga.COMPLETED }
        }

        return listToUpdate
@ -232,16 +258,21 @@ class LibraryUpdateService : Service() {
    fun updateChapterList(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>()
-
-        val cancelIntent = PendingIntent.getBroadcast(this, 0,
-                Intent(this, CancelUpdateReceiver::class.java), 0)
+        // 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

        // Emit each manga and update it sequentially.
        return Observable.from(mangaToUpdate)
                // Notify manga that will update.
-                .doOnNext { showProgressNotification(it, count.andIncrement, mangaToUpdate.size, cancelIntent) }
+                .doOnNext { showProgressNotification(it, count.andIncrement, mangaToUpdate.size) }
                // Update the chapters of the manga.
                .concatMap { manga ->
                    updateManga(manga)
@ -251,10 +282,13 @@ class LibraryUpdateService : Service() {
                                Pair(emptyList<Chapter>(), emptyList<Chapter>())
                            }
                            // Filter out mangas without new chapters (or failed).
-                            .filter { pair -> pair.first.size > 0 }
+                            .filter { pair -> pair.first.isNotEmpty() }
                            .doOnNext {
-                                if (preferences.downloadNew()) {
+                                if (downloadNew && (categoriesToDownload.isEmpty() ||
+                                        manga.category in categoriesToDownload)) {
+
                                    downloadChapters(manga, it.first)
+                                    hasDownloads = true
                                }
                            }
                            // Convert to the manga that contains new chapters.
@ -270,14 +304,18 @@ class LibraryUpdateService : Service() {
                }
                // Notify result of the overall update.
                .doOnCompleted {
-                    if (newUpdates.isEmpty()) {
-                        cancelNotification()
-                    } else {
-                        if (preferences.downloadNew()) {
+                    if (newUpdates.isNotEmpty()) {
+                        showResultNotification(newUpdates)
+                        if (downloadNew && hasDownloads) {
                            DownloadService.start(this)
                        }
-                        showResultNotification(newUpdates, failedUpdates)
                    }
+
+                    if (failedUpdates.isNotEmpty()) {
+                        Timber.e("Failed updating: ${failedUpdates.map { it.title }}")
+                    }
+
+                    cancelProgressNotification()
                }
    }

@ -297,7 +335,7 @@ class LibraryUpdateService : Service() {
     * @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? OnlineSource ?: return Observable.empty()
+        val source = sourceManager.get(manga.source) as? HttpSource ?: return Observable.empty()
        return source.fetchChapterList(manga)
                .map { syncChaptersWithSource(db, it, manga, source) }
    }
@ -305,8 +343,6 @@ class LibraryUpdateService : Service() {
    /**
     * 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.
-     * For each manga it calls [updateManga] and updates the notification showing the current
-     * progress.
     *
     * @param mangaToUpdate the list to update
     * @return an observable delivering the progress of each update.
@ -315,91 +351,62 @@ class LibraryUpdateService : Service() {
        // Initialize the variables holding the progress of the updates.
        val count = AtomicInteger(0)

-        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, cancelIntent) }
+                .doOnNext { showProgressNotification(it, count.andIncrement, mangaToUpdate.size) }
                // Update the details of the manga.
                .concatMap { manga ->
-                    val source = sourceManager.get(manga.source) as? OnlineSource
+                    val source = sourceManager.get(manga.source) as? HttpSource
                            ?: return@concatMap Observable.empty<Manga>()

                    source.fetchMangaDetails(manga)
-                            .doOnNext { networkManga ->
+                            .map { networkManga ->
                                manga.copyFrom(networkManga)
                                db.insertManga(manga).executeAsBlocking()
+                                manga
                            }
                            .onErrorReturn { manga }
                }
                .doOnCompleted {
-                    cancelNotification()
+                    cancelProgressNotification()
                }
    }

    /**
-     * Returns the text that will be displayed in the notification when there are new chapters.
-     *
-     * @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.
+     * 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.
     */
-    private fun getUpdatedMangasBody(updates: List<Manga>, failedUpdates: List<Manga>): String {
-        return buildString {
-            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.chop(45))
+    private fun updateTrackings(mangaToUpdate: List<Manga>): Observable<Manga> {
+        // Initialize the variables holding the progress of the updates.
+        var count = 0
+
+        val loggedServices = trackManager.services.filter { it.isLogged }
+
+        // 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 }
                }
-            }
-            if (!failedUpdates.isEmpty()) {
-                append("\n\n")
-                append(getString(R.string.notification_manga_update_failed))
-                for (manga in failedUpdates) {
-                    append("\n")
-                    append(manga.title.chop(45))
+                .doOnCompleted {
+                    cancelProgressNotification()
                }
-            }
-        }
-    }
-
-    /**
-     * Creates and acquires a wake lock until the library is updated.
-     */
-    private fun createAndAcquireWakeLock() {
-        wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager).newWakeLock(
-                PowerManager.PARTIAL_WAKE_LOCK, "LibraryUpdateService:WakeLock")
-        wakeLock.acquire()
-    }
-
-    /**
-     * Releases the wake lock if it's held.
-     */
-    private fun destroyWakeLock() {
-        if (wakeLock.isHeld) {
-            wakeLock.release()
-        }
-    }
-
-    /**
-     * 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)
-            setLargeIcon(notificationBitmap)
-            setContentTitle(title)
-            setContentText(body)
-        })
    }

    /**
@ -409,67 +416,67 @@ class LibraryUpdateService : Service() {
     * @param current the current progress.
     * @param total the total progress.
     */
-    private fun showProgressNotification(manga: Manga, current: Int, total: Int, cancelIntent: PendingIntent) {
-        notificationManager.notify(notificationId, notification {
-            setSmallIcon(R.drawable.ic_refresh_white_24dp_img)
-            setLargeIcon(notificationBitmap)
-            setContentTitle(manga.title)
-            setProgress(total, current, false)
-            setOngoing(true)
-            addAction(R.drawable.ic_clear_grey_24dp_img, getString(android.R.string.cancel), cancelIntent)
-        })
+    private fun showProgressNotification(manga: Manga, current: Int, total: Int) {
+        notificationManager.notify(Constants.NOTIFICATION_LIBRARY_PROGRESS_ID, progressNotification
+                .setContentTitle(manga.title)
+                .setProgress(total, current, false)
+                .build())
    }

-
    /**
     * 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>, failed: List<Manga>) {
-        val title = getString(R.string.notification_update_completed)
-        val body = getUpdatedMangasBody(updates, failed)
+    private fun showResultNotification(updates: List<Manga>) {
+        val newUpdates = updates.map { it.title.chop(45) }.toMutableSet()

-        notificationManager.notify(notificationId, notification {
-            setSmallIcon(R.drawable.ic_refresh_white_24dp_img)
+        // Append new chapters from a previous, existing notification
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            val previousNotification = notificationManager.activeNotifications
+                    .find { it.id == Constants.NOTIFICATION_LIBRARY_RESULT_ID }
+
+            if (previousNotification != null) {
+                val oldUpdates = previousNotification.notification.extras
+                        .getString(Notification.EXTRA_BIG_TEXT)
+
+                if (!oldUpdates.isNullOrEmpty()) {
+                    newUpdates += oldUpdates.split("\n")
+                }
+            }
+        }
+
+        notificationManager.notify(Constants.NOTIFICATION_LIBRARY_RESULT_ID, notification {
+            setSmallIcon(R.drawable.ic_book_white_24dp)
            setLargeIcon(notificationBitmap)
-            setContentTitle(title)
-            setStyle(NotificationCompat.BigTextStyle().bigText(body))
-            setContentIntent(notificationIntent)
+            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())
            setAutoCancel(true)
        })
    }

    /**
-     * Cancels the notification.
+     * Cancels the progress notification.
     */
-    private fun cancelNotification() {
-        notificationManager.cancel(notificationId)
+    private fun cancelProgressNotification() {
+        notificationManager.cancel(Constants.NOTIFICATION_LIBRARY_PROGRESS_ID)
    }

    /**
-     * Property that returns an intent to open the main activity.
+     * Returns an intent to open the main activity.
     */
-    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 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)
-        }
+    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)
    }
+
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/MangaSyncManager.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/MangaSyncManager.kt
@ -1,23 +0,0 @@
-package eu.kanade.tachiyomi.data.mangasync
-
-import android.content.Context
-import eu.kanade.tachiyomi.data.mangasync.anilist.Anilist
-import eu.kanade.tachiyomi.data.mangasync.myanimelist.MyAnimeList
-
-class MangaSyncManager(private val context: Context) {
-
-    companion object {
-        const val MYANIMELIST = 1
-        const val ANILIST = 2
-    }
-
-    val myAnimeList = MyAnimeList(context, MYANIMELIST)
-
-    val aniList = Anilist(context, ANILIST)
-
-    // TODO enable anilist
-    val services = listOf(myAnimeList)
-
-    fun getService(id: Int) = services.find { it.id == id }
-
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/MangaSyncService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/MangaSyncService.kt
@ -1,51 +0,0 @@
-package eu.kanade.tachiyomi.data.mangasync
-
-import android.content.Context
-import android.support.annotation.CallSuper
-import eu.kanade.tachiyomi.data.database.models.MangaSync
-import eu.kanade.tachiyomi.data.network.NetworkHelper
-import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import okhttp3.OkHttpClient
-import rx.Completable
-import rx.Observable
-import uy.kohesive.injekt.injectLazy
-
-abstract class MangaSyncService(private val context: Context, val id: Int) {
-
-    val preferences: PreferencesHelper by injectLazy()
-    val networkService: NetworkHelper by injectLazy()
-
-    open val client: OkHttpClient
-        get() = networkService.client
-
-    // Name of the manga sync service to display
-    abstract val name: String
-
-    abstract fun login(username: String, password: String): Completable
-
-    open val isLogged: Boolean
-        get() = !getUsername().isEmpty() &&
-                !getPassword().isEmpty()
-
-    abstract fun add(manga: MangaSync): Observable<MangaSync>
-
-    abstract fun update(manga: MangaSync): Observable<MangaSync>
-
-    abstract fun bind(manga: MangaSync): Observable<MangaSync>
-
-    abstract fun getStatus(status: Int): String
-
-    fun saveCredentials(username: String, password: String) {
-        preferences.setMangaSyncCredentials(this, username, password)
-    }
-
-    @CallSuper
-    open fun logout() {
-        preferences.setMangaSyncCredentials(this, "", "")
-    }
-
-    fun getUsername() = preferences.mangaSyncUsername(this)
-
-    fun getPassword() = preferences.mangaSyncPassword(this)
-
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/UpdateMangaSyncService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/UpdateMangaSyncService.kt
@ -1,74 +0,0 @@
-package eu.kanade.tachiyomi.data.mangasync
-
-import android.app.Service
-import android.content.Context
-import android.content.Intent
-import android.os.IBinder
-import eu.kanade.tachiyomi.data.database.DatabaseHelper
-import eu.kanade.tachiyomi.data.database.models.MangaSync
-import rx.Observable
-import rx.android.schedulers.AndroidSchedulers
-import rx.schedulers.Schedulers
-import rx.subscriptions.CompositeSubscription
-import uy.kohesive.injekt.injectLazy
-
-class UpdateMangaSyncService : Service() {
-
-    val syncManager: MangaSyncManager by injectLazy()
-    val db: DatabaseHelper by injectLazy()
-
-    private lateinit var subscriptions: CompositeSubscription
-
-    override fun onCreate() {
-        super.onCreate()
-        subscriptions = CompositeSubscription()
-    }
-
-    override fun onDestroy() {
-        subscriptions.unsubscribe()
-        super.onDestroy()
-    }
-
-    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
-        val manga = intent.getSerializableExtra(EXTRA_MANGASYNC)
-        if (manga != null) {
-            updateLastChapterRead(manga as MangaSync, startId)
-            return Service.START_REDELIVER_INTENT
-        } else {
-            stopSelf(startId)
-            return Service.START_NOT_STICKY
-        }
-    }
-
-    override fun onBind(intent: Intent): IBinder? {
-        return null
-    }
-
-    private fun updateLastChapterRead(mangaSync: MangaSync, startId: Int) {
-        val sync = syncManager.getService(mangaSync.sync_id)
-        if (sync == null) {
-            stopSelf(startId)
-            return
-        }
-
-        subscriptions.add(Observable.defer { sync.update(mangaSync) }
-                .flatMap { db.insertMangaSync(mangaSync).asRxObservable() }
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ stopSelf(startId) },
-                        { stopSelf(startId) }))
-    }
-
-    companion object {
-
-        private val EXTRA_MANGASYNC = "extra_mangasync"
-
-        @JvmStatic
-        fun start(context: Context, mangaSync: MangaSync) {
-            val intent = Intent(context, UpdateMangaSyncService::class.java)
-            intent.putExtra(EXTRA_MANGASYNC, mangaSync)
-            context.startService(intent)
-        }
-    }
-
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/anilist/Anilist.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/anilist/Anilist.kt
@ -1,132 +0,0 @@
-package eu.kanade.tachiyomi.data.mangasync.anilist
-
-import android.content.Context
-import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.data.database.models.MangaSync
-import eu.kanade.tachiyomi.data.mangasync.MangaSyncService
-import rx.Completable
-import rx.Observable
-import timber.log.Timber
-
-class Anilist(private val context: Context, id: Int) : MangaSyncService(context, id) {
-
-    companion object {
-        const val READING = 1
-        const val COMPLETED = 2
-        const val ON_HOLD = 3
-        const val DROPPED = 4
-        const val PLAN_TO_READ = 5
-
-        const val DEFAULT_STATUS = READING
-        const val DEFAULT_SCORE = 0
-    }
-
-    override val name = "AniList"
-
-    private val interceptor by lazy { AnilistInterceptor(getPassword()) }
-
-    private val api by lazy {
-        AnilistApi.createService(networkService.client.newBuilder()
-                .addInterceptor(interceptor)
-                .build())
-    }
-
-    override fun login(username: String, password: String) = login(password)
-
-    fun login(authCode: String): Completable {
-        // Create a new api with the default client to avoid request interceptions.
-        return AnilistApi.createService(client)
-                // Request the access token from the API with the authorization code.
-                .requestAccessToken(authCode)
-                // Save the token in the interceptor.
-                .doOnNext { interceptor.setAuth(it) }
-                // Obtain the authenticated user from the API.
-                .zipWith(api.getCurrentUser().map { it["id"].toString() })
-                        { oauth, user -> Pair(user, oauth.refresh_token!!) }
-                // Save service credentials (username and refresh token).
-                .doOnNext { saveCredentials(it.first, it.second) }
-                // Logout on any error.
-                .doOnError { logout() }
-                .toCompletable()
-    }
-
-    override fun logout() {
-        super.logout()
-        interceptor.setAuth(null)
-    }
-
-    fun search(query: String): Observable<List<MangaSync>> {
-        return api.search(query, 1)
-                .flatMap { Observable.from(it) }
-                .filter { it.type != "Novel" }
-                .map { it.toMangaSync() }
-                .toList()
-    }
-
-    fun getList(): Observable<List<MangaSync>> {
-        return api.getList(getUsername())
-                .flatMap { Observable.from(it.flatten()) }
-                .map { it.toMangaSync() }
-                .toList()
-    }
-
-    override fun add(manga: MangaSync): Observable<MangaSync> {
-        return api.addManga(manga.remote_id, manga.last_chapter_read, manga.getAnilistStatus(),
-                manga.score.toInt())
-                .doOnNext { it.body().close() }
-                .doOnNext { if (!it.isSuccessful) throw Exception("Could not add manga") }
-                .doOnError { Timber.e(it, it.message) }
-                .map { manga }
-    }
-
-    override fun update(manga: MangaSync): Observable<MangaSync> {
-        if (manga.total_chapters != 0 && manga.last_chapter_read == manga.total_chapters) {
-            manga.status = COMPLETED
-        }
-        return api.updateManga(manga.remote_id, manga.last_chapter_read, manga.getAnilistStatus(),
-                manga.score.toInt())
-                .doOnNext { it.body().close() }
-                .doOnNext { if (!it.isSuccessful) throw Exception("Could not update manga") }
-                .doOnError { Timber.e(it, it.message) }
-                .map { manga }
-    }
-
-    override fun bind(manga: MangaSync): Observable<MangaSync> {
-        return getList()
-                .flatMap { userlist ->
-                    manga.sync_id = id
-                    val mangaFromList = userlist.find { it.remote_id == manga.remote_id }
-                    if (mangaFromList != null) {
-                        manga.copyPersonalFrom(mangaFromList)
-                        update(manga)
-                    } else {
-                        // Set default fields if it's not found in the list
-                        manga.score = DEFAULT_SCORE.toFloat()
-                        manga.status = DEFAULT_STATUS
-                        add(manga)
-                    }
-                }
-    }
-
-    override fun getStatus(status: Int): String = with(context) {
-        when (status) {
-            READING -> getString(R.string.reading)
-            COMPLETED -> getString(R.string.completed)
-            ON_HOLD -> getString(R.string.on_hold)
-            DROPPED -> getString(R.string.dropped)
-            PLAN_TO_READ -> getString(R.string.plan_to_read)
-            else -> ""
-        }
-    }
-
-    private fun MangaSync.getAnilistStatus() = when (status) {
-        READING -> "reading"
-        COMPLETED -> "completed"
-        ON_HOLD -> "on-hold"
-        DROPPED -> "dropped"
-        PLAN_TO_READ -> "plan to read"
-        else -> throw NotImplementedError("Unknown status")
-    }
-
-}
-
--- a/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/anilist/AnilistApi.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/anilist/AnilistApi.kt
@ -1,89 +0,0 @@
-package eu.kanade.tachiyomi.data.mangasync.anilist
-
-import android.net.Uri
-import com.google.gson.JsonObject
-import eu.kanade.tachiyomi.data.mangasync.anilist.model.ALManga
-import eu.kanade.tachiyomi.data.mangasync.anilist.model.ALUserLists
-import eu.kanade.tachiyomi.data.mangasync.anilist.model.OAuth
-import eu.kanade.tachiyomi.data.network.POST
-import okhttp3.FormBody
-import okhttp3.OkHttpClient
-import okhttp3.ResponseBody
-import retrofit2.Response
-import retrofit2.Retrofit
-import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory
-import retrofit2.converter.gson.GsonConverterFactory
-import retrofit2.http.*
-import rx.Observable
-
-interface AnilistApi {
-
-    companion object {
-        private const val clientId = "tachiyomi-hrtje"
-        private const val clientSecret = "nlGB5OmgE9YWq5dr3gIDbTQV0C"
-        private const val clientUrl = "tachiyomi://anilist-auth"
-        private const val baseUrl = "https://anilist.co/api/"
-
-        fun authUrl() = Uri.parse("${baseUrl}auth/authorize").buildUpon()
-                .appendQueryParameter("grant_type", "authorization_code")
-                .appendQueryParameter("client_id", clientId)
-                .appendQueryParameter("redirect_uri", clientUrl)
-                .appendQueryParameter("response_type", "code")
-                .build()
-
-        fun refreshTokenRequest(token: String) = POST("${baseUrl}auth/access_token",
-                body = FormBody.Builder()
-                        .add("grant_type", "refresh_token")
-                        .add("client_id", clientId)
-                        .add("client_secret", clientSecret)
-                        .add("refresh_token", token)
-                        .build())
-
-        fun createService(client: OkHttpClient) = Retrofit.Builder()
-                .baseUrl(baseUrl)
-                .client(client)
-                .addConverterFactory(GsonConverterFactory.create())
-                .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
-                .build()
-                .create(AnilistApi::class.java)
-
-    }
-
-    @FormUrlEncoded
-    @POST("auth/access_token")
-    fun requestAccessToken(
-            @Field("code") code: String,
-            @Field("grant_type") grant_type: String = "authorization_code",
-            @Field("client_id") client_id: String = clientId,
-            @Field("client_secret") client_secret: String = clientSecret,
-            @Field("redirect_uri") redirect_uri: String = clientUrl)
-            : Observable<OAuth>
-
-    @GET("user")
-    fun getCurrentUser(): Observable<JsonObject>
-
-    @GET("manga/search/{query}")
-    fun search(@Path("query") query: String, @Query("page") page: Int): Observable<List<ALManga>>
-
-    @GET("user/{username}/mangalist")
-    fun getList(@Path("username") username: String): Observable<ALUserLists>
-
-    @FormUrlEncoded
-    @PUT("mangalist")
-    fun addManga(
-            @Field("id") id: Int,
-            @Field("chapters_read") chapters_read: Int,
-            @Field("list_status") list_status: String,
-            @Field("score_raw") score_raw: Int)
-            : Observable<Response<ResponseBody>>
-
-    @FormUrlEncoded
-    @PUT("mangalist")
-    fun updateManga(
-            @Field("id") id: Int,
-            @Field("chapters_read") chapters_read: Int,
-            @Field("list_status") list_status: String,
-            @Field("score_raw") score_raw: Int)
-            : Observable<Response<ResponseBody>>
-
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/anilist/model/ALManga.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/anilist/model/ALManga.kt
@ -1,17 +0,0 @@
-package eu.kanade.tachiyomi.data.mangasync.anilist.model
-
-import eu.kanade.tachiyomi.data.database.models.MangaSync
-import eu.kanade.tachiyomi.data.mangasync.MangaSyncManager
-
-data class ALManga(
-        val id: Int,
-        val title_romaji: String,
-        val type: String,
-        val total_chapters: Int) {
-
-    fun toMangaSync() = MangaSync.create(MangaSyncManager.ANILIST).apply {
-        remote_id = this@ALManga.id
-        title = title_romaji
-        total_chapters = this@ALManga.total_chapters
-    }
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/anilist/model/ALUserLists.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/anilist/model/ALUserLists.kt
@ -1,6 +0,0 @@
-package eu.kanade.tachiyomi.data.mangasync.anilist.model
-
-data class ALUserLists(val lists: Map<String, List<ALUserManga>>) {
-
-    fun flatten() = lists.values.flatten()
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/anilist/model/ALUserManga.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/anilist/model/ALUserManga.kt
@ -1,29 +0,0 @@
-package eu.kanade.tachiyomi.data.mangasync.anilist.model
-
-import eu.kanade.tachiyomi.data.database.models.MangaSync
-import eu.kanade.tachiyomi.data.mangasync.MangaSyncManager
-import eu.kanade.tachiyomi.data.mangasync.anilist.Anilist
-
-data class ALUserManga(
-        val id: Int,
-        val list_status: String,
-        val score_raw: Int,
-        val chapters_read: Int,
-        val manga: ALManga) {
-
-    fun toMangaSync() = MangaSync.create(MangaSyncManager.ANILIST).apply {
-        remote_id = manga.id
-        status = getMangaSyncStatus()
-        score = score_raw.toFloat()
-        last_chapter_read = chapters_read
-    }
-
-    fun getMangaSyncStatus() = when (list_status) {
-        "reading" -> Anilist.READING
-        "completed" -> Anilist.COMPLETED
-        "on-hold" -> Anilist.ON_HOLD
-        "dropped" -> Anilist.DROPPED
-        "plan to read" -> Anilist.PLAN_TO_READ
-        else -> throw NotImplementedError("Unknown status")
-    }
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/myanimelist/MyAnimeList.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/myanimelist/MyAnimeList.kt
@ -1,222 +0,0 @@
-package eu.kanade.tachiyomi.data.mangasync.myanimelist
-
-import android.content.Context
-import android.net.Uri
-import android.util.Xml
-import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.data.database.models.MangaSync
-import eu.kanade.tachiyomi.data.mangasync.MangaSyncService
-import eu.kanade.tachiyomi.data.network.GET
-import eu.kanade.tachiyomi.data.network.POST
-import eu.kanade.tachiyomi.data.network.asObservable
-import eu.kanade.tachiyomi.util.selectInt
-import eu.kanade.tachiyomi.util.selectText
-import okhttp3.Credentials
-import okhttp3.FormBody
-import okhttp3.Headers
-import okhttp3.RequestBody
-import org.jsoup.Jsoup
-import org.xmlpull.v1.XmlSerializer
-import rx.Completable
-import rx.Observable
-import java.io.StringWriter
-
-class MyAnimeList(private val context: Context, id: Int) : MangaSyncService(context, id) {
-
-    private lateinit var headers: Headers
-
-    companion object {
-        val BASE_URL = "https://myanimelist.net"
-
-        private val ENTRY_TAG = "entry"
-        private val CHAPTER_TAG = "chapter"
-        private val SCORE_TAG = "score"
-        private val STATUS_TAG = "status"
-
-        val READING = 1
-        val COMPLETED = 2
-        val ON_HOLD = 3
-        val DROPPED = 4
-        val PLAN_TO_READ = 6
-
-        val DEFAULT_STATUS = READING
-        val DEFAULT_SCORE = 0
-    }
-
-    init {
-        val username = getUsername()
-        val password = getPassword()
-
-        if (!username.isEmpty() && !password.isEmpty()) {
-            createHeaders(username, password)
-        }
-    }
-
-    override val name: String
-        get() = "MyAnimeList"
-
-    fun getLoginUrl() = Uri.parse(BASE_URL).buildUpon()
-            .appendEncodedPath("api/account/verify_credentials.xml")
-            .toString()
-
-    fun getSearchUrl(query: String) = Uri.parse(BASE_URL).buildUpon()
-            .appendEncodedPath("api/manga/search.xml")
-            .appendQueryParameter("q", query)
-            .toString()
-
-    fun getListUrl(username: String) = Uri.parse(BASE_URL).buildUpon()
-            .appendPath("malappinfo.php")
-            .appendQueryParameter("u", username)
-            .appendQueryParameter("status", "all")
-            .appendQueryParameter("type", "manga")
-            .toString()
-
-    fun getUpdateUrl(manga: MangaSync) = Uri.parse(BASE_URL).buildUpon()
-            .appendEncodedPath("api/mangalist/update")
-            .appendPath("${manga.remote_id}.xml")
-            .toString()
-
-    fun getAddUrl(manga: MangaSync) = Uri.parse(BASE_URL).buildUpon()
-            .appendEncodedPath("api/mangalist/add")
-            .appendPath("${manga.remote_id}.xml")
-            .toString()
-
-    override fun login(username: String, password: String): Completable {
-        createHeaders(username, password)
-        return client.newCall(GET(getLoginUrl(), headers))
-                .asObservable()
-                .doOnNext { it.close() }
-                .doOnNext { if (it.code() != 200) throw Exception("Login error") }
-                .toCompletable()
-    }
-
-    fun search(query: String): Observable<List<MangaSync>> {
-        return client.newCall(GET(getSearchUrl(query), headers))
-                .asObservable()
-                .map { Jsoup.parse(it.body().string()) }
-                .flatMap { Observable.from(it.select("entry")) }
-                .filter { it.select("type").text() != "Novel" }
-                .map {
-                    MangaSync.create(id).apply {
-                        title = it.selectText("title")!!
-                        remote_id = it.selectInt("id")
-                        total_chapters = it.selectInt("chapters")
-                    }
-                }
-                .toList()
-    }
-
-    // MAL doesn't support score with decimals
-    fun getList(): Observable<List<MangaSync>> {
-        return networkService.forceCacheClient
-                .newCall(GET(getListUrl(getUsername()), headers))
-                .asObservable()
-                .map { Jsoup.parse(it.body().string()) }
-                .flatMap { Observable.from(it.select("manga")) }
-                .map {
-                    MangaSync.create(id).apply {
-                        title = it.selectText("series_title")!!
-                        remote_id = it.selectInt("series_mangadb_id")
-                        last_chapter_read = it.selectInt("my_read_chapters")
-                        status = it.selectInt("my_status")
-                        score = it.selectInt("my_score").toFloat()
-                        total_chapters = it.selectInt("series_chapters")
-                    }
-                }
-                .toList()
-    }
-
-    override fun update(manga: MangaSync): Observable<MangaSync> {
-        return Observable.defer {
-            if (manga.total_chapters != 0 && manga.last_chapter_read == manga.total_chapters) {
-                manga.status = COMPLETED
-            }
-            client.newCall(POST(getUpdateUrl(manga), headers, getMangaPostPayload(manga)))
-                    .asObservable()
-                    .doOnNext { it.close() }
-                    .doOnNext { if (!it.isSuccessful) throw Exception("Could not update manga") }
-                    .map { manga }
-        }
-
-    }
-
-    override fun add(manga: MangaSync): Observable<MangaSync> {
-        return Observable.defer {
-            client.newCall(POST(getAddUrl(manga), headers, getMangaPostPayload(manga)))
-                    .asObservable()
-                    .doOnNext { it.close() }
-                    .doOnNext { if (!it.isSuccessful) throw Exception("Could not add manga") }
-                    .map { manga }
-        }
-    }
-
-    private fun getMangaPostPayload(manga: MangaSync): RequestBody {
-        val xml = Xml.newSerializer()
-        val writer = StringWriter()
-
-        with(xml) {
-            setOutput(writer)
-            startDocument("UTF-8", false)
-            startTag("", ENTRY_TAG)
-
-            // Last chapter read
-            if (manga.last_chapter_read != 0) {
-                inTag(CHAPTER_TAG, manga.last_chapter_read.toString())
-            }
-            // Manga status in the list
-            inTag(STATUS_TAG, manga.status.toString())
-
-            // Manga score
-            inTag(SCORE_TAG, manga.score.toString())
-
-            endTag("", ENTRY_TAG)
-            endDocument()
-        }
-
-        val form = FormBody.Builder()
-        form.add("data", writer.toString())
-        return form.build()
-    }
-
-    fun XmlSerializer.inTag(tag: String, body: String, namespace: String = "") {
-        startTag(namespace, tag)
-        text(body)
-        endTag(namespace, tag)
-    }
-
-    override fun bind(manga: MangaSync): Observable<MangaSync> {
-        return getList()
-                .flatMap { userlist ->
-                    manga.sync_id = id
-                    val mangaFromList = userlist.find { it.remote_id == manga.remote_id }
-                    if (mangaFromList != null) {
-                        manga.copyPersonalFrom(mangaFromList)
-                        update(manga)
-                    } else {
-                        // Set default fields if it's not found in the list
-                        manga.score = DEFAULT_SCORE.toFloat()
-                        manga.status = DEFAULT_STATUS
-                        add(manga)
-                    }
-                }
-    }
-
-    override fun getStatus(status: Int): String = with(context) {
-        when (status) {
-            READING -> getString(R.string.reading)
-            COMPLETED -> getString(R.string.completed)
-            ON_HOLD -> getString(R.string.on_hold)
-            DROPPED -> getString(R.string.dropped)
-            PLAN_TO_READ -> getString(R.string.plan_to_read)
-            else -> ""
-        }
-    }
-
-    fun createHeaders(username: String, password: String) {
-        val builder = Headers.Builder()
-        builder.add("Authorization", Credentials.basic(username, password))
-        builder.add("User-Agent", "api-indiv-9F93C52A963974CF674325391990191C")
-        headers = builder.build()
-    }
-
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationHandler.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationHandler.kt
@ -0,0 +1,56 @@
+package eu.kanade.tachiyomi.data.notification
+
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import eu.kanade.tachiyomi.ui.main.MainActivity
+import eu.kanade.tachiyomi.util.getUriCompat
+import java.io.File
+
+/**
+ * Class that manages [PendingIntent] of activity's
+ */
+object NotificationHandler {
+    /**
+     * Returns [PendingIntent] that starts a download activity.
+     *
+     * @param context context of application
+     */
+    internal fun openDownloadManagerPendingActivity(context: Context): PendingIntent {
+        val intent = Intent(context, MainActivity::class.java).apply {
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
+            action = MainActivity.SHORTCUT_DOWNLOADS
+        }
+        return PendingIntent.getActivity(context, 0, intent, 0)
+    }
+
+    /**
+     * Returns [PendingIntent] that starts a gallery activity
+     *
+     * @param context context of application
+     * @param file file containing image
+     */
+    internal fun openImagePendingActivity(context: Context, file: File): PendingIntent {
+        val intent = Intent(Intent.ACTION_VIEW).apply {
+            val uri = file.getUriCompat(context)
+            setDataAndType(uri, "image/*")
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_GRANT_READ_URI_PERMISSION
+        }
+        return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+    }
+
+    /**
+     * Returns [PendingIntent] that prompts user with apk install intent
+     *
+     * @param context context
+     * @param file file of apk that is installed
+     */
+    fun installApkPendingActivity(context: Context, file: File): PendingIntent {
+        val intent = Intent(Intent.ACTION_VIEW).apply {
+            val uri = file.getUriCompat(context)
+            setDataAndType(uri, "application/vnd.android.package-archive")
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_GRANT_READ_URI_PERMISSION
+        }
+        return PendingIntent.getActivity(context, 0, intent, 0)
+    }
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt
@ -0,0 +1,280 @@
+package eu.kanade.tachiyomi.data.notification
+
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.os.Handler
+import eu.kanade.tachiyomi.Constants
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.database.DatabaseHelper
+import eu.kanade.tachiyomi.data.database.models.Chapter
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.download.DownloadManager
+import eu.kanade.tachiyomi.data.download.DownloadService
+import eu.kanade.tachiyomi.data.library.LibraryUpdateService
+import eu.kanade.tachiyomi.ui.reader.ReaderActivity
+import eu.kanade.tachiyomi.util.DiskUtil
+import eu.kanade.tachiyomi.util.getUriCompat
+import eu.kanade.tachiyomi.util.notificationManager
+import eu.kanade.tachiyomi.util.toast
+import uy.kohesive.injekt.injectLazy
+import java.io.File
+import eu.kanade.tachiyomi.BuildConfig.APPLICATION_ID as ID
+
+/**
+ * Global [BroadcastReceiver] that runs on UI thread
+ * Pending Broadcasts should be made from here.
+ * NOTE: Use local broadcasts if possible.
+ */
+class NotificationReceiver : BroadcastReceiver() {
+    /**
+     * Download manager.
+     */
+    private val downloadManager: DownloadManager by injectLazy()
+
+    override fun onReceive(context: Context, intent: Intent) {
+        when (intent.action) {
+            // Dismiss notification
+            ACTION_DISMISS_NOTIFICATION -> dismissNotification(context, intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1))
+            // Resume the download service
+            ACTION_RESUME_DOWNLOADS -> DownloadService.start(context)
+            // Clear the download queue
+            ACTION_CLEAR_DOWNLOADS -> downloadManager.clearQueue(true)
+            // Launch share activity and dismiss notification
+            ACTION_SHARE_IMAGE -> shareImage(context, intent.getStringExtra(EXTRA_FILE_LOCATION),
+                    intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1))
+            // Delete image from path and dismiss notification
+            ACTION_DELETE_IMAGE -> deleteImage(context, intent.getStringExtra(EXTRA_FILE_LOCATION),
+                    intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1))
+            // Cancel library update and dismiss notification
+            ACTION_CANCEL_LIBRARY_UPDATE -> cancelLibraryUpdate(context, Constants.NOTIFICATION_LIBRARY_PROGRESS_ID)
+            // Open reader activity
+            ACTION_OPEN_CHAPTER -> {
+                openChapter(context, intent.getLongExtra(EXTRA_MANGA_ID, -1),
+                        intent.getLongExtra(EXTRA_CHAPTER_ID, -1))
+            }
+        }
+    }
+
+    /**
+     * Dismiss the notification
+     *
+     * @param notificationId the id of the notification
+     */
+    private fun dismissNotification(context: Context, notificationId: Int) {
+        context.notificationManager.cancel(notificationId)
+    }
+
+    /**
+     * Called to start share intent to share image
+     *
+     * @param context context of application
+     * @param path path of file
+     * @param notificationId id of notification
+     */
+    private fun shareImage(context: Context, path: String, notificationId: Int) {
+        // Create intent
+        val intent = Intent(Intent.ACTION_SEND).apply {
+            val uri = File(path).getUriCompat(context)
+            putExtra(Intent.EXTRA_STREAM, uri)
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_GRANT_READ_URI_PERMISSION
+            type = "image/*"
+        }
+        // Dismiss notification
+        dismissNotification(context, notificationId)
+        // Launch share activity
+        context.startActivity(intent)
+    }
+
+    /**
+     * Starts reader activity
+     *
+     * @param context context of application
+     * @param mangaId id of manga
+     * @param chapterId id of chapter
+     */
+    internal fun openChapter(context: Context, mangaId: Long, chapterId: Long) {
+        val db = DatabaseHelper(context)
+        val manga = db.getManga(mangaId).executeAsBlocking()
+        val chapter = db.getChapter(chapterId).executeAsBlocking()
+
+        if (manga != null && chapter != null) {
+            val intent = ReaderActivity.newIntent(context, manga, chapter).apply {
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+            }
+            context.startActivity(intent)
+        } else {
+            context.toast(context.getString(R.string.chapter_error))
+        }
+    }
+
+    /**
+     * Called to delete image
+     *
+     * @param path path of file
+     * @param notificationId id of notification
+     */
+    private fun deleteImage(context: Context, path: String, notificationId: Int) {
+        // Dismiss notification
+        dismissNotification(context, notificationId)
+
+        // Delete file
+        val file = File(path)
+        file.delete()
+
+        DiskUtil.scanMedia(context, file)
+    }
+
+    /**
+     * Method called when user wants to stop a library update
+     *
+     * @param context context of application
+     * @param notificationId id of notification
+     */
+    private fun cancelLibraryUpdate(context: Context, notificationId: Int) {
+        LibraryUpdateService.stop(context)
+        Handler().post { dismissNotification(context, notificationId) }
+    }
+
+    companion object {
+        private const val NAME = "NotificationReceiver"
+
+        // Called to launch share intent.
+        private const val ACTION_SHARE_IMAGE = "$ID.$NAME.SHARE_IMAGE"
+
+        // Called to delete image.
+        private const val ACTION_DELETE_IMAGE = "$ID.$NAME.DELETE_IMAGE"
+
+        // Called to cancel library update.
+        private const val ACTION_CANCEL_LIBRARY_UPDATE = "$ID.$NAME.CANCEL_LIBRARY_UPDATE"
+
+        // Called to open chapter
+        private const val ACTION_OPEN_CHAPTER = "$ID.$NAME.ACTION_OPEN_CHAPTER"
+
+        // Value containing file location.
+        private const val EXTRA_FILE_LOCATION = "$ID.$NAME.FILE_LOCATION"
+
+        // Called to resume downloads.
+        private const val ACTION_RESUME_DOWNLOADS = "$ID.$NAME.ACTION_RESUME_DOWNLOADS"
+
+        // Called to clear downloads.
+        private const val ACTION_CLEAR_DOWNLOADS = "$ID.$NAME.ACTION_CLEAR_DOWNLOADS"
+
+        // Called to dismiss notification.
+        private const val ACTION_DISMISS_NOTIFICATION = "$ID.$NAME.ACTION_DISMISS_NOTIFICATION"
+
+        // Value containing notification id.
+        private const val EXTRA_NOTIFICATION_ID = "$ID.$NAME.NOTIFICATION_ID"
+
+        // Value containing manga id.
+        private const val EXTRA_MANGA_ID = "$ID.$NAME.EXTRA_MANGA_ID"
+
+        // Value containing chapter id.
+        private const val EXTRA_CHAPTER_ID = "$ID.$NAME.EXTRA_CHAPTER_ID"
+
+        /**
+         * Returns a [PendingIntent] that resumes the download of a chapter
+         *
+         * @param context context of application
+         * @return [PendingIntent]
+         */
+        internal fun resumeDownloadsPendingBroadcast(context: Context): PendingIntent {
+            val intent = Intent(context, NotificationReceiver::class.java).apply {
+                action = ACTION_RESUME_DOWNLOADS
+            }
+            return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+        }
+
+        /**
+         * Returns a [PendingIntent] that clears the download queue
+         *
+         * @param context context of application
+         * @return [PendingIntent]
+         */
+        internal fun clearDownloadsPendingBroadcast(context: Context): PendingIntent {
+            val intent = Intent(context, NotificationReceiver::class.java).apply {
+                action = ACTION_CLEAR_DOWNLOADS
+            }
+            return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+        }
+
+        /**
+         * Returns [PendingIntent] that starts a service which dismissed the notification
+         *
+         * @param context context of application
+         * @param notificationId id of notification
+         * @return [PendingIntent]
+         */
+        internal fun dismissNotificationPendingBroadcast(context: Context, notificationId: Int): PendingIntent {
+            val intent = Intent(context, NotificationReceiver::class.java).apply {
+                action = ACTION_DISMISS_NOTIFICATION
+                putExtra(EXTRA_NOTIFICATION_ID, notificationId)
+            }
+            return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+        }
+
+        /**
+         * Returns [PendingIntent] that starts a service which cancels the notification and starts a share activity
+         *
+         * @param context context of application
+         * @param path location path of file
+         * @param notificationId id of notification
+         * @return [PendingIntent]
+         */
+        internal fun shareImagePendingBroadcast(context: Context, path: String, notificationId: Int): PendingIntent {
+            val intent = Intent(context, NotificationReceiver::class.java).apply {
+                action = ACTION_SHARE_IMAGE
+                putExtra(EXTRA_FILE_LOCATION, path)
+                putExtra(EXTRA_NOTIFICATION_ID, notificationId)
+            }
+            return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+        }
+
+        /**
+         * Returns [PendingIntent] that starts a service which removes an image from disk
+         *
+         * @param context context of application
+         * @param path location path of file
+         * @param notificationId id of notification
+         * @return [PendingIntent]
+         */
+        internal fun deleteImagePendingBroadcast(context: Context, path: String, notificationId: Int): PendingIntent {
+            val intent = Intent(context, NotificationReceiver::class.java).apply {
+                action = ACTION_DELETE_IMAGE
+                putExtra(EXTRA_FILE_LOCATION, path)
+                putExtra(EXTRA_NOTIFICATION_ID, notificationId)
+            }
+            return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+        }
+
+        /**
+         * Returns [PendingIntent] that start a reader activity containing chapter.
+         *
+         * @param context context of application
+         * @param manga manga of chapter
+         * @param chapter chapter that needs to be opened
+         */
+        internal fun openChapterPendingBroadcast(context: Context, manga: Manga, chapter: Chapter): PendingIntent {
+            val intent = Intent(context, NotificationReceiver::class.java).apply {
+                action = ACTION_OPEN_CHAPTER
+                putExtra(EXTRA_MANGA_ID, manga.id)
+                putExtra(EXTRA_CHAPTER_ID, chapter.id)
+            }
+            return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+        }
+
+        /**
+         * Returns [PendingIntent] that starts a service which stops the library update
+         *
+         * @param context context of application
+         * @return [PendingIntent]
+         */
+        internal fun cancelLibraryUpdatePendingBroadcast(context: Context): PendingIntent {
+            val intent = Intent(context, NotificationReceiver::class.java).apply {
+                action = ACTION_CANCEL_LIBRARY_UPDATE
+            }
+            return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+        }
+    }
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
@ -1,106 +1,118 @@
-package eu.kanade.tachiyomi.data.preference
-
-import android.content.Context
-import eu.kanade.tachiyomi.R
-
-/**
- * This class stores the keys for the preferences in the application. Most of them are defined
- * in the file "keys.xml". By using this class we can define preferences in one place and get them
- * referenced here.
- */
-@Suppress("HasPlatformType")
-class PreferenceKeys(context: Context) {
-
-    val theme = context.getString(R.string.pref_theme_key)
-
-    val rotation = context.getString(R.string.pref_rotation_type_key)
-
-    val enableTransitions = context.getString(R.string.pref_enable_transitions_key)
-
-    val showPageNumber = context.getString(R.string.pref_show_page_number_key)
-
-    val fullscreen = context.getString(R.string.pref_fullscreen_key)
-
-    val keepScreenOn = context.getString(R.string.pref_keep_screen_on_key)
-
-    val customBrightness = context.getString(R.string.pref_custom_brightness_key)
-
-    val customBrightnessValue = context.getString(R.string.pref_custom_brightness_value_key)
-
-    val colorFilter = context.getString(R.string.pref_color_filter_key)
-
-    val colorFilterValue = context.getString(R.string.pref_color_filter_value_key)
-
-    val defaultViewer = context.getString(R.string.pref_default_viewer_key)
-
-    val imageScaleType = context.getString(R.string.pref_image_scale_type_key)
-
-    val imageDecoder = context.getString(R.string.pref_image_decoder_key)
-
-    val zoomStart = context.getString(R.string.pref_zoom_start_key)
-
-    val readerTheme = context.getString(R.string.pref_reader_theme_key)
-
-    val readWithTapping = context.getString(R.string.pref_read_with_tapping_key)
-
-    val readWithVolumeKeys = context.getString(R.string.pref_read_with_volume_keys_key)
-
-    val portraitColumns = context.getString(R.string.pref_library_columns_portrait_key)
-
-    val landscapeColumns = context.getString(R.string.pref_library_columns_landscape_key)
-
-    val updateOnlyNonCompleted = context.getString(R.string.pref_update_only_non_completed_key)
-
-    val autoUpdateMangaSync = context.getString(R.string.pref_auto_update_manga_sync_key)
-
-    val askUpdateMangaSync = context.getString(R.string.pref_ask_update_manga_sync_key)
-
-    val lastUsedCatalogueSource = context.getString(R.string.pref_last_catalogue_source_key)
-
-    val lastUsedCategory = context.getString(R.string.pref_last_used_category_key)
-
-    val catalogueAsList = context.getString(R.string.pref_display_catalogue_as_list)
-
-    val enabledLanguages = context.getString(R.string.pref_source_languages)
-
-    val downloadsDirectory = context.getString(R.string.pref_download_directory_key)
-
-    val downloadThreads = context.getString(R.string.pref_download_slots_key)
-
-    val downloadOnlyOverWifi = context.getString(R.string.pref_download_only_over_wifi_key)
-
-    val removeAfterReadSlots = context.getString(R.string.pref_remove_after_read_slots_key)
-
-    val removeAfterMarkedAsRead = context.getString(R.string.pref_remove_after_marked_as_read_key)
-
-    val libraryUpdateInterval = context.getString(R.string.pref_library_update_interval_key)
-
-    val libraryUpdateRestriction = context.getString(R.string.pref_library_update_restriction_key)
-
-    val libraryUpdateCategories = context.getString(R.string.pref_library_update_categories_key)
-
-    val filterDownloaded = context.getString(R.string.pref_filter_downloaded_key)
-
-    val filterUnread = context.getString(R.string.pref_filter_unread_key)
-
-    val librarySortingMode = context.getString(R.string.pref_library_sorting_mode_key)
-
-    val automaticUpdates = context.getString(R.string.pref_enable_automatic_updates_key)
-
-    val startScreen = context.getString(R.string.pref_start_screen_key)
-
-    val downloadNew = context.getString(R.string.pref_download_new_key)
-
-    fun sourceUsername(sourceId: Int) = "pref_source_username_$sourceId"
-
-    fun sourcePassword(sourceId: Int) = "pref_source_password_$sourceId"
-
-    fun syncUsername(syncId: Int) = "pref_mangasync_username_$syncId"
-
-    fun syncPassword(syncId: Int) = "pref_mangasync_password_$syncId"
-
-    val libraryAsList = context.getString(R.string.pref_display_library_as_list)
-
-    val lang = context.getString(R.string.pref_language_key)
-
-}
+package eu.kanade.tachiyomi.data.preference
+
+/**
+ * This class stores the keys for the preferences in the application.
+ */
+object PreferenceKeys {
+
+    const val theme = "pref_theme_key"
+
+    const val rotation = "pref_rotation_type_key"
+
+    const val enableTransitions = "pref_enable_transitions_key"
+
+    const val showPageNumber = "pref_show_page_number_key"
+
+    const val fullscreen = "fullscreen"
+
+    const val keepScreenOn = "pref_keep_screen_on_key"
+
+    const val customBrightness = "pref_custom_brightness_key"
+
+    const val customBrightnessValue = "custom_brightness_value"
+
+    const val colorFilter = "pref_color_filter_key"
+
+    const val colorFilterValue = "color_filter_value"
+
+    const val defaultViewer = "pref_default_viewer_key"
+
+    const val imageScaleType = "pref_image_scale_type_key"
+
+    const val imageDecoder = "image_decoder"
+
+    const val zoomStart = "pref_zoom_start_key"
+
+    const val readerTheme = "pref_reader_theme_key"
+
+    const val cropBorders = "crop_borders"
+
+    const val readWithTapping = "reader_tap"
+
+    const val readWithVolumeKeys = "reader_volume_keys"
+
+    const val readWithVolumeKeysInverted = "reader_volume_keys_inverted"
+
+    const val portraitColumns = "pref_library_columns_portrait_key"
+
+    const val landscapeColumns = "pref_library_columns_landscape_key"
+
+    const val updateOnlyNonCompleted = "pref_update_only_non_completed_key"
+
+    const val autoUpdateTrack = "pref_auto_update_manga_sync_key"
+
+    const val askUpdateTrack = "pref_ask_update_manga_sync_key"
+
+    const val lastUsedCatalogueSource = "last_catalogue_source"
+
+    const val lastUsedCategory = "last_used_category"
+
+    const val catalogueAsList = "pref_display_catalogue_as_list"
+
+    const val enabledLanguages = "source_languages"
+
+    const val backupDirectory = "backup_directory"
+
+    const val downloadsDirectory = "download_directory"
+
+    const val downloadThreads = "pref_download_slots_key"
+
+    const val downloadOnlyOverWifi = "pref_download_only_over_wifi_key"
+
+    const val numberOfBackups = "backup_slots"
+
+    const val backupInterval = "backup_interval"
+
+    const val removeAfterReadSlots = "remove_after_read_slots"
+
+    const val removeAfterMarkedAsRead = "pref_remove_after_marked_as_read_key"
+
+    const val libraryUpdateInterval = "pref_library_update_interval_key"
+
+    const val libraryUpdateRestriction = "library_update_restriction"
+
+    const val libraryUpdateCategories = "library_update_categories"
+
+    const val filterDownloaded = "pref_filter_downloaded_key"
+
+    const val filterUnread = "pref_filter_unread_key"
+
+    const val filterCompleted = "pref_filter_completed_key"
+
+    const val librarySortingMode = "library_sorting_mode"
+
+    const val automaticUpdates = "automatic_updates"
+
+    const val startScreen = "start_screen"
+
+    const val downloadNew = "download_new"
+
+    const val downloadNewCategories = "download_new_categories"
+
+    const val libraryAsList = "pref_display_library_as_list"
+
+    const val lang = "app_language"
+
+    const val defaultCategory = "default_category"
+
+    fun sourceUsername(sourceId: Long) = "pref_source_username_$sourceId"
+
+    fun sourcePassword(sourceId: Long) = "pref_source_password_$sourceId"
+
+    fun trackUsername(syncId: Int) = "pref_mangasync_username_$syncId"
+
+    fun trackPassword(syncId: Int) = "pref_mangasync_password_$syncId"
+
+    fun trackToken(syncId: Int) = "track_token_$syncId"
+
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
@ -7,17 +7,16 @@ import android.preference.PreferenceManager
 import com.f2prateek.rx.preferences.Preference
 import com.f2prateek.rx.preferences.RxSharedPreferences
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.data.mangasync.MangaSyncService
-import eu.kanade.tachiyomi.data.source.Source
+import eu.kanade.tachiyomi.data.track.TrackService
+import eu.kanade.tachiyomi.source.Source
 import java.io.File
+import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys

 fun <T> Preference<T>.getOrDefault(): T = get() ?: defaultValue()!!

 fun Preference<Boolean>.invert(): Boolean = getOrDefault().let { set(!it); !it }

-class PreferencesHelper(context: Context) {
-
-    val keys = PreferenceKeys(context)
+class PreferencesHelper(val context: Context) {

    private val prefs = PreferenceManager.getDefaultSharedPreferences(context)
    private val rxPrefs = RxSharedPreferences.create(prefs)
@ -26,118 +25,142 @@ class PreferencesHelper(context: Context) {
            File(Environment.getExternalStorageDirectory().absolutePath + File.separator +
                    context.getString(R.string.app_name), "downloads"))

-    fun startScreen() = prefs.getInt(keys.startScreen, 1)
+    private val defaultBackupDir = Uri.fromFile(
+            File(Environment.getExternalStorageDirectory().absolutePath + File.separator +
+                    context.getString(R.string.app_name), "backup"))
+
+    fun startScreen() = prefs.getInt(Keys.startScreen, 1)

    fun clear() = prefs.edit().clear().apply()

-    fun theme() = prefs.getInt(keys.theme, 1)
+    fun theme() = prefs.getInt(Keys.theme, 1)

-    fun rotation() = rxPrefs.getInteger(keys.rotation, 1)
+    fun rotation() = rxPrefs.getInteger(Keys.rotation, 1)

-    fun enableTransitions() = rxPrefs.getBoolean(keys.enableTransitions, true)
+    fun pageTransitions() = rxPrefs.getBoolean(Keys.enableTransitions, true)

-    fun showPageNumber() = rxPrefs.getBoolean(keys.showPageNumber, true)
+    fun showPageNumber() = rxPrefs.getBoolean(Keys.showPageNumber, true)

-    fun fullscreen() = rxPrefs.getBoolean(keys.fullscreen, true)
+    fun fullscreen() = rxPrefs.getBoolean(Keys.fullscreen, true)

-    fun keepScreenOn() = rxPrefs.getBoolean(keys.keepScreenOn, true)
+    fun keepScreenOn() = rxPrefs.getBoolean(Keys.keepScreenOn, true)

-    fun customBrightness() = rxPrefs.getBoolean(keys.customBrightness, false)
+    fun customBrightness() = rxPrefs.getBoolean(Keys.customBrightness, false)

-    fun customBrightnessValue() = rxPrefs.getInteger(keys.customBrightnessValue, 0)
+    fun customBrightnessValue() = rxPrefs.getInteger(Keys.customBrightnessValue, 0)

-    fun colorFilter() = rxPrefs.getBoolean(keys.colorFilter, false)
+    fun colorFilter() = rxPrefs.getBoolean(Keys.colorFilter, false)

-    fun colorFilterValue() = rxPrefs.getInteger(keys.colorFilterValue, 0)
+    fun colorFilterValue() = rxPrefs.getInteger(Keys.colorFilterValue, 0)

-    fun defaultViewer() = prefs.getInt(keys.defaultViewer, 1)
+    fun defaultViewer() = prefs.getInt(Keys.defaultViewer, 1)

-    fun imageScaleType() = rxPrefs.getInteger(keys.imageScaleType, 1)
+    fun imageScaleType() = rxPrefs.getInteger(Keys.imageScaleType, 1)

-    fun imageDecoder() = rxPrefs.getInteger(keys.imageDecoder, 0)
+    fun imageDecoder() = rxPrefs.getInteger(Keys.imageDecoder, 0)

-    fun zoomStart() = rxPrefs.getInteger(keys.zoomStart, 1)
+    fun zoomStart() = rxPrefs.getInteger(Keys.zoomStart, 1)

-    fun readerTheme() = rxPrefs.getInteger(keys.readerTheme, 0)
+    fun readerTheme() = rxPrefs.getInteger(Keys.readerTheme, 0)

-    fun readWithTapping() = rxPrefs.getBoolean(keys.readWithTapping, true)
+    fun cropBorders() = rxPrefs.getBoolean(Keys.cropBorders, false)

-    fun readWithVolumeKeys() = rxPrefs.getBoolean(keys.readWithVolumeKeys, false)
+    fun readWithTapping() = rxPrefs.getBoolean(Keys.readWithTapping, true)

-    fun portraitColumns() = rxPrefs.getInteger(keys.portraitColumns, 0)
+    fun readWithVolumeKeys() = rxPrefs.getBoolean(Keys.readWithVolumeKeys, false)

-    fun landscapeColumns() = rxPrefs.getInteger(keys.landscapeColumns, 0)
+    fun readWithVolumeKeysInverted() = rxPrefs.getBoolean(Keys.readWithVolumeKeysInverted, false)

-    fun updateOnlyNonCompleted() = prefs.getBoolean(keys.updateOnlyNonCompleted, false)
+    fun portraitColumns() = rxPrefs.getInteger(Keys.portraitColumns, 0)

-    fun autoUpdateMangaSync() = prefs.getBoolean(keys.autoUpdateMangaSync, true)
+    fun landscapeColumns() = rxPrefs.getInteger(Keys.landscapeColumns, 0)

-    fun askUpdateMangaSync() = prefs.getBoolean(keys.askUpdateMangaSync, false)
+    fun updateOnlyNonCompleted() = prefs.getBoolean(Keys.updateOnlyNonCompleted, false)

-    fun lastUsedCatalogueSource() = rxPrefs.getInteger(keys.lastUsedCatalogueSource, -1)
+    fun autoUpdateTrack() = prefs.getBoolean(Keys.autoUpdateTrack, true)

-    fun lastUsedCategory() = rxPrefs.getInteger(keys.lastUsedCategory, 0)
+    fun askUpdateTrack() = prefs.getBoolean(Keys.askUpdateTrack, false)
+
+    fun lastUsedCatalogueSource() = rxPrefs.getLong(Keys.lastUsedCatalogueSource, -1)
+
+    fun lastUsedCategory() = rxPrefs.getInteger(Keys.lastUsedCategory, 0)

    fun lastVersionCode() = rxPrefs.getInteger("last_version_code", 0)

-    fun catalogueAsList() = rxPrefs.getBoolean(keys.catalogueAsList, false)
+    fun catalogueAsList() = rxPrefs.getBoolean(Keys.catalogueAsList, false)

-    fun enabledLanguages() = rxPrefs.getStringSet(keys.enabledLanguages, setOf("EN"))
+    fun enabledLanguages() = rxPrefs.getStringSet(Keys.enabledLanguages, setOf("en"))

-    fun sourceUsername(source: Source) = prefs.getString(keys.sourceUsername(source.id), "")
+    fun sourceUsername(source: Source) = prefs.getString(Keys.sourceUsername(source.id), "")

-    fun sourcePassword(source: Source) = prefs.getString(keys.sourcePassword(source.id), "")
+    fun sourcePassword(source: Source) = prefs.getString(Keys.sourcePassword(source.id), "")

    fun setSourceCredentials(source: Source, username: String, password: String) {
        prefs.edit()
-                .putString(keys.sourceUsername(source.id), username)
-                .putString(keys.sourcePassword(source.id), password)
+                .putString(Keys.sourceUsername(source.id), username)
+                .putString(Keys.sourcePassword(source.id), password)
                .apply()
    }

-    fun mangaSyncUsername(sync: MangaSyncService) = prefs.getString(keys.syncUsername(sync.id), "")
+    fun trackUsername(sync: TrackService) = prefs.getString(Keys.trackUsername(sync.id), "")

-    fun mangaSyncPassword(sync: MangaSyncService) = prefs.getString(keys.syncPassword(sync.id), "")
+    fun trackPassword(sync: TrackService) = prefs.getString(Keys.trackPassword(sync.id), "")

-    fun setMangaSyncCredentials(sync: MangaSyncService, username: String, password: String) {
+    fun setTrackCredentials(sync: TrackService, username: String, password: String) {
        prefs.edit()
-                .putString(keys.syncUsername(sync.id), username)
-                .putString(keys.syncPassword(sync.id), password)
+                .putString(Keys.trackUsername(sync.id), username)
+                .putString(Keys.trackPassword(sync.id), password)
                .apply()
    }

-    fun downloadsDirectory() = rxPrefs.getString(keys.downloadsDirectory, defaultDownloadsDir.toString())
+    fun trackToken(sync: TrackService) = rxPrefs.getString(Keys.trackToken(sync.id), "")

-    fun downloadThreads() = rxPrefs.getInteger(keys.downloadThreads, 1)
+    fun anilistScoreType() = rxPrefs.getInteger("anilist_score_type", 0)

-    fun downloadOnlyOverWifi() = prefs.getBoolean(keys.downloadOnlyOverWifi, true)
+    fun backupsDirectory() = rxPrefs.getString(Keys.backupDirectory, defaultBackupDir.toString())

-    fun removeAfterReadSlots() = prefs.getInt(keys.removeAfterReadSlots, -1)
+    fun downloadsDirectory() = rxPrefs.getString(Keys.downloadsDirectory, defaultDownloadsDir.toString())

-    fun removeAfterMarkedAsRead() = prefs.getBoolean(keys.removeAfterMarkedAsRead, false)
+    fun downloadThreads() = rxPrefs.getInteger(Keys.downloadThreads, 1)

-    fun libraryUpdateInterval() = rxPrefs.getInteger(keys.libraryUpdateInterval, 0)
+    fun downloadOnlyOverWifi() = prefs.getBoolean(Keys.downloadOnlyOverWifi, true)

-    fun libraryUpdateRestriction() = prefs.getStringSet(keys.libraryUpdateRestriction, emptySet())
+    fun numberOfBackups() = rxPrefs.getInteger(Keys.numberOfBackups, 1)

-    fun libraryUpdateCategories() = rxPrefs.getStringSet(keys.libraryUpdateCategories, emptySet())
+    fun backupInterval() = rxPrefs.getInteger(Keys.backupInterval, 0)

-    fun libraryAsList() = rxPrefs.getBoolean(keys.libraryAsList, false)
+    fun removeAfterReadSlots() = prefs.getInt(Keys.removeAfterReadSlots, -1)

-    fun filterDownloaded() = rxPrefs.getBoolean(keys.filterDownloaded, false)
+    fun removeAfterMarkedAsRead() = prefs.getBoolean(Keys.removeAfterMarkedAsRead, false)

-    fun filterUnread() = rxPrefs.getBoolean(keys.filterUnread, false)
+    fun libraryUpdateInterval() = rxPrefs.getInteger(Keys.libraryUpdateInterval, 0)

-    fun librarySortingMode() = rxPrefs.getInteger(keys.librarySortingMode, 0)
+    fun libraryUpdateRestriction() = prefs.getStringSet(Keys.libraryUpdateRestriction, emptySet())
+
+    fun libraryUpdateCategories() = rxPrefs.getStringSet(Keys.libraryUpdateCategories, emptySet())
+
+    fun libraryAsList() = rxPrefs.getBoolean(Keys.libraryAsList, false)
+
+    fun filterDownloaded() = rxPrefs.getBoolean(Keys.filterDownloaded, false)
+
+    fun filterUnread() = rxPrefs.getBoolean(Keys.filterUnread, false)
+
+    fun filterCompleted() = rxPrefs.getBoolean(Keys.filterCompleted, false)
+
+    fun librarySortingMode() = rxPrefs.getInteger(Keys.librarySortingMode, 0)

    fun librarySortingAscending() = rxPrefs.getBoolean("library_sorting_ascending", true)

-    fun automaticUpdates() = prefs.getBoolean(keys.automaticUpdates, false)
+    fun automaticUpdates() = prefs.getBoolean(Keys.automaticUpdates, false)

    fun hiddenCatalogues() = rxPrefs.getStringSet("hidden_catalogues", emptySet())

-    fun downloadNew() = prefs.getBoolean(keys.downloadNew, false)
+    fun downloadNew() = rxPrefs.getBoolean(Keys.downloadNew, false)

-    fun lang() = prefs.getInt(keys.lang, 0)
+    fun downloadNewCategories() = rxPrefs.getStringSet(Keys.downloadNewCategories, emptySet())
+
+    fun lang() = prefs.getString(Keys.lang, "")
+
+    fun defaultCategory() = prefs.getInt(Keys.defaultCategory, -1)

 }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/source/Language.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/Language.kt
@ -1,9 +0,0 @@
-package eu.kanade.tachiyomi.data.source
-
-class Language(val code: String, val lang: String)
-
-val DE = Language("DE", "German")
-val EN = Language("EN", "English")
-val RU = Language("RU", "Russian")
-
-fun getLanguages() = listOf(DE, EN, RU)
--- a/app/src/main/java/eu/kanade/tachiyomi/data/source/SourceManager.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/SourceManager.kt
@ -1,61 +0,0 @@
-package eu.kanade.tachiyomi.data.source
-
-import android.Manifest.permission.READ_EXTERNAL_STORAGE
-import android.content.Context
-import android.os.Environment
-import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.data.source.online.OnlineSource
-import eu.kanade.tachiyomi.data.source.online.YamlOnlineSource
-import eu.kanade.tachiyomi.data.source.online.english.*
-import eu.kanade.tachiyomi.data.source.online.german.WieManga
-import eu.kanade.tachiyomi.data.source.online.russian.Mangachan
-import eu.kanade.tachiyomi.data.source.online.russian.Mintmanga
-import eu.kanade.tachiyomi.data.source.online.russian.Readmanga
-import eu.kanade.tachiyomi.util.hasPermission
-import org.yaml.snakeyaml.Yaml
-import timber.log.Timber
-import java.io.File
-
-open class SourceManager(private val context: Context) {
-
-    private val sourcesMap = createSources()
-
-    open fun get(sourceKey: Int): Source? {
-        return sourcesMap[sourceKey]
-    }
-
-    fun getOnlineSources() = sourcesMap.values.filterIsInstance(OnlineSource::class.java)
-
-    private fun createOnlineSourceList(): List<Source> = listOf(
-            Batoto(1),
-            Mangahere(2),
-            Mangafox(3),
-            Kissmanga(4),
-            Readmanga(5),
-            Mintmanga(6),
-            Mangachan(7),
-            Readmangatoday(8),
-            Mangasee(9),
-            WieManga(10)
-    )
-
-    private fun createSources(): Map<Int, Source> = hashMapOf<Int, Source>().apply {
-        createOnlineSourceList().forEach { put(it.id, it) }
-
-        val parsersDir = File(Environment.getExternalStorageDirectory().absolutePath +
-                File.separator + context.getString(R.string.app_name), "parsers")
-
-        if (parsersDir.exists() && context.hasPermission(READ_EXTERNAL_STORAGE)) {
-            val yaml = Yaml()
-            for (file in parsersDir.listFiles().filter { it.extension == "yml" }) {
-                try {
-                    val map = file.inputStream().use { yaml.loadAs(it, Map::class.java) }
-                    YamlOnlineSource(map).let { put(it.id, it) }
-                } catch (e: Exception) {
-                    Timber.e("Error loading source from file. Bad format?")
-                }
-            }
-        }
-    }
-
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/source/model/MangasPage.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/model/MangasPage.kt
@ -1,13 +0,0 @@
-package eu.kanade.tachiyomi.data.source.model
-
-import eu.kanade.tachiyomi.data.database.models.Manga
-
-class MangasPage(val page: Int) {
-
-    val mangas: MutableList<Manga> = mutableListOf()
-
-    lateinit var url: String
-
-    var nextPageUrl: String? = null
-
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/source/online/OnlineSource.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/online/OnlineSource.kt
@ -1,470 +0,0 @@
-package eu.kanade.tachiyomi.data.source.online
-
-import android.net.Uri
-import eu.kanade.tachiyomi.data.cache.ChapterCache
-import eu.kanade.tachiyomi.data.database.models.Chapter
-import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.network.GET
-import eu.kanade.tachiyomi.data.network.NetworkHelper
-import eu.kanade.tachiyomi.data.network.asObservableSuccess
-import eu.kanade.tachiyomi.data.network.newCallWithProgress
-import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.data.source.Language
-import eu.kanade.tachiyomi.data.source.Source
-import eu.kanade.tachiyomi.data.source.model.MangasPage
-import eu.kanade.tachiyomi.data.source.model.Page
-import eu.kanade.tachiyomi.util.UrlUtil
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
-import rx.Observable
-import uy.kohesive.injekt.injectLazy
-
-/**
- * A simple implementation for sources from a website.
- */
-abstract class OnlineSource() : Source {
-
-    /**
-     * Network service.
-     */
-    val network: NetworkHelper by injectLazy()
-
-    /**
-     * Chapter cache.
-     */
-    val chapterCache: ChapterCache by injectLazy()
-
-    /**
-     * Preferences helper.
-     */
-    val preferences: PreferencesHelper by injectLazy()
-
-    /**
-     * Base url of the website without the trailing slash, like: http://mysite.com
-     */
-    abstract val baseUrl: String
-
-    /**
-     * Language of the source.
-     */
-    abstract val lang: Language
-
-    /**
-     * Whether the source has support for latest updates.
-     */
-    abstract val supportsLatest : Boolean
-
-    /**
-     * Headers used for requests.
-     */
-    val headers by lazy { headersBuilder().build() }
-
-    /**
-     * Genre filters.
-     */
-    val filters by lazy { getFilterList() }
-
-    /**
-     * Default network client for doing requests.
-     */
-    open val client: OkHttpClient
-        get() = network.client
-
-    /**
-     * Headers builder for requests. Implementations can override this method for custom headers.
-     */
-    open protected fun headersBuilder() = Headers.Builder().apply {
-        add("User-Agent", "Mozilla/5.0 (Windows NT 6.3; WOW64)")
-    }
-
-    /**
-     * Visible name of the source.
-     */
-    override fun toString() = "$name (${lang.code})"
-
-    /**
-     * Returns an observable containing a page with a list of manga. Normally it's not needed to
-     * override this method.
-     *
-     * @param page the page object where the information will be saved, like the list of manga,
-     *             the current page and the next page url.
-     */
-    open fun fetchPopularManga(page: MangasPage): Observable<MangasPage> = client
-            .newCall(popularMangaRequest(page))
-            .asObservableSuccess()
-            .map { response ->
-                popularMangaParse(response, page)
-                page
-            }
-
-    /**
-     * Returns the request for the popular manga given the page. Override only if it's needed to
-     * send different headers or request method like POST.
-     *
-     * @param page the page object.
-     */
-    open protected fun popularMangaRequest(page: MangasPage): Request {
-        if (page.page == 1) {
-            page.url = popularMangaInitialUrl()
-        }
-        return GET(page.url, headers)
-    }
-
-    /**
-     * Returns the absolute url of the first page to popular manga.
-     */
-    abstract protected fun popularMangaInitialUrl(): String
-
-    /**
-     * Parse the response from the site. It should add a list of manga and the absolute url to the
-     * next page (if it has a next one) to [page].
-     *
-     * @param response the response from the site.
-     * @param page the page object to be filled.
-     */
-    abstract protected fun popularMangaParse(response: Response, page: MangasPage)
-
-    /**
-     * Returns an observable containing a page with a list of manga. Normally it's not needed to
-     * override this method.
-     *
-     * @param page the page object where the information will be saved, like the list of manga,
-     *             the current page and the next page url.
-     * @param query the search query.
-     */
-    open fun fetchSearchManga(page: MangasPage, query: String, filters: List<Filter>): Observable<MangasPage> = client
-            .newCall(searchMangaRequest(page, query, filters))
-            .asObservableSuccess()
-            .map { response ->
-                searchMangaParse(response, page, query, filters)
-                page
-            }
-
-    /**
-     * Returns the request for the search manga given the page. Override only if it's needed to
-     * send different headers or request method like POST.
-     *
-     * @param page the page object.
-     * @param query the search query.
-     */
-    open protected fun searchMangaRequest(page: MangasPage, query: String, filters: List<Filter>): Request {
-        if (page.page == 1) {
-            page.url = searchMangaInitialUrl(query, filters)
-        }
-        return GET(page.url, headers)
-    }
-
-    /**
-     * Returns the absolute url of the first page to popular manga.
-     *
-     * @param query the search query.
-     */
-    abstract protected fun searchMangaInitialUrl(query: String, filters: List<Filter>): String
-
-    /**
-     * Parse the response from the site. It should add a list of manga and the absolute url to the
-     * next page (if it has a next one) to [page].
-     *
-     * @param response the response from the site.
-     * @param page the page object to be filled.
-     * @param query the search query.
-     */
-    abstract protected fun searchMangaParse(response: Response, page: MangasPage, query: String, filters: List<Filter>)
-
-    /**
-     * Returns an observable containing a page with a list of latest manga.
-     */
-    open fun fetchLatestUpdates(page: MangasPage): Observable<MangasPage> = client
-            .newCall(latestUpdatesRequest(page))
-            .asObservableSuccess()
-            .map { response ->
-                latestUpdatesParse(response, page)
-                page
-            }
-
-    /**
-     * Returns the request for latest manga given the page.
-     */
-    open protected fun latestUpdatesRequest(page: MangasPage): Request {
-        if (page.page == 1) {
-            page.url = latestUpdatesInitialUrl()
-        }
-        return GET(page.url, headers)
-    }
-
-    /**
-     * Returns the absolute url of the first page to latest manga.
-     */
-    abstract protected fun latestUpdatesInitialUrl(): String
-
-    /**
-     * Same as [popularMangaParse], but for latest manga.
-     */
-    abstract protected fun latestUpdatesParse(response: Response, page: MangasPage)
-
-    /**
-     * Returns an observable with the updated details for a manga. Normally it's not needed to
-     * override this method.
-     *
-     * @param manga the manga to be updated.
-     */
-    override fun fetchMangaDetails(manga: Manga): Observable<Manga> = client
-            .newCall(mangaDetailsRequest(manga))
-            .asObservableSuccess()
-            .map { response ->
-                Manga.create(manga.url, id).apply {
-                    mangaDetailsParse(response, this)
-                    initialized = true
-                }
-            }
-
-    /**
-     * Returns the request for updating a manga. Override only if it's needed to override the url,
-     * send different headers or request method like POST.
-     *
-     * @param manga the manga to be updated.
-     */
-    open fun mangaDetailsRequest(manga: Manga): Request {
-        return GET(baseUrl + manga.url, headers)
-    }
-
-    /**
-     * Parse the response from the site. It should fill [manga].
-     *
-     * @param response the response from the site.
-     * @param manga the manga whose fields have to be filled.
-     */
-    abstract protected fun mangaDetailsParse(response: Response, manga: Manga)
-
-    /**
-     * Returns an observable with the updated chapter list for a manga. Normally it's not needed to
-     * override this method.
-     *
-     * @param manga the manga to look for chapters.
-     */
-    override fun fetchChapterList(manga: Manga): Observable<List<Chapter>> = client
-            .newCall(chapterListRequest(manga))
-            .asObservableSuccess()
-            .map { response ->
-                mutableListOf<Chapter>().apply {
-                    chapterListParse(response, this)
-                    if (isEmpty()) {
-                        throw Exception("No chapters found")
-                    }
-                }
-            }
-
-    /**
-     * Returns the request for updating the chapter list. Override only if it's needed to override
-     * the url, send different headers or request method like POST.
-     *
-     * @param manga the manga to look for chapters.
-     */
-    open protected fun chapterListRequest(manga: Manga): Request {
-        return GET(baseUrl + manga.url, headers)
-    }
-
-    /**
-     * Parse the response from the site. It should fill [chapters].
-     *
-     * @param response the response from the site.
-     * @param chapters the chapter list to be filled.
-     */
-    abstract protected fun chapterListParse(response: Response, chapters: MutableList<Chapter>)
-
-    /**
-     * Returns an observable with the page list for a chapter. It tries to return the page list from
-     * the local cache, otherwise fallbacks to network calling [fetchPageListFromNetwork].
-     *
-     * @param chapter the chapter whose page list has to be fetched.
-     */
-    final override fun fetchPageList(chapter: Chapter): Observable<List<Page>> = chapterCache
-            .getPageListFromCache(getChapterCacheKey(chapter))
-            .onErrorResumeNext { fetchPageListFromNetwork(chapter) }
-
-    /**
-     * Returns an observable with the page list for a chapter. Normally it's not needed to override
-     * this method.
-     *
-     * @param chapter the chapter whose page list has to be fetched.
-     */
-    open fun fetchPageListFromNetwork(chapter: Chapter): Observable<List<Page>> = client
-            .newCall(pageListRequest(chapter))
-            .asObservableSuccess()
-            .map { response ->
-                mutableListOf<Page>().apply {
-                    pageListParse(response, this)
-                    if (isEmpty()) {
-                        throw Exception("Page list is empty")
-                    }
-                }
-            }
-
-    /**
-     * Returns the request for getting the page list. Override only if it's needed to override the
-     * url, send different headers or request method like POST.
-     *
-     * @param chapter the chapter whose page list has to be fetched
-     */
-    open protected fun pageListRequest(chapter: Chapter): Request {
-        return GET(baseUrl + chapter.url, headers)
-    }
-
-    /**
-     * Parse the response from the site. It should fill [pages].
-     *
-     * @param response the response from the site.
-     * @param pages the page list to be filled.
-     */
-    abstract protected fun pageListParse(response: Response, pages: MutableList<Page>)
-
-    /**
-     * Returns the key for the page list to be stored in [ChapterCache].
-     */
-    private fun getChapterCacheKey(chapter: Chapter) = "$id${chapter.url}"
-
-    /**
-     * Returns an observable with the page containing the source url of the image. If there's any
-     * error, it will return null instead of throwing an exception.
-     *
-     * @param page the page whose source image has to be fetched.
-     */
-    open protected fun fetchImageUrl(page: Page): Observable<Page> {
-        page.status = Page.LOAD_PAGE
-        return client
-                .newCall(imageUrlRequest(page))
-                .asObservableSuccess()
-                .map { imageUrlParse(it) }
-                .doOnError { page.status = Page.ERROR }
-                .onErrorReturn { null }
-                .doOnNext { page.imageUrl = it }
-                .map { page }
-    }
-
-    /**
-     * Returns the request for getting the url to the source image. Override only if it's needed to
-     * override the url, send different headers or request method like POST.
-     *
-     * @param page the chapter whose page list has to be fetched
-     */
-    open protected fun imageUrlRequest(page: Page): Request {
-        return GET(page.url, headers)
-    }
-
-    /**
-     * Parse the response from the site. It should return the absolute url to the source image.
-     *
-     * @param response the response from the site.
-     */
-    abstract protected fun imageUrlParse(response: Response): String
-
-    /**
-     * Returns an observable of the page with the downloaded image.
-     *
-     * @param page the page whose source image has to be downloaded.
-     */
-    final override fun fetchImage(page: Page): Observable<Page> =
-        if (page.imageUrl.isNullOrEmpty())
-            fetchImageUrl(page).flatMap { getCachedImage(it) }
-        else
-            getCachedImage(page)
-
-    /**
-     * Returns an observable with the response of the source image.
-     *
-     * @param page the page whose source image has to be downloaded.
-     */
-    fun imageResponse(page: Page): Observable<Response> = client
-            .newCallWithProgress(imageRequest(page), page)
-            .asObservableSuccess()
-
-    /**
-     * Returns the request for getting the source image. Override only if it's needed to override
-     * the url, send different headers or request method like POST.
-     *
-     * @param page the chapter whose page list has to be fetched
-     */
-    open protected fun imageRequest(page: Page): Request {
-        return GET(page.imageUrl!!, headers)
-    }
-
-    /**
-     * Returns an observable of the page that gets the image from the chapter or fallbacks to
-     * network and copies it to the cache calling [cacheImage].
-     *
-     * @param page the page.
-     */
-    fun getCachedImage(page: Page): Observable<Page> {
-        val imageUrl = page.imageUrl ?: return Observable.just(page)
-
-        return Observable.just(page)
-                .flatMap {
-                    if (!chapterCache.isImageInCache(imageUrl)) {
-                        cacheImage(page)
-                    } else {
-                        Observable.just(page)
-                    }
-                }
-                .doOnNext {
-                    page.uri = Uri.fromFile(chapterCache.getImageFile(imageUrl))
-                    page.status = Page.READY
-                }
-                .doOnError { page.status = Page.ERROR }
-                .onErrorReturn { page }
-    }
-
-    /**
-     * Returns an observable of the page that downloads the image to [ChapterCache].
-     *
-     * @param page the page.
-     */
-    private fun cacheImage(page: Page): Observable<Page> {
-        page.status = Page.DOWNLOAD_IMAGE
-        return imageResponse(page)
-                .doOnNext { chapterCache.putImageToCache(page.imageUrl!!, it) }
-                .map { page }
-    }
-
-
-    // Utility methods
-
-    fun fetchAllImageUrlsFromPageList(pages: List<Page>) = Observable.from(pages)
-            .filter { !it.imageUrl.isNullOrEmpty() }
-            .mergeWith(fetchRemainingImageUrlsFromPageList(pages))
-
-    fun fetchRemainingImageUrlsFromPageList(pages: List<Page>) = Observable.from(pages)
-            .filter { it.imageUrl.isNullOrEmpty() }
-            .concatMap { fetchImageUrl(it) }
-
-    fun savePageList(chapter: Chapter, pages: List<Page>?) {
-        if (pages != null) {
-            chapterCache.putPageListToCache(getChapterCacheKey(chapter), pages)
-        }
-    }
-
-    fun Chapter.setUrlWithoutDomain(url: String) {
-        this.url = UrlUtil.getPath(url)
-    }
-
-    fun Manga.setUrlWithoutDomain(url: String) {
-        this.url = UrlUtil.getPath(url)
-    }
-
-
-    /**
-     * Called before inserting a new chapter into database. Use it if you need to override chapter
-     * fields, like the title or the chapter number. Do not change anything to [manga].
-     *
-     * @param chapter the chapter to be added.
-     * @param manga the manga of the chapter.
-     */
-    open fun prepareNewChapter(chapter: Chapter, manga: Manga) {
-
-    }
-
-    data class Filter(val id: String, val name: String)
-
-    open fun getFilterList(): List<Filter> = emptyList()
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/source/online/ParsedOnlineSource.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/online/ParsedOnlineSource.kt
@ -1,211 +0,0 @@
-package eu.kanade.tachiyomi.data.source.online
-
-import eu.kanade.tachiyomi.data.database.models.Chapter
-import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.source.model.MangasPage
-import eu.kanade.tachiyomi.data.source.model.Page
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.Response
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-
-/**
- * A simple implementation for sources from a website using Jsoup, an HTML parser.
- */
-abstract class ParsedOnlineSource() : OnlineSource() {
-
-    /**
-     * Parse the response from the site and fills [page].
-     *
-     * @param response the response from the site.
-     * @param page the page object to be filled.
-     */
-    override fun popularMangaParse(response: Response, page: MangasPage) {
-        val document = response.asJsoup()
-        for (element in document.select(popularMangaSelector())) {
-            Manga.create(id).apply {
-                popularMangaFromElement(element, this)
-                page.mangas.add(this)
-            }
-        }
-
-        popularMangaNextPageSelector()?.let { selector ->
-            page.nextPageUrl = document.select(selector).first()?.absUrl("href")
-        }
-    }
-
-    /**
-     * Returns the Jsoup selector that returns a list of [Element] corresponding to each manga.
-     */
-    abstract protected fun popularMangaSelector(): String
-
-    /**
-     * Fills [manga] with the given [element]. Most sites only show the title and the url, it's
-     * totally safe to fill only those two values.
-     *
-     * @param element an element obtained from [popularMangaSelector].
-     * @param manga the manga to fill.
-     */
-    abstract protected fun popularMangaFromElement(element: Element, manga: Manga)
-
-    /**
-     * Returns the Jsoup selector that returns the <a> tag linking to the next page, or null if
-     * there's no next page.
-     */
-    abstract protected fun popularMangaNextPageSelector(): String?
-
-    /**
-     * Parse the response from the site and fills [page].
-     *
-     * @param response the response from the site.
-     * @param page the page object to be filled.
-     * @param query the search query.
-     */
-    override fun searchMangaParse(response: Response, page: MangasPage, query: String, filters: List<Filter>) {
-        val document = response.asJsoup()
-        for (element in document.select(searchMangaSelector())) {
-            Manga.create(id).apply {
-                searchMangaFromElement(element, this)
-                page.mangas.add(this)
-            }
-        }
-
-        searchMangaNextPageSelector()?.let { selector ->
-            page.nextPageUrl = document.select(selector).first()?.absUrl("href")
-        }
-    }
-
-    /**
-     * Returns the Jsoup selector that returns a list of [Element] corresponding to each manga.
-     */
-    abstract protected fun searchMangaSelector(): String
-
-    /**
-     * Fills [manga] with the given [element]. Most sites only show the title and the url, it's
-     * totally safe to fill only those two values.
-     *
-     * @param element an element obtained from [searchMangaSelector].
-     * @param manga the manga to fill.
-     */
-    abstract protected fun searchMangaFromElement(element: Element, manga: Manga)
-
-    /**
-     * Returns the Jsoup selector that returns the <a> tag linking to the next page, or null if
-     * there's no next page.
-     */
-    abstract protected fun searchMangaNextPageSelector(): String?
-
-    /**
-     * Parse the response from the site for latest updates and fills [page].
-     */
-    override fun latestUpdatesParse(response: Response, page: MangasPage) {
-        val document = response.asJsoup()
-        for (element in document.select(latestUpdatesSelector())) {
-            Manga.create(id).apply {
-                latestUpdatesFromElement(element, this)
-                page.mangas.add(this)
-            }
-        }
-
-        latestUpdatesNextPageSelector()?.let { selector ->
-            page.nextPageUrl = document.select(selector).first()?.absUrl("href")
-        }
-    }
-
-    /**
-     * Returns the Jsoup selector similar to [popularMangaSelector], but for latest updates.
-     */
-    abstract protected fun latestUpdatesSelector(): String
-
-    /**
-     * Fills [manga] with the given [element]. For latest updates.
-     */
-    abstract protected fun latestUpdatesFromElement(element: Element, manga: Manga)
-
-    /**
-     * Returns the Jsoup selector that returns the <a> tag, like [popularMangaNextPageSelector].
-     */
-    abstract protected fun latestUpdatesNextPageSelector(): String?
-
-    /**
-     * Parse the response from the site and fills the details of [manga].
-     *
-     * @param response the response from the site.
-     * @param manga the manga to fill.
-     */
-    override fun mangaDetailsParse(response: Response, manga: Manga) {
-        mangaDetailsParse(response.asJsoup(), manga)
-    }
-
-    /**
-     * Fills the details of [manga] from the given [document].
-     *
-     * @param document the parsed document.
-     * @param manga the manga to fill.
-     */
-    abstract protected fun mangaDetailsParse(document: Document, manga: Manga)
-
-    /**
-     * Parse the response from the site and fills the chapter list.
-     *
-     * @param response the response from the site.
-     * @param chapters the list of chapters to fill.
-     */
-    override fun chapterListParse(response: Response, chapters: MutableList<Chapter>) {
-        val document = response.asJsoup()
-
-        for (element in document.select(chapterListSelector())) {
-            Chapter.create().apply {
-                chapterFromElement(element, this)
-                chapters.add(this)
-            }
-        }
-    }
-
-    /**
-     * Returns the Jsoup selector that returns a list of [Element] corresponding to each chapter.
-     */
-    abstract protected fun chapterListSelector(): String
-
-    /**
-     * Fills [chapter] with the given [element].
-     *
-     * @param element an element obtained from [chapterListSelector].
-     * @param chapter the chapter to fill.
-     */
-    abstract protected fun chapterFromElement(element: Element, chapter: Chapter)
-
-    /**
-     * Parse the response from the site and fills the page list.
-     *
-     * @param response the response from the site.
-     * @param pages the list of pages to fill.
-     */
-    override fun pageListParse(response: Response, pages: MutableList<Page>) {
-        pageListParse(response.asJsoup(), pages)
-    }
-
-    /**
-     * Fills [pages] from the given [document].
-     *
-     * @param document the parsed document.
-     * @param pages the list of pages to fill.
-     */
-    abstract protected fun pageListParse(document: Document, pages: MutableList<Page>)
-
-    /**
-     * Parse the response from the site and returns the absolute url to the source image.
-     *
-     * @param response the response from the site.
-     */
-    override fun imageUrlParse(response: Response): String {
-        return imageUrlParse(response.asJsoup())
-    }
-
-    /**
-     * Returns the absolute url to the source image from the document.
-     *
-     * @param document the parsed document.
-     */
-    abstract protected fun imageUrlParse(document: Document): String
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Batoto.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Batoto.kt
@ -1,349 +0,0 @@
-package eu.kanade.tachiyomi.data.source.online.english
-
-import android.net.Uri
-import android.text.Html
-import eu.kanade.tachiyomi.data.database.models.Chapter
-import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.network.GET
-import eu.kanade.tachiyomi.data.network.POST
-import eu.kanade.tachiyomi.data.network.asObservable
-import eu.kanade.tachiyomi.data.source.EN
-import eu.kanade.tachiyomi.data.source.Language
-import eu.kanade.tachiyomi.data.source.model.MangasPage
-import eu.kanade.tachiyomi.data.source.model.Page
-import eu.kanade.tachiyomi.data.source.online.LoginSource
-import eu.kanade.tachiyomi.data.source.online.ParsedOnlineSource
-import eu.kanade.tachiyomi.util.asJsoup
-import eu.kanade.tachiyomi.util.selectText
-import okhttp3.FormBody
-import okhttp3.Request
-import okhttp3.Response
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import rx.Observable
-import java.net.URI
-import java.text.ParseException
-import java.text.SimpleDateFormat
-import java.util.*
-import java.util.regex.Pattern
-
-class Batoto(override val id: Int) : ParsedOnlineSource(), LoginSource {
-
-    override val name = "Batoto"
-
-    override val baseUrl = "http://bato.to"
-
-    override val lang: Language get() = EN
-
-    override val supportsLatest = true
-
-    private val datePattern = Pattern.compile("(\\d+|A|An)\\s+(.*?)s? ago.*")
-
-    private val dateFields = HashMap<String, Int>().apply {
-        put("second", Calendar.SECOND)
-        put("minute", Calendar.MINUTE)
-        put("hour", Calendar.HOUR)
-        put("day", Calendar.DATE)
-        put("week", Calendar.WEEK_OF_YEAR)
-        put("month", Calendar.MONTH)
-        put("year", Calendar.YEAR)
-    }
-
-    private val staffNotice = Pattern.compile("=+Batoto Staff Notice=+([^=]+)==+", Pattern.CASE_INSENSITIVE)
-
-    override fun headersBuilder() = super.headersBuilder()
-            .add("Cookie", "lang_option=English")
-
-    private val pageHeaders = super.headersBuilder()
-            .add("Referer", "http://bato.to/reader")
-            .build()
-
-    override fun popularMangaInitialUrl() = "$baseUrl/search_ajax?order_cond=views&order=desc&p=1"
-
-    override fun latestUpdatesInitialUrl() = "$baseUrl/search_ajax?order_cond=update&order=desc&p=1"
-
-    override fun popularMangaParse(response: Response, page: MangasPage) {
-        val document = response.asJsoup()
-        for (element in document.select(popularMangaSelector())) {
-            Manga.create(id).apply {
-                popularMangaFromElement(element, this)
-                page.mangas.add(this)
-            }
-        }
-
-        page.nextPageUrl = document.select(popularMangaNextPageSelector()).first()?.let {
-            "$baseUrl/search_ajax?order_cond=views&order=desc&p=${page.page + 1}"
-        }
-    }
-
-    override fun latestUpdatesParse(response: Response, page: MangasPage) {
-        val document = response.asJsoup()
-        for (element in document.select(latestUpdatesSelector())) {
-            Manga.create(id).apply {
-                latestUpdatesFromElement(element, this)
-                page.mangas.add(this)
-            }
-        }
-
-        page.nextPageUrl = document.select(latestUpdatesNextPageSelector()).first()?.let {
-            "$baseUrl/search_ajax?order_cond=update&order=desc&p=${page.page + 1}"
-        }
-    }
-
-    override fun popularMangaSelector() = "tr:has(a)"
-
-    override fun latestUpdatesSelector() = "tr:has(a)"
-
-    override fun popularMangaFromElement(element: Element, manga: Manga) {
-        element.select("a[href^=http://bato.to]").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.text().trim()
-        }
-    }
-
-    override fun latestUpdatesFromElement(element: Element, manga: Manga) {
-        popularMangaFromElement(element, manga)
-    }
-
-    override fun popularMangaNextPageSelector() = "#show_more_row"
-
-    override fun latestUpdatesNextPageSelector() = "#show_more_row"
-
-    override fun searchMangaInitialUrl(query: String, filters: List<Filter>) = "$baseUrl/search_ajax?name=${Uri.encode(query)}&order_cond=views&order=desc&p=1&genre_cond=and&genres=${getFilterParams(filters)}"
-
-    private fun getFilterParams(filters: List<Filter>): String = filters
-            .map {
-                ";i" + it.id
-            }.joinToString()
-
-    override fun searchMangaRequest(page: MangasPage, query: String, filters: List<Filter>): Request {
-        if (page.page == 1) {
-            page.url = searchMangaInitialUrl(query, filters)
-        }
-        return GET(page.url, headers)
-    }
-
-    override fun searchMangaParse(response: Response, page: MangasPage, query: String, filters: List<Filter>) {
-        val document = response.asJsoup()
-        for (element in document.select(searchMangaSelector())) {
-            Manga.create(id).apply {
-                searchMangaFromElement(element, this)
-                page.mangas.add(this)
-            }
-        }
-
-        page.nextPageUrl = document.select(searchMangaNextPageSelector()).first()?.let {
-            "$baseUrl/search_ajax?name=${Uri.encode(query)}&p=${page.page + 1}&order_cond=views&order=desc&genre_cond=and&genres=" + getFilterParams(filters)
-        }
-    }
-
-    override fun searchMangaSelector() = popularMangaSelector()
-
-    override fun searchMangaFromElement(element: Element, manga: Manga) {
-        popularMangaFromElement(element, manga)
-    }
-
-    override fun searchMangaNextPageSelector() = popularMangaNextPageSelector()
-
-    override fun mangaDetailsRequest(manga: Manga): Request {
-        val mangaId = manga.url.substringAfterLast("r")
-        return GET("$baseUrl/comic_pop?id=$mangaId", headers)
-    }
-
-    override fun mangaDetailsParse(document: Document, manga: Manga) {
-        val tbody = document.select("tbody").first()
-        val artistElement = tbody.select("tr:contains(Author/Artist:)").first()
-
-        manga.author = artistElement.selectText("td:eq(1)")
-        manga.artist = artistElement.selectText("td:eq(2)") ?: manga.author
-        manga.description = tbody.selectText("tr:contains(Description:) > td:eq(1)")
-        manga.thumbnail_url = document.select("img[src^=http://img.bato.to/forums/uploads/]").first()?.attr("src")
-        manga.status = parseStatus(document.selectText("tr:contains(Status:) > td:eq(1)"))
-        manga.genre = tbody.select("tr:contains(Genres:) img").map { it.attr("alt") }.joinToString(", ")
-    }
-
-    private fun parseStatus(status: String?) = when (status) {
-        "Ongoing" -> Manga.ONGOING
-        "Complete" -> Manga.COMPLETED
-        else -> Manga.UNKNOWN
-    }
-
-    override fun chapterListParse(response: Response, chapters: MutableList<Chapter>) {
-        val body = response.body().string()
-        val matcher = staffNotice.matcher(body)
-        if (matcher.find()) {
-            val notice = Html.fromHtml(matcher.group(1)).toString().trim()
-            throw Exception(notice)
-        }
-
-        val document = response.asJsoup(body)
-
-        for (element in document.select(chapterListSelector())) {
-            Chapter.create().apply {
-                chapterFromElement(element, this)
-                chapters.add(this)
-            }
-        }
-    }
-
-    override fun chapterListSelector() = "tr.row.lang_English.chapter_row"
-
-    override fun chapterFromElement(element: Element, chapter: Chapter) {
-        val urlElement = element.select("a[href^=http://bato.to/reader").first()
-
-        chapter.setUrlWithoutDomain(urlElement.attr("href"))
-        chapter.name = urlElement.text()
-        chapter.date_upload = element.select("td").getOrNull(4)?.let {
-            parseDateFromElement(it)
-        } ?: 0
-    }
-
-    private fun parseDateFromElement(dateElement: Element): Long {
-        val dateAsString = dateElement.text()
-
-        var date: Date
-        try {
-            date = SimpleDateFormat("dd MMMMM yyyy - hh:mm a", Locale.ENGLISH).parse(dateAsString)
-        } catch (e: ParseException) {
-            val m = datePattern.matcher(dateAsString)
-
-            if (m.matches()) {
-                val number = m.group(1)
-                val amount = if (number.contains("A")) 1 else Integer.parseInt(m.group(1))
-                val unit = m.group(2)
-
-                date = Calendar.getInstance().apply {
-                    add(dateFields[unit]!!, -amount)
-                }.time
-            } else {
-                return 0
-            }
-        }
-
-        return date.time
-    }
-
-    override fun pageListRequest(chapter: Chapter): Request {
-        val id = chapter.url.substringAfterLast("#")
-        return GET("$baseUrl/areader?id=$id&p=1", pageHeaders)
-    }
-
-    override fun pageListParse(document: Document, pages: MutableList<Page>) {
-        val selectElement = document.select("#page_select").first()
-        if (selectElement != null) {
-            for ((i, element) in selectElement.select("option").withIndex()) {
-                pages.add(Page(i, element.attr("value")))
-            }
-            pages.getOrNull(0)?.imageUrl = imageUrlParse(document)
-        } else {
-            // For webtoons in one page
-            for ((i, element) in document.select("div > img").withIndex()) {
-                pages.add(Page(i, "", element.attr("src")))
-            }
-        }
-    }
-
-    override fun imageUrlRequest(page: Page): Request {
-        val pageUrl = page.url
-        val start = pageUrl.indexOf("#") + 1
-        val end = pageUrl.indexOf("_", start)
-        val id = pageUrl.substring(start, end)
-        return GET("$baseUrl/areader?id=$id&p=${pageUrl.substring(end + 1)}", pageHeaders)
-    }
-
-    override fun imageUrlParse(document: Document): String {
-        return document.select("#comic_page").first().attr("src")
-    }
-
-    override fun login(username: String, password: String) =
-            client.newCall(GET("$baseUrl/forums/index.php?app=core&module=global&section=login", headers))
-                    .asObservable()
-                    .flatMap { doLogin(it, username, password) }
-                    .map { isAuthenticationSuccessful(it) }
-
-    private fun doLogin(response: Response, username: String, password: String): Observable<Response> {
-        val doc = response.asJsoup()
-        val form = doc.select("#login").first()
-        val url = form.attr("action")
-        val authKey = form.select("input[name=auth_key]").first()
-
-        val payload = FormBody.Builder().apply {
-            add(authKey.attr("name"), authKey.attr("value"))
-            add("ips_username", username)
-            add("ips_password", password)
-            add("invisible", "1")
-            add("rememberMe", "1")
-        }.build()
-
-        return client.newCall(POST(url, headers, payload)).asObservable()
-    }
-
-    override fun isAuthenticationSuccessful(response: Response) =
-            response.priorResponse() != null && response.priorResponse().code() == 302
-
-    override fun isLogged(): Boolean {
-        return network.cookies.get(URI(baseUrl)).any { it.name() == "pass_hash" }
-    }
-
-    override fun fetchChapterList(manga: Manga): Observable<List<Chapter>> {
-        if (!isLogged()) {
-            val username = preferences.sourceUsername(this)
-            val password = preferences.sourcePassword(this)
-
-            if (username.isNullOrEmpty() || password.isNullOrEmpty()) {
-                return Observable.error(Exception("User not logged"))
-            } else {
-                return login(username, password).flatMap { super.fetchChapterList(manga) }
-            }
-
-        } else {
-            return super.fetchChapterList(manga)
-        }
-    }
-
-    // [...document.querySelectorAll("#advanced_options div.genre_buttons")].map((el,i) => {
-    //     const onClick=el.getAttribute('onclick');const id=onClick.substr(14,onClick.length-16);return `Filter("${id}", "${el.textContent.trim()}")`
-    // }).join(',\n')
-    // on https://bato.to/search
-    override fun getFilterList(): List<Filter> = listOf(
-            Filter("40", "4-Koma"),
-            Filter("1", "Action"),
-            Filter("2", "Adventure"),
-            Filter("39", "Award Winning"),
-            Filter("3", "Comedy"),
-            Filter("41", "Cooking"),
-            Filter("9", "Doujinshi"),
-            Filter("10", "Drama"),
-            Filter("12", "Ecchi"),
-            Filter("13", "Fantasy"),
-            Filter("15", "Gender Bender"),
-            Filter("17", "Harem"),
-            Filter("20", "Historical"),
-            Filter("22", "Horror"),
-            Filter("34", "Josei"),
-            Filter("27", "Martial Arts"),
-            Filter("30", "Mecha"),
-            Filter("42", "Medical"),
-            Filter("37", "Music"),
-            Filter("4", "Mystery"),
-            Filter("38", "Oneshot"),
-            Filter("5", "Psychological"),
-            Filter("6", "Romance"),
-            Filter("7", "School Life"),
-            Filter("8", "Sci-fi"),
-            Filter("32", "Seinen"),
-            Filter("35", "Shoujo"),
-            Filter("16", "Shoujo Ai"),
-            Filter("33", "Shounen"),
-            Filter("19", "Shounen Ai"),
-            Filter("21", "Slice of Life"),
-            Filter("23", "Smut"),
-            Filter("25", "Sports"),
-            Filter("26", "Supernatural"),
-            Filter("28", "Tragedy"),
-            Filter("36", "Webtoon"),
-            Filter("29", "Yaoi"),
-            Filter("31", "Yuri")
-    )
-
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Kissmanga.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Kissmanga.kt
@ -1,182 +0,0 @@
-package eu.kanade.tachiyomi.data.source.online.english
-
-import android.content.Context
-import eu.kanade.tachiyomi.data.database.models.Chapter
-import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.network.GET
-import eu.kanade.tachiyomi.data.network.POST
-import eu.kanade.tachiyomi.data.source.EN
-import eu.kanade.tachiyomi.data.source.Language
-import eu.kanade.tachiyomi.data.source.model.MangasPage
-import eu.kanade.tachiyomi.data.source.model.Page
-import eu.kanade.tachiyomi.data.source.online.ParsedOnlineSource
-import okhttp3.FormBody
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import java.text.SimpleDateFormat
-import java.util.regex.Pattern
-
-class Kissmanga(override val id: Int) : ParsedOnlineSource() {
-
-    override val name = "Kissmanga"
-
-    override val baseUrl = "http://kissmanga.com"
-
-    override val lang: Language get() = EN
-
-    override val supportsLatest = true
-
-    override val client: OkHttpClient = network.cloudflareClient
-
-    override fun popularMangaInitialUrl() = "$baseUrl/MangaList/MostPopular"
-
-    override fun latestUpdatesInitialUrl() = "http://kissmanga.com/MangaList/LatestUpdate"
-
-    override fun popularMangaSelector() = "table.listing tr:gt(1)"
-
-    override fun latestUpdatesSelector() = "table.listing tr:gt(1)"
-
-    override fun popularMangaFromElement(element: Element, manga: Manga) {
-        element.select("td a:eq(0)").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.text()
-        }
-    }
-
-    override fun latestUpdatesFromElement(element: Element, manga: Manga) {
-        popularMangaFromElement(element, manga)
-    }
-
-    override fun popularMangaNextPageSelector() = "li > a:contains(› Next)"
-
-    override fun latestUpdatesNextPageSelector(): String = "ul.pager > li > a:contains(Next)"
-
-    override fun searchMangaRequest(page: MangasPage, query: String, filters: List<Filter>): Request {
-        if (page.page == 1) {
-            page.url = searchMangaInitialUrl(query, filters)
-        }
-
-        val form = FormBody.Builder().apply {
-            add("authorArtist", "")
-            add("mangaName", query)
-            add("status", "")
-
-            this@Kissmanga.filters.forEach { filter ->
-                add("genres", if (filter in filters) "1" else "0")
-            }
-        }
-
-        return POST(page.url, headers, form.build())
-    }
-
-    override fun searchMangaInitialUrl(query: String, filters: List<Filter>) = "$baseUrl/AdvanceSearch"
-
-    override fun searchMangaSelector() = popularMangaSelector()
-
-    override fun searchMangaFromElement(element: Element, manga: Manga) {
-        popularMangaFromElement(element, manga)
-    }
-
-    override fun searchMangaNextPageSelector() = null
-
-    override fun mangaDetailsParse(document: Document, manga: Manga) {
-        val infoElement = document.select("div.barContent").first()
-
-        manga.author = infoElement.select("p:has(span:contains(Author:)) > a").first()?.text()
-        manga.genre = infoElement.select("p:has(span:contains(Genres:)) > *:gt(0)").text()
-        manga.description = infoElement.select("p:has(span:contains(Summary:)) ~ p").text()
-        manga.status = infoElement.select("p:has(span:contains(Status:))").first()?.text().orEmpty().let { parseStatus(it) }
-        manga.thumbnail_url = document.select(".rightBox:eq(0) img").first()?.attr("src")
-    }
-
-    fun parseStatus(status: String) = when {
-        status.contains("Ongoing") -> Manga.ONGOING
-        status.contains("Completed") -> Manga.COMPLETED
-        else -> Manga.UNKNOWN
-    }
-
-    override fun chapterListSelector() = "table.listing tr:gt(1)"
-
-    override fun chapterFromElement(element: Element, chapter: Chapter) {
-        val urlElement = element.select("a").first()
-
-        chapter.setUrlWithoutDomain(urlElement.attr("href"))
-        chapter.name = urlElement.text()
-        chapter.date_upload = element.select("td:eq(1)").first()?.text()?.let {
-            SimpleDateFormat("MM/dd/yyyy").parse(it).time
-        } ?: 0
-    }
-
-    override fun pageListRequest(chapter: Chapter) = POST(baseUrl + chapter.url, headers)
-
-    override fun pageListParse(response: Response, pages: MutableList<Page>) {
-        //language=RegExp
-        val p = Pattern.compile("""lstImages.push\("(.+?)"""")
-        val m = p.matcher(response.body().string())
-
-        var i = 0
-        while (m.find()) {
-            pages.add(Page(i++, "", m.group(1)))
-        }
-    }
-
-    // Not used
-    override fun pageListParse(document: Document, pages: MutableList<Page>) {
-    }
-
-    override fun imageUrlRequest(page: Page) = GET(page.url)
-
-    override fun imageUrlParse(document: Document) = ""
-
-    // $("select[name=\"genres\"]").map((i,el) => `Filter("${i}", "${$(el).next().text().trim()}")`).get().join(',\n')
-    // on http://kissmanga.com/AdvanceSearch
-    override fun getFilterList(): List<Filter> = listOf(
-            Filter("0", "Action"),
-            Filter("1", "Adult"),
-            Filter("2", "Adventure"),
-            Filter("3", "Comedy"),
-            Filter("4", "Comic"),
-            Filter("5", "Cooking"),
-            Filter("6", "Doujinshi"),
-            Filter("7", "Drama"),
-            Filter("8", "Ecchi"),
-            Filter("9", "Fantasy"),
-            Filter("10", "Gender Bender"),
-            Filter("11", "Harem"),
-            Filter("12", "Historical"),
-            Filter("13", "Horror"),
-            Filter("14", "Josei"),
-            Filter("15", "Lolicon"),
-            Filter("16", "Manga"),
-            Filter("17", "Manhua"),
-            Filter("18", "Manhwa"),
-            Filter("19", "Martial Arts"),
-            Filter("20", "Mature"),
-            Filter("21", "Mecha"),
-            Filter("22", "Medical"),
-            Filter("23", "Music"),
-            Filter("24", "Mystery"),
-            Filter("25", "One shot"),
-            Filter("26", "Psychological"),
-            Filter("27", "Romance"),
-            Filter("28", "School Life"),
-            Filter("29", "Sci-fi"),
-            Filter("30", "Seinen"),
-            Filter("31", "Shotacon"),
-            Filter("32", "Shoujo"),
-            Filter("33", "Shoujo Ai"),
-            Filter("34", "Shounen"),
-            Filter("35", "Shounen Ai"),
-            Filter("36", "Slice of Life"),
-            Filter("37", "Smut"),
-            Filter("38", "Sports"),
-            Filter("39", "Supernatural"),
-            Filter("40", "Tragedy"),
-            Filter("41", "Webtoon"),
-            Filter("42", "Yaoi"),
-            Filter("43", "Yuri")
-    )
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Mangafox.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Mangafox.kt
@ -1,172 +0,0 @@
-package eu.kanade.tachiyomi.data.source.online.english
-
-import eu.kanade.tachiyomi.data.database.models.Chapter
-import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.source.EN
-import eu.kanade.tachiyomi.data.source.Language
-import eu.kanade.tachiyomi.data.source.model.Page
-import eu.kanade.tachiyomi.data.source.online.ParsedOnlineSource
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.Response
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import java.text.ParseException
-import java.text.SimpleDateFormat
-import java.util.*
-
-class Mangafox(override val id: Int) : ParsedOnlineSource() {
-
-    override val name = "Mangafox"
-
-    override val baseUrl = "http://mangafox.me"
-
-    override val lang: Language get() = EN
-
-    override val supportsLatest = true
-
-    override fun popularMangaInitialUrl() = "$baseUrl/directory/"
-
-    override fun latestUpdatesInitialUrl() = "$baseUrl/directory/?latest"
-
-    override fun popularMangaSelector() = "div#mangalist > ul.list > li"
-
-    override fun latestUpdatesSelector() = "div#mangalist > ul.list > li"
-
-    override fun popularMangaFromElement(element: Element, manga: Manga) {
-        element.select("a.title").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.text()
-        }
-    }
-
-    override fun latestUpdatesFromElement(element: Element, manga: Manga) {
-        popularMangaFromElement(element, manga)
-    }
-
-    override fun popularMangaNextPageSelector() = "a:has(span.next)"
-
-    override fun latestUpdatesNextPageSelector() = "a:has(span.next)"
-
-    override fun searchMangaInitialUrl(query: String, filters: List<Filter>) =
-            "$baseUrl/search.php?name_method=cw&advopts=1&order=za&sort=views&name=$query&page=1&${filters.map { it.id + "=1" }.joinToString("&")}"
-
-    override fun searchMangaSelector() = "table#listing > tbody > tr:gt(0)"
-
-    override fun searchMangaFromElement(element: Element, manga: Manga) {
-        element.select("a.series_preview").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.text()
-        }
-    }
-
-    override fun searchMangaNextPageSelector() = "a:has(span.next)"
-
-    override fun mangaDetailsParse(document: Document, manga: Manga) {
-        val infoElement = document.select("div#title").first()
-        val rowElement = infoElement.select("table > tbody > tr:eq(1)").first()
-        val sideInfoElement = document.select("#series_info").first()
-
-        manga.author = rowElement.select("td:eq(1)").first()?.text()
-        manga.artist = rowElement.select("td:eq(2)").first()?.text()
-        manga.genre = rowElement.select("td:eq(3)").first()?.text()
-        manga.description = infoElement.select("p.summary").first()?.text()
-        manga.status = sideInfoElement.select(".data").first()?.text().orEmpty().let { parseStatus(it) }
-        manga.thumbnail_url = sideInfoElement.select("div.cover > img").first()?.attr("src")
-    }
-
-    private fun parseStatus(status: String) = when {
-        status.contains("Ongoing") -> Manga.ONGOING
-        status.contains("Completed") -> Manga.COMPLETED
-        else -> Manga.UNKNOWN
-    }
-
-    override fun chapterListSelector() = "div#chapters li div"
-
-    override fun chapterFromElement(element: Element, chapter: Chapter) {
-        val urlElement = element.select("a.tips").first()
-
-        chapter.setUrlWithoutDomain(urlElement.attr("href"))
-        chapter.name = urlElement.text()
-        chapter.date_upload = element.select("span.date").first()?.text()?.let { parseChapterDate(it) } ?: 0
-    }
-
-    private fun parseChapterDate(date: String): Long {
-        return if ("Today" in date || " ago" in date) {
-            Calendar.getInstance().apply {
-                set(Calendar.HOUR_OF_DAY, 0)
-                set(Calendar.MINUTE, 0)
-                set(Calendar.SECOND, 0)
-                set(Calendar.MILLISECOND, 0)
-            }.timeInMillis
-        } else if ("Yesterday" in date) {
-            Calendar.getInstance().apply {
-                add(Calendar.DATE, -1)
-                set(Calendar.HOUR_OF_DAY, 0)
-                set(Calendar.MINUTE, 0)
-                set(Calendar.SECOND, 0)
-                set(Calendar.MILLISECOND, 0)
-            }.timeInMillis
-        } else {
-            try {
-                SimpleDateFormat("MMM d, yyyy", Locale.ENGLISH).parse(date).time
-            } catch (e: ParseException) {
-                0L
-            }
-        }
-    }
-
-    override fun pageListParse(response: Response, pages: MutableList<Page>) {
-        val document = response.asJsoup()
-
-        val url = response.request().url().toString().substringBeforeLast('/')
-        document.select("select.m").first()?.select("option:not([value=0])")?.forEach {
-            pages.add(Page(pages.size, "$url/${it.attr("value")}.html"))
-        }
-    }
-
-    // Not used, overrides parent.
-    override fun pageListParse(document: Document, pages: MutableList<Page>) {}
-
-    override fun imageUrlParse(document: Document) = document.getElementById("image").attr("src")
-
-    // $('select.genres').map((i,el)=>`Filter("${$(el).attr('name')}", "${$(el).next().text().trim()}")`).get().join(',\n')
-    // on http://kissmanga.com/AdvanceSearch
-    override fun getFilterList(): List<Filter> = listOf(
-            Filter("genres[Action]", "Action"),
-            Filter("genres[Adult]", "Adult"),
-            Filter("genres[Adventure]", "Adventure"),
-            Filter("genres[Comedy]", "Comedy"),
-            Filter("genres[Doujinshi]", "Doujinshi"),
-            Filter("genres[Drama]", "Drama"),
-            Filter("genres[Ecchi]", "Ecchi"),
-            Filter("genres[Fantasy]", "Fantasy"),
-            Filter("genres[Gender Bender]", "Gender Bender"),
-            Filter("genres[Harem]", "Harem"),
-            Filter("genres[Historical]", "Historical"),
-            Filter("genres[Horror]", "Horror"),
-            Filter("genres[Josei]", "Josei"),
-            Filter("genres[Martial Arts]", "Martial Arts"),
-            Filter("genres[Mature]", "Mature"),
-            Filter("genres[Mecha]", "Mecha"),
-            Filter("genres[Mystery]", "Mystery"),
-            Filter("genres[One Shot]", "One Shot"),
-            Filter("genres[Psychological]", "Psychological"),
-            Filter("genres[Romance]", "Romance"),
-            Filter("genres[School Life]", "School Life"),
-            Filter("genres[Sci-fi]", "Sci-fi"),
-            Filter("genres[Seinen]", "Seinen"),
-            Filter("genres[Shoujo]", "Shoujo"),
-            Filter("genres[Shoujo Ai]", "Shoujo Ai"),
-            Filter("genres[Shounen]", "Shounen"),
-            Filter("genres[Shounen Ai]", "Shounen Ai"),
-            Filter("genres[Slice of Life]", "Slice of Life"),
-            Filter("genres[Smut]", "Smut"),
-            Filter("genres[Sports]", "Sports"),
-            Filter("genres[Supernatural]", "Supernatural"),
-            Filter("genres[Tragedy]", "Tragedy"),
-            Filter("genres[Webtoons]", "Webtoons"),
-            Filter("genres[Yaoi]", "Yaoi"),
-            Filter("genres[Yuri]", "Yuri")
-    )
-
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Mangahere.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Mangahere.kt
@ -1,173 +0,0 @@
-package eu.kanade.tachiyomi.data.source.online.english
-
-import android.content.Context
-import eu.kanade.tachiyomi.data.database.models.Chapter
-import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.source.EN
-import eu.kanade.tachiyomi.data.source.Language
-import eu.kanade.tachiyomi.data.source.model.Page
-import eu.kanade.tachiyomi.data.source.online.ParsedOnlineSource
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import java.text.ParseException
-import java.text.SimpleDateFormat
-import java.util.*
-
-class Mangahere(override val id: Int) : ParsedOnlineSource() {
-
-    override val name = "Mangahere"
-
-    override val baseUrl = "http://www.mangahere.co"
-
-    override val lang: Language get() = EN
-
-    override val supportsLatest = true
-
-    override fun popularMangaInitialUrl() = "$baseUrl/directory/?views.za"
-
-    override fun latestUpdatesInitialUrl() = "$baseUrl/directory/?last_chapter_time.za"
-
-    override fun popularMangaSelector() = "div.directory_list > ul > li"
-
-    override fun latestUpdatesSelector() = "div.directory_list > ul > li"
-
-    override fun popularMangaFromElement(element: Element, manga: Manga) {
-        element.select("div.title > a").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.text()
-        }
-    }
-
-    override fun latestUpdatesFromElement(element: Element, manga: Manga) {
-        popularMangaFromElement(element, manga)
-    }
-
-    override fun popularMangaNextPageSelector() = "div.next-page > a.next"
-
-    override fun latestUpdatesNextPageSelector() = "div.next-page > a.next"
-
-    override fun searchMangaInitialUrl(query: String, filters: List<Filter>) = "$baseUrl/search.php?name=$query&page=1&sort=views&order=za&${filters.map { it.id + "=1" }.joinToString("&")}&advopts=1"
-
-    override fun searchMangaSelector() = "div.result_search > dl:has(dt)"
-
-    override fun searchMangaFromElement(element: Element, manga: Manga) {
-        element.select("a.manga_info").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.text()
-        }
-    }
-
-    override fun searchMangaNextPageSelector() = "div.next-page > a.next"
-
-    override fun mangaDetailsParse(document: Document, manga: Manga) {
-        val detailElement = document.select(".manga_detail_top").first()
-        val infoElement = detailElement.select(".detail_topText").first()
-
-        manga.author = infoElement.select("a[href^=http://www.mangahere.co/author/]").first()?.text()
-        manga.artist = infoElement.select("a[href^=http://www.mangahere.co/artist/]").first()?.text()
-        manga.genre = infoElement.select("li:eq(3)").first()?.text()?.substringAfter("Genre(s):")
-        manga.description = infoElement.select("#show").first()?.text()?.substringBeforeLast("Show less")
-        manga.status = infoElement.select("li:eq(6)").first()?.text().orEmpty().let { parseStatus(it) }
-        manga.thumbnail_url = detailElement.select("img.img").first()?.attr("src")
-    }
-
-    private fun parseStatus(status: String) = when {
-        status.contains("Ongoing") -> Manga.ONGOING
-        status.contains("Completed") -> Manga.COMPLETED
-        else -> Manga.UNKNOWN
-    }
-
-    override fun chapterListSelector() = ".detail_list > ul:not([class]) > li"
-
-    override fun chapterFromElement(element: Element, chapter: Chapter) {
-        val parentEl = element.select("span.left").first()
-
-        val urlElement = parentEl.select("a").first()
-
-        var volume = parentEl.select("span.mr6")?.first()?.text()?.trim()?:""
-        if (volume.length > 0) {
-            volume = " - " + volume
-        }
-
-        var title = parentEl?.textNodes()?.last()?.text()?.trim()?:""
-        if (title.length > 0) {
-            title = " - " + title
-        }
-
-        chapter.setUrlWithoutDomain(urlElement.attr("href"))
-        chapter.name = urlElement.text() + volume + title
-        chapter.date_upload = element.select("span.right").first()?.text()?.let { parseChapterDate(it) } ?: 0
-    }
-
-    private fun parseChapterDate(date: String): Long {
-        return if ("Today" in date) {
-            Calendar.getInstance().apply {
-                set(Calendar.HOUR_OF_DAY, 0)
-                set(Calendar.MINUTE, 0)
-                set(Calendar.SECOND, 0)
-                set(Calendar.MILLISECOND, 0)
-            }.timeInMillis
-        } else if ("Yesterday" in date) {
-            Calendar.getInstance().apply {
-                add(Calendar.DATE, -1)
-                set(Calendar.HOUR_OF_DAY, 0)
-                set(Calendar.MINUTE, 0)
-                set(Calendar.SECOND, 0)
-                set(Calendar.MILLISECOND, 0)
-            }.timeInMillis
-        } else {
-            try {
-                SimpleDateFormat("MMM d, yyyy", Locale.ENGLISH).parse(date).time
-            } catch (e: ParseException) {
-                0L
-            }
-        }
-    }
-
-    override fun pageListParse(document: Document, pages: MutableList<Page>) {
-        document.select("select.wid60").first()?.getElementsByTag("option")?.forEach {
-            pages.add(Page(pages.size, it.attr("value")))
-        }
-        pages.getOrNull(0)?.imageUrl = imageUrlParse(document)
-    }
-
-    override fun imageUrlParse(document: Document) = document.getElementById("image").attr("src")
-
-    // [...document.querySelectorAll("select[id^='genres'")].map((el,i) => `Filter("${el.getAttribute('name')}", "${el.nextSibling.nextSibling.textContent.trim()}")`).join(',\n')
-    // http://www.mangahere.co/advsearch.htm
-    override fun getFilterList(): List<Filter> = listOf(
-            Filter("genres[Action]", "Action"),
-            Filter("genres[Adventure]", "Adventure"),
-            Filter("genres[Comedy]", "Comedy"),
-            Filter("genres[Doujinshi]", "Doujinshi"),
-            Filter("genres[Drama]", "Drama"),
-            Filter("genres[Ecchi]", "Ecchi"),
-            Filter("genres[Fantasy]", "Fantasy"),
-            Filter("genres[Gender Bender]", "Gender Bender"),
-            Filter("genres[Harem]", "Harem"),
-            Filter("genres[Historical]", "Historical"),
-            Filter("genres[Horror]", "Horror"),
-            Filter("genres[Josei]", "Josei"),
-            Filter("genres[Martial Arts]", "Martial Arts"),
-            Filter("genres[Mature]", "Mature"),
-            Filter("genres[Mecha]", "Mecha"),
-            Filter("genres[Mystery]", "Mystery"),
-            Filter("genres[One Shot]", "One Shot"),
-            Filter("genres[Psychological]", "Psychological"),
-            Filter("genres[Romance]", "Romance"),
-            Filter("genres[School Life]", "School Life"),
-            Filter("genres[Sci-fi]", "Sci-fi"),
-            Filter("genres[Seinen]", "Seinen"),
-            Filter("genres[Shoujo]", "Shoujo"),
-            Filter("genres[Shoujo Ai]", "Shoujo Ai"),
-            Filter("genres[Shounen]", "Shounen"),
-            Filter("genres[Shounen Ai]", "Shounen Ai"),
-            Filter("genres[Slice of Life]", "Slice of Life"),
-            Filter("genres[Sports]", "Sports"),
-            Filter("genres[Supernatural]", "Supernatural"),
-            Filter("genres[Tragedy]", "Tragedy"),
-            Filter("genres[Yaoi]", "Yaoi"),
-            Filter("genres[Yuri]", "Yuri")
-    )
-
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Mangasee.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Mangasee.kt
@ -1,253 +0,0 @@
-package eu.kanade.tachiyomi.data.source.online.english
-
-import eu.kanade.tachiyomi.data.database.models.Chapter
-import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.network.POST
-import eu.kanade.tachiyomi.data.source.EN
-import eu.kanade.tachiyomi.data.source.Language
-import eu.kanade.tachiyomi.data.source.model.MangasPage
-import eu.kanade.tachiyomi.data.source.model.Page
-import eu.kanade.tachiyomi.data.source.online.ParsedOnlineSource
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.FormBody
-import okhttp3.HttpUrl
-import okhttp3.Request
-import okhttp3.Response
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import java.text.SimpleDateFormat
-import java.util.regex.Pattern
-
-class Mangasee(override val id: Int) : ParsedOnlineSource() {
-
-    override val name = "Mangasee"
-
-    override val baseUrl = "http://mangaseeonline.net"
-
-    override val lang: Language get() = EN
-
-    override val supportsLatest = true
-
-    private val recentUpdatesPattern = Pattern.compile("(.*?)\\s(\\d+\\.?\\d*)\\s?(Completed)?")
-
-    private val indexPattern = Pattern.compile("-index-(.*?)-")
-
-    override fun popularMangaInitialUrl() = "$baseUrl/search/request.php?sortBy=popularity&sortOrder=descending"
-
-    override fun popularMangaSelector() = "div.requested > div.row"
-
-    override fun popularMangaRequest(page: MangasPage): Request {
-        if (page.page == 1) {
-            page.url = popularMangaInitialUrl()
-        }
-        val (body, requestUrl) = convertQueryToPost(page)
-        return POST(requestUrl, headers, body.build())
-    }
-
-    override fun popularMangaParse(response: Response, page: MangasPage) {
-        val document = response.asJsoup()
-        for (element in document.select(popularMangaSelector())) {
-            Manga.create(id).apply {
-                popularMangaFromElement(element, this)
-                page.mangas.add(this)
-            }
-        }
-
-        page.nextPageUrl = page.url
-    }
-
-    override fun popularMangaFromElement(element: Element, manga: Manga) {
-        element.select("a.resultLink").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.text()
-        }
-    }
-
-    // Not used, overrides parent.
-    override fun popularMangaNextPageSelector() = ""
-
-    override fun searchMangaInitialUrl(query: String, filters: List<Filter>) =
-            "$baseUrl/search/request.php?sortBy=popularity&sortOrder=descending&keyword=$query&genre=${filters.map { it.id }.joinToString(",")}"
-
-    override fun searchMangaSelector() = "div.searchResults > div.requested > div.row"
-
-    override fun searchMangaRequest(page: MangasPage, query: String, filters: List<Filter>): Request {
-        if (page.page == 1) {
-            page.url = searchMangaInitialUrl(query, filters)
-        }
-        val (body, requestUrl) = convertQueryToPost(page)
-        return POST(requestUrl, headers, body.build())
-    }
-
-    private fun convertQueryToPost(page: MangasPage): Pair<FormBody.Builder, String> {
-        val url = HttpUrl.parse(page.url)
-        val body = FormBody.Builder().add("page", page.page.toString())
-        for (i in 0..url.querySize() - 1) {
-            body.add(url.queryParameterName(i), url.queryParameterValue(i))
-        }
-        val requestUrl = url.scheme() + "://" + url.host() + url.encodedPath()
-        return Pair(body, requestUrl)
-    }
-
-    override fun searchMangaParse(response: Response, page: MangasPage, query: String, filters: List<Filter>) {
-        val document = response.asJsoup()
-        for (element in document.select(popularMangaSelector())) {
-            Manga.create(id).apply {
-                popularMangaFromElement(element, this)
-                page.mangas.add(this)
-            }
-        }
-
-        page.nextPageUrl = page.url
-    }
-
-    override fun searchMangaFromElement(element: Element, manga: Manga) {
-        element.select("a.resultLink").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.text()
-        }
-    }
-
-    // Not used, overrides parent.
-    override fun searchMangaNextPageSelector() = ""
-
-    override fun mangaDetailsParse(document: Document, manga: Manga) {
-        val detailElement = document.select("div.well > div.row").first()
-
-        manga.author = detailElement.select("a[href^=/search/?author=]").first()?.text()
-        manga.genre = detailElement.select("span.details > div.row > div:has(b:contains(Genre(s))) > a").map { it.text() }.joinToString()
-        manga.description = detailElement.select("strong:contains(Description:) + div").first()?.text()
-        manga.status = detailElement.select("a[href^=/search/?status=]").first()?.text().orEmpty().let { parseStatus(it) }
-        manga.thumbnail_url = detailElement.select("div > img").first()?.absUrl("src")
-    }
-
-    private fun parseStatus(status: String) = when {
-        status.contains("Ongoing (Scan)") -> Manga.ONGOING
-        status.contains("Complete (Scan)") -> Manga.COMPLETED
-        else -> Manga.UNKNOWN
-    }
-
-    override fun chapterListSelector() = "div.chapter-list > a"
-
-    override fun chapterFromElement(element: Element, chapter: Chapter) {
-        val urlElement = element.select("a").first()
-
-        chapter.setUrlWithoutDomain(urlElement.attr("href"))
-        chapter.name = element.select("span.chapterLabel").first().text()?.let { it } ?: ""
-        chapter.date_upload = element.select("time").first()?.attr("datetime")?.let { parseChapterDate(it) } ?: 0
-    }
-
-    private fun parseChapterDate(dateAsString: String): Long {
-        return SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").parse(dateAsString).time
-    }
-
-    override fun pageListParse(response: Response, pages: MutableList<Page>) {
-        val document = response.asJsoup()
-        val fullUrl = response.request().url().toString()
-        val url = fullUrl.substringBeforeLast('/')
-
-        val series = document.select("input.IndexName").first().attr("value")
-        val chapter = document.select("span.CurChapter").first().text()
-        var index = ""
-
-        val m = indexPattern.matcher(fullUrl)
-        if (m.find()) {
-            val indexNumber = m.group(1)
-            index = "-index-$indexNumber"
-        }
-
-        document.select("div.ContainerNav").first().select("select.PageSelect > option").forEach {
-            pages.add(Page(pages.size, "$url/$series-chapter-$chapter$index-page-${pages.size + 1}.html"))
-        }
-        pages.getOrNull(0)?.imageUrl = imageUrlParse(document)
-    }
-
-    // Not used, overrides parent.
-    override fun pageListParse(document: Document, pages: MutableList<Page>) {
-    }
-
-    override fun imageUrlParse(document: Document): String = document.select("img.CurImage").attr("src")
-
-    // [...document.querySelectorAll("label.triStateCheckBox input")].map(el => `Filter("${el.getAttribute('name')}", "${el.nextSibling.textContent.trim()}")`).join(',\n')
-    // http://mangasee.co/advanced-search/
-    override fun getFilterList(): List<Filter> = listOf(
-            Filter("Action", "Action"),
-            Filter("Adult", "Adult"),
-            Filter("Adventure", "Adventure"),
-            Filter("Comedy", "Comedy"),
-            Filter("Doujinshi", "Doujinshi"),
-            Filter("Drama", "Drama"),
-            Filter("Ecchi", "Ecchi"),
-            Filter("Fantasy", "Fantasy"),
-            Filter("Gender_Bender", "Gender Bender"),
-            Filter("Harem", "Harem"),
-            Filter("Hentai", "Hentai"),
-            Filter("Historical", "Historical"),
-            Filter("Horror", "Horror"),
-            Filter("Josei", "Josei"),
-            Filter("Lolicon", "Lolicon"),
-            Filter("Martial_Arts", "Martial Arts"),
-            Filter("Mature", "Mature"),
-            Filter("Mecha", "Mecha"),
-            Filter("Mystery", "Mystery"),
-            Filter("Psychological", "Psychological"),
-            Filter("Romance", "Romance"),
-            Filter("School_Life", "School Life"),
-            Filter("Sci-fi", "Sci-fi"),
-            Filter("Seinen", "Seinen"),
-            Filter("Shotacon", "Shotacon"),
-            Filter("Shoujo", "Shoujo"),
-            Filter("Shoujo_Ai", "Shoujo Ai"),
-            Filter("Shounen", "Shounen"),
-            Filter("Shounen_Ai", "Shounen Ai"),
-            Filter("Slice_of_Life", "Slice of Life"),
-            Filter("Smut", "Smut"),
-            Filter("Sports", "Sports"),
-            Filter("Supernatural", "Supernatural"),
-            Filter("Tragedy", "Tragedy"),
-            Filter("Yaoi", "Yaoi"),
-            Filter("Yuri", "Yuri")
-    )
-
-    override fun latestUpdatesInitialUrl(): String = "http://mangaseeonline.net/home/latest.request.php"
-
-    // Not used, overrides parent.
-    override fun latestUpdatesNextPageSelector(): String = ""
-
-    override fun latestUpdatesSelector(): String = "a.latestSeries"
-
-    override fun latestUpdatesRequest(page: MangasPage): Request {
-        if (page.page == 1) {
-            page.url = latestUpdatesInitialUrl()
-        }
-        val (body, requestUrl) = convertQueryToPost(page)
-        return POST(requestUrl, headers, body.build())
-    }
-
-    override fun latestUpdatesParse(response: Response, page: MangasPage) {
-        val document = response.asJsoup()
-        for (element in document.select(latestUpdatesSelector())) {
-            Manga.create(id).apply {
-                latestUpdatesFromElement(element, this)
-                page.mangas.add(this)
-            }
-        }
-
-        page.nextPageUrl = page.url
-    }
-
-    override fun latestUpdatesFromElement(element: Element, manga: Manga) {
-        element.select("a.latestSeries").first().let {
-            val chapterUrl = it.attr("href")
-            val indexOfMangaUrl = chapterUrl.indexOf("-chapter-")
-            val indexOfLastPath = chapterUrl.lastIndexOf("/")
-            val mangaUrl = chapterUrl.substring(indexOfLastPath, indexOfMangaUrl)
-            val defaultText = it.select("p.clamp2").text()
-            val m = recentUpdatesPattern.matcher(defaultText)
-            val title = if (m.matches()) m.group(1) else defaultText
-            manga.setUrlWithoutDomain("/manga" + mangaUrl)
-            manga.title = title
-        }
-    }
-
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Readmangatoday.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Readmangatoday.kt
@ -1,196 +0,0 @@
-package eu.kanade.tachiyomi.data.source.online.english
-
-import android.content.Context
-import eu.kanade.tachiyomi.data.database.models.Chapter
-import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.network.POST
-import eu.kanade.tachiyomi.data.source.EN
-import eu.kanade.tachiyomi.data.source.Language
-import eu.kanade.tachiyomi.data.source.model.MangasPage
-import eu.kanade.tachiyomi.data.source.model.Page
-import eu.kanade.tachiyomi.data.source.online.OnlineSource
-import eu.kanade.tachiyomi.data.source.online.ParsedOnlineSource
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import java.util.*
-
-class Readmangatoday(override val id: Int) : ParsedOnlineSource() {
-
-    override val name = "ReadMangaToday"
-
-    override val baseUrl = "http://www.readmanga.today"
-
-    override val lang: Language get() = EN
-
-    override val supportsLatest = true
-
-    override val client: OkHttpClient get() = network.cloudflareClient
-
-    /**
-     * Search only returns data with this set
-     */
-    override fun headersBuilder() = Headers.Builder().apply {
-        add("User-Agent", "Mozilla/5.0 (Windows NT 6.3; WOW64)")
-        add("X-Requested-With", "XMLHttpRequest")
-    }
-
-    override fun popularMangaInitialUrl() = "$baseUrl/hot-manga/"
-
-    override fun latestUpdatesInitialUrl() = "$baseUrl/latest-releases/"
-
-    override fun popularMangaSelector() = "div.hot-manga > div.style-list > div.box"
-
-    override fun latestUpdatesSelector() = "div.hot-manga > div.style-grid > div.box"
-
-    override fun popularMangaFromElement(element: Element, manga: Manga) {
-        element.select("div.title > h2 > a").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.attr("title")
-        }
-    }
-
-    override fun latestUpdatesFromElement(element: Element, manga: Manga) {
-        popularMangaFromElement(element, manga)
-    }
-
-    override fun popularMangaNextPageSelector() = "div.hot-manga > ul.pagination > li > a:contains(»)"
-
-    override fun latestUpdatesNextPageSelector(): String = "div.hot-manga > ul.pagination > li > a:contains(»)"
-
-    override fun searchMangaInitialUrl(query: String, filters: List<Filter>) =
-            "$baseUrl/service/advanced_search"
-
-
-    override fun searchMangaRequest(page: MangasPage, query: String, filters: List<OnlineSource.Filter>): Request {
-        if (page.page == 1) {
-            page.url = searchMangaInitialUrl(query, filters)
-        }
-
-        val builder = okhttp3.FormBody.Builder()
-        builder.add("manga-name", query)
-        builder.add("type", "all")
-        builder.add("status", "both")
-        for (filter in filters) {
-            builder.add("include[]", filter.id)
-        }
-
-        return POST(page.url, headers, builder.build())
-    }
-
-    override fun searchMangaSelector() = "div.style-list > div.box"
-
-    override fun searchMangaFromElement(element: Element, manga: Manga) {
-        element.select("div.title > h2 > a").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.attr("title")
-        }
-    }
-
-    override fun searchMangaNextPageSelector() = "div.next-page > a.next"
-
-    override fun mangaDetailsParse(document: Document, manga: Manga) {
-        val detailElement = document.select("div.movie-meta").first()
-
-        manga.author = document.select("ul.cast-list li.director > ul a").first()?.text()
-        manga.artist = document.select("ul.cast-list li:not(.director) > ul a").first()?.text()
-        manga.genre = detailElement.select("dl.dl-horizontal > dd:eq(5)").first()?.text()
-        manga.description = detailElement.select("li.movie-detail").first()?.text()
-        manga.status = detailElement.select("dl.dl-horizontal > dd:eq(3)").first()?.text().orEmpty().let { parseStatus(it) }
-        manga.thumbnail_url = detailElement.select("img.img-responsive").first()?.attr("src")
-    }
-
-    private fun parseStatus(status: String) = when {
-        status.contains("Ongoing") -> Manga.ONGOING
-        status.contains("Completed") -> Manga.COMPLETED
-        else -> Manga.UNKNOWN
-    }
-
-    override fun chapterListSelector() = "ul.chp_lst > li"
-
-    override fun chapterFromElement(element: Element, chapter: Chapter) {
-        val urlElement = element.select("a").first()
-
-        chapter.setUrlWithoutDomain(urlElement.attr("href"))
-        chapter.name = urlElement.select("span.val").text()
-        chapter.date_upload = element.select("span.dte").first()?.text()?.let { parseChapterDate(it) } ?: 0
-    }
-
-    private fun parseChapterDate(date: String): Long {
-        val dateWords : List<String> = date.split(" ")
-
-        if (dateWords.size == 3) {
-            val timeAgo = Integer.parseInt(dateWords[0])
-            var date : Calendar = Calendar.getInstance()
-
-            if (dateWords[1].contains("Minute")) {
-                date.add(Calendar.MINUTE, - timeAgo)
-            } else if (dateWords[1].contains("Hour")) {
-                date.add(Calendar.HOUR_OF_DAY, - timeAgo)
-            } else if (dateWords[1].contains("Day")) {
-                date.add(Calendar.DAY_OF_YEAR, -timeAgo)
-            } else if (dateWords[1].contains("Week")) {
-                date.add(Calendar.WEEK_OF_YEAR, -timeAgo)
-            } else if (dateWords[1].contains("Month")) {
-                date.add(Calendar.MONTH, -timeAgo)
-            } else if (dateWords[1].contains("Year")) {
-                date.add(Calendar.YEAR, -timeAgo)
-            }
-
-            return date.getTimeInMillis()
-        }
-
-        return 0L
-    }
-
-    override fun pageListParse(document: Document, pages: MutableList<Page>) {
-        document.select("ul.list-switcher-2 > li > select.jump-menu").first().getElementsByTag("option").forEach {
-            pages.add(Page(pages.size, it.attr("value")))
-        }
-        pages.getOrNull(0)?.imageUrl = imageUrlParse(document)
-    }
-
-    override fun imageUrlParse(document: Document) = document.select("img.img-responsive-2").first().attr("src")
-
-    // [...document.querySelectorAll("ul.manga-cat span")].map(el => `Filter("${el.getAttribute('data-id')}", "${el.nextSibling.textContent.trim()}")`).join(',\n')
-    // http://www.readmanga.today/advanced-search
-    override fun getFilterList(): List<Filter> = listOf(
-            Filter("2", "Action"),
-            Filter("4", "Adventure"),
-            Filter("5", "Comedy"),
-            Filter("6", "Doujinshi"),
-            Filter("7", "Drama"),
-            Filter("8", "Ecchi"),
-            Filter("9", "Fantasy"),
-            Filter("10", "Gender Bender"),
-            Filter("11", "Harem"),
-            Filter("12", "Historical"),
-            Filter("13", "Horror"),
-            Filter("14", "Josei"),
-            Filter("15", "Lolicon"),
-            Filter("16", "Martial Arts"),
-            Filter("17", "Mature"),
-            Filter("18", "Mecha"),
-            Filter("19", "Mystery"),
-            Filter("20", "One shot"),
-            Filter("21", "Psychological"),
-            Filter("22", "Romance"),
-            Filter("23", "School Life"),
-            Filter("24", "Sci-fi"),
-            Filter("25", "Seinen"),
-            Filter("26", "Shotacon"),
-            Filter("27", "Shoujo"),
-            Filter("28", "Shoujo Ai"),
-            Filter("29", "Shounen"),
-            Filter("30", "Shounen Ai"),
-            Filter("31", "Slice of Life"),
-            Filter("32", "Smut"),
-            Filter("33", "Sports"),
-            Filter("34", "Supernatural"),
-            Filter("35", "Tragedy"),
-            Filter("36", "Yaoi"),
-            Filter("37", "Yuri")
-    )
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/source/online/russian/Mangachan.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/online/russian/Mangachan.kt
@ -1,209 +0,0 @@
-package eu.kanade.tachiyomi.data.source.online.russian
-
-import eu.kanade.tachiyomi.data.database.models.Chapter
-import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.source.Language
-import eu.kanade.tachiyomi.data.source.RU
-import eu.kanade.tachiyomi.data.source.model.MangasPage
-import eu.kanade.tachiyomi.data.source.model.Page
-import eu.kanade.tachiyomi.data.source.online.ParsedOnlineSource
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.Response
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import java.text.SimpleDateFormat
-import java.util.*
-
-class Mangachan(override val id: Int) : ParsedOnlineSource() {
-
-    override val name = "Mangachan"
-
-    override val baseUrl = "http://mangachan.me"
-
-    override val lang: Language get() = RU
-
-    override val supportsLatest = true
-
-    override fun popularMangaInitialUrl() = "$baseUrl/mostfavorites"
-
-    override fun latestUpdatesInitialUrl() = "$baseUrl/newestch"
-
-    override fun searchMangaInitialUrl(query: String, filters: List<Filter>): String {
-        if (query.isNotEmpty()) {
-            return "$baseUrl/?do=search&subaction=search&story=$query"
-        } else if (filters.isNotEmpty()) {
-            var genres = ""
-            filters.forEach { genres = genres + it.name + '+' }
-            return "$baseUrl/tags/${genres.dropLast(1)}"
-        } else {
-            return "$baseUrl/?do=search&subaction=search&story=$query"
-        }
-    }
-
-    override fun popularMangaSelector() = "div.content_row"
-
-    override fun latestUpdatesSelector() = "ul.area_rightNews li"
-
-    override fun searchMangaSelector() = popularMangaSelector()
-
-    override fun popularMangaFromElement(element: Element, manga: Manga) {
-        element.select("h2 > a").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.text()
-        }
-    }
-
-    override fun latestUpdatesFromElement(element: Element, manga: Manga) {
-        element.select("a:nth-child(1)").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.text()
-        }
-    }
-
-    override fun searchMangaFromElement(element: Element, manga: Manga) {
-        popularMangaFromElement(element, manga)
-    }
-
-    override fun popularMangaNextPageSelector() = "a:contains(Вперед)"
-
-    override fun latestUpdatesNextPageSelector() = popularMangaNextPageSelector()
-
-    override fun searchMangaNextPageSelector() = "a:contains(Далее)"
-
-    private fun searchGenresNextPageSelector() = popularMangaNextPageSelector()
-
-    override fun searchMangaParse(response: Response, page: MangasPage, query: String, filters: List<Filter>) {
-        val document = response.asJsoup()
-        for (element in document.select(searchMangaSelector())) {
-            Manga.create(id).apply {
-                searchMangaFromElement(element, this)
-                page.mangas.add(this)
-            }
-        }
-
-        searchMangaNextPageSelector().let { selector ->
-            if (page.nextPageUrl.isNullOrEmpty() && filters.isEmpty()) {
-                val onClick = document.select(selector).first()?.attr("onclick")
-                val pageNum = onClick?.substring(23, onClick.indexOf("); return(false)"))
-                page.nextPageUrl = searchMangaInitialUrl(query, emptyList()) + "&search_start=" + pageNum
-            }
-        }
-
-        searchGenresNextPageSelector().let { selector ->
-            if (page.nextPageUrl.isNullOrEmpty() && filters.isNotEmpty()) {
-                val url = document.select(selector).first()?.attr("href")
-                page.nextPageUrl = searchMangaInitialUrl(query, filters) + url
-            }
-        }
-    }
-
-    override fun mangaDetailsParse(document: Document, manga: Manga) {
-        val infoElement = document.select("table.mangatitle").first()
-        val descElement = document.select("div#description").first()
-        val imgElement = document.select("img#cover").first()
-
-        manga.author = infoElement.select("tr:eq(2) > td:eq(1)").text()
-        manga.genre = infoElement.select("tr:eq(5) > td:eq(1)").text()
-        manga.status = parseStatus(infoElement.select("tr:eq(4) > td:eq(1)").text())
-        manga.description = descElement.textNodes().first().text()
-        manga.thumbnail_url = baseUrl + imgElement.attr("src")
-    }
-
-    private fun parseStatus(element: String): Int {
-        when {
-            element.contains("перевод завершен") -> return Manga.COMPLETED
-            element.contains("перевод продолжается") -> return Manga.ONGOING
-            else -> return Manga.UNKNOWN
-        }
-    }
-
-    override fun chapterListSelector() = "table.table_cha tr:gt(1)"
-
-    override fun chapterFromElement(element: Element, chapter: Chapter) {
-        val urlElement = element.select("a").first()
-
-        chapter.setUrlWithoutDomain(urlElement.attr("href"))
-        chapter.name = urlElement.text()
-        chapter.date_upload = element.select("div.date").first()?.text()?.let {
-            SimpleDateFormat("yyyy-MM-dd", Locale.US).parse(it).time
-        } ?: 0
-    }
-
-    override fun pageListParse(response: Response, pages: MutableList<Page>) {
-        val html = response.body().string()
-        val beginIndex = html.indexOf("fullimg\":[") + 10
-        val endIndex = html.indexOf(",]", beginIndex)
-        val trimmedHtml = html.substring(beginIndex, endIndex).replace("\"", "")
-        val pageUrls = trimmedHtml.split(',')
-
-        pageUrls.mapIndexedTo(pages) { i, url -> Page(i, "", url) }
-    }
-
-    override fun pageListParse(document: Document, pages: MutableList<Page>) { }
-
-    override fun imageUrlParse(document: Document) = ""
-
-    /* [...document.querySelectorAll("li.sidetag > a:nth-child(1)")].map((el,i) =>
-    *  { const link=el.getAttribute('href');const id=link.substr(6,link.length);
-    *  return `Filter("${id}", "${id}")` }).join(',\n')
-    *  on http://mangachan.me/
-    */
-    override fun getFilterList(): List<Filter> = listOf(
-            Filter("18_плюс", "18_плюс"),
-            Filter("bdsm", "bdsm"),
-            Filter("арт", "арт"),
-            Filter("биография", "биография"),
-            Filter("боевик", "боевик"),
-            Filter("боевые_искусства", "боевые_искусства"),
-            Filter("вампиры", "вампиры"),
-            Filter("веб", "веб"),
-            Filter("гарем", "гарем"),
-            Filter("гендерная_интрига", "гендерная_интрига"),
-            Filter("героическое_фэнтези", "героическое_фэнтези"),
-            Filter("детектив", "детектив"),
-            Filter("дзёсэй", "дзёсэй"),
-            Filter("додзинси", "додзинси"),
-            Filter("драма", "драма"),
-            Filter("игра", "игра"),
-            Filter("инцест", "инцест"),
-            Filter("искусство", "искусство"),
-            Filter("история", "история"),
-            Filter("киберпанк", "киберпанк"),
-            Filter("кодомо", "кодомо"),
-            Filter("комедия", "комедия"),
-            Filter("литРПГ", "литРПГ"),
-            Filter("махо-сёдзё", "махо-сёдзё"),
-            Filter("меха", "меха"),
-            Filter("мистика", "мистика"),
-            Filter("музыка", "музыка"),
-            Filter("научная_фантастика", "научная_фантастика"),
-            Filter("повседневность", "повседневность"),
-            Filter("постапокалиптика", "постапокалиптика"),
-            Filter("приключения", "приключения"),
-            Filter("психология", "психология"),
-            Filter("романтика", "романтика"),
-            Filter("самурайский_боевик", "самурайский_боевик"),
-            Filter("сборник", "сборник"),
-            Filter("сверхъестественное", "сверхъестественное"),
-            Filter("сказка", "сказка"),
-            Filter("спорт", "спорт"),
-            Filter("супергерои", "супергерои"),
-            Filter("сэйнэн", "сэйнэн"),
-            Filter("сёдзё", "сёдзё"),
-            Filter("сёдзё-ай", "сёдзё-ай"),
-            Filter("сёнэн", "сёнэн"),
-            Filter("сёнэн-ай", "сёнэн-ай"),
-            Filter("тентакли", "тентакли"),
-            Filter("трагедия", "трагедия"),
-            Filter("триллер", "триллер"),
-            Filter("ужасы", "ужасы"),
-            Filter("фантастика", "фантастика"),
-            Filter("фурри", "фурри"),
-            Filter("фэнтези", "фэнтези"),
-            Filter("школа", "школа"),
-            Filter("эротика", "эротика"),
-            Filter("юри", "юри"),
-            Filter("яой", "яой"),
-            Filter("ёнкома", "ёнкома")
-    )
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/source/online/russian/Mintmanga.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/online/russian/Mintmanga.kt
@ -1,165 +0,0 @@
-package eu.kanade.tachiyomi.data.source.online.russian
-
-import eu.kanade.tachiyomi.data.database.models.Chapter
-import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.source.Language
-import eu.kanade.tachiyomi.data.source.RU
-import eu.kanade.tachiyomi.data.source.model.Page
-import eu.kanade.tachiyomi.data.source.online.ParsedOnlineSource
-import okhttp3.Response
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import java.text.SimpleDateFormat
-import java.util.*
-import java.util.regex.Pattern
-
-class Mintmanga(override val id: Int) : ParsedOnlineSource() {
-
-    override val name = "Mintmanga"
-
-    override val baseUrl = "http://mintmanga.com"
-
-    override val lang: Language get() = RU
-
-    override val supportsLatest = true
-
-    override fun popularMangaInitialUrl() = "$baseUrl/list?sortType=rate"
-
-    override fun latestUpdatesInitialUrl() = "$baseUrl/list?sortType=updated"
-
-    override fun searchMangaInitialUrl(query: String, filters: List<Filter>) =
-            "$baseUrl/search?q=$query&${filters.map { it.id + "=in" }.joinToString("&")}"
-
-    override fun popularMangaSelector() = "div.desc"
-
-    override fun latestUpdatesSelector() = "div.desc"
-
-    override fun popularMangaFromElement(element: Element, manga: Manga) {
-        element.select("h3 > a").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.attr("title")
-        }
-    }
-
-    override fun latestUpdatesFromElement(element: Element, manga: Manga) {
-        popularMangaFromElement(element, manga)
-    }
-
-    override fun popularMangaNextPageSelector() = "a.nextLink"
-
-    override fun latestUpdatesNextPageSelector() = "a.nextLink"
-
-    override fun searchMangaSelector() = popularMangaSelector()
-
-    override fun searchMangaFromElement(element: Element, manga: Manga) {
-        popularMangaFromElement(element, manga)
-    }
-
-    // max 200 results
-    override fun searchMangaNextPageSelector() = null
-
-    override fun mangaDetailsParse(document: Document, manga: Manga) {
-        val infoElement = document.select("div.leftContent").first()
-
-        manga.author = infoElement.select("span.elem_author").first()?.text()
-        manga.genre = infoElement.select("span.elem_genre").text().replace(" ,", ",")
-        manga.description = infoElement.select("div.manga-description").text()
-        manga.status = parseStatus(infoElement.html())
-        manga.thumbnail_url = infoElement.select("img").attr("data-full")
-    }
-
-    private fun parseStatus(element: String): Int {
-        when {
-            element.contains("<h3>Запрещена публикация произведения по копирайту</h3>") -> return Manga.LICENSED
-            element.contains("<h1 class=\"names\"> Сингл") || element.contains("<b>Перевод:</b> завершен") -> return Manga.COMPLETED
-            element.contains("<b>Перевод:</b> продолжается") -> return Manga.ONGOING
-            else -> return Manga.UNKNOWN
-        }
-    }
-
-    override fun chapterListSelector() = "div.chapters-link tbody tr"
-
-    override fun chapterFromElement(element: Element, chapter: Chapter) {
-        val urlElement = element.select("a").first()
-
-        chapter.setUrlWithoutDomain(urlElement.attr("href") + "?mature=1")
-        chapter.name = urlElement.text().replace(" новое", "")
-        chapter.date_upload = element.select("td:eq(1)").first()?.text()?.let {
-            SimpleDateFormat("dd/MM/yy", Locale.US).parse(it).time
-        } ?: 0
-    }
-
-    override fun prepareNewChapter(chapter: Chapter, manga: Manga) {
-        chapter.chapter_number = -2f
-    }
-
-    override fun pageListParse(response: Response, pages: MutableList<Page>) {
-        val html = response.body().string()
-        val beginIndex = html.indexOf("rm_h.init( [")
-        val endIndex = html.indexOf("], 0, false);", beginIndex)
-        val trimmedHtml = html.substring(beginIndex, endIndex)
-
-        val p = Pattern.compile("'.+?','.+?',\".+?\"")
-        val m = p.matcher(trimmedHtml)
-
-        var i = 0
-        while (m.find()) {
-            val urlParts = m.group().replace("[\"\']+".toRegex(), "").split(',')
-            pages.add(Page(i++, "", urlParts[1] + urlParts[0] + urlParts[2]))
-        }
-    }
-
-    override fun pageListParse(document: Document, pages: MutableList<Page>) { }
-
-    override fun imageUrlParse(document: Document) = ""
-
-    /* [...document.querySelectorAll("tr.advanced_option:nth-child(1) > td:nth-child(3) span.js-link")].map((el,i) => {
-    *  const onClick=el.getAttribute('onclick');const id=onClick.substr(31,onClick.length-33);
-    *  return `Filter("${id}", "${el.textContent.trim()}")` }).join(',\n')
-    *  on http://mintmanga.com/search
-    */
-    override fun getFilterList(): List<Filter> = listOf(
-            Filter("el_2220", "арт"),
-            Filter("el_1353", "бара"),
-            Filter("el_1346", "боевик"),
-            Filter("el_1334", "боевые искусства"),
-            Filter("el_1339", "вампиры"),
-            Filter("el_1333", "гарем"),
-            Filter("el_1347", "гендерная интрига"),
-            Filter("el_1337", "героическое фэнтези"),
-            Filter("el_1343", "детектив"),
-            Filter("el_1349", "дзёсэй"),
-            Filter("el_1332", "додзинси"),
-            Filter("el_1310", "драма"),
-            Filter("el_5229", "игра"),
-            Filter("el_1311", "история"),
-            Filter("el_1351", "киберпанк"),
-            Filter("el_1328", "комедия"),
-            Filter("el_1318", "меха"),
-            Filter("el_1324", "мистика"),
-            Filter("el_1325", "научная фантастика"),
-            Filter("el_1327", "повседневность"),
-            Filter("el_1342", "постапокалиптика"),
-            Filter("el_1322", "приключения"),
-            Filter("el_1335", "психология"),
-            Filter("el_1313", "романтика"),
-            Filter("el_1316", "самурайский боевик"),
-            Filter("el_1350", "сверхъестественное"),
-            Filter("el_1314", "сёдзё"),
-            Filter("el_1320", "сёдзё-ай"),
-            Filter("el_1326", "сёнэн"),
-            Filter("el_1330", "сёнэн-ай"),
-            Filter("el_1321", "спорт"),
-            Filter("el_1329", "сэйнэн"),
-            Filter("el_1344", "трагедия"),
-            Filter("el_1341", "триллер"),
-            Filter("el_1317", "ужасы"),
-            Filter("el_1331", "фантастика"),
-            Filter("el_1323", "фэнтези"),
-            Filter("el_1319", "школа"),
-            Filter("el_1340", "эротика"),
-            Filter("el_1354", "этти"),
-            Filter("el_1315", "юри"),
-            Filter("el_1336", "яой")
-    )
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/source/online/russian/Readmanga.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/online/russian/Readmanga.kt
@ -1,164 +0,0 @@
-package eu.kanade.tachiyomi.data.source.online.russian
-
-import eu.kanade.tachiyomi.data.database.models.Chapter
-import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.source.Language
-import eu.kanade.tachiyomi.data.source.RU
-import eu.kanade.tachiyomi.data.source.model.Page
-import eu.kanade.tachiyomi.data.source.online.ParsedOnlineSource
-import okhttp3.Response
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import java.text.SimpleDateFormat
-import java.util.*
-import java.util.regex.Pattern
-
-class Readmanga(override val id: Int) : ParsedOnlineSource() {
-
-    override val name = "Readmanga"
-
-    override val baseUrl = "http://readmanga.me"
-
-    override val lang: Language get() = RU
-
-    override val supportsLatest = true
-
-    override fun popularMangaInitialUrl() = "$baseUrl/list?sortType=rate"
-
-    override fun latestUpdatesInitialUrl() = "$baseUrl/list?sortType=updated"
-
-    override fun searchMangaInitialUrl(query: String, filters: List<Filter>) =
-            "$baseUrl/search?q=$query&${filters.map { it.id + "=in" }.joinToString("&")}"
-
-    override fun popularMangaSelector() = "div.desc"
-
-    override fun latestUpdatesSelector() = "div.desc"
-
-    override fun popularMangaFromElement(element: Element, manga: Manga) {
-        element.select("h3 > a").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.attr("title")
-        }
-    }
-
-    override fun latestUpdatesFromElement(element: Element, manga: Manga) {
-        popularMangaFromElement(element, manga)
-    }
-
-    override fun popularMangaNextPageSelector() = "a.nextLink"
-
-    override fun latestUpdatesNextPageSelector() = "a.nextLink"
-
-    override fun searchMangaSelector() = popularMangaSelector()
-
-    override fun searchMangaFromElement(element: Element, manga: Manga) {
-        popularMangaFromElement(element, manga)
-    }
-
-    // max 200 results
-    override fun searchMangaNextPageSelector() = null
-
-    override fun mangaDetailsParse(document: Document, manga: Manga) {
-        val infoElement = document.select("div.leftContent").first()
-
-        manga.author = infoElement.select("span.elem_author").first()?.text()
-        manga.genre = infoElement.select("span.elem_genre").text().replace(" ,", ",")
-        manga.description = infoElement.select("div.manga-description").text()
-        manga.status = parseStatus(infoElement.html())
-        manga.thumbnail_url = infoElement.select("img").attr("data-full")
-    }
-
-    private fun parseStatus(element: String): Int {
-        when {
-            element.contains("<h3>Запрещена публикация произведения по копирайту</h3>") -> return Manga.LICENSED
-            element.contains("<h1 class=\"names\"> Сингл") || element.contains("<b>Перевод:</b> завершен") -> return Manga.COMPLETED
-            element.contains("<b>Перевод:</b> продолжается") -> return Manga.ONGOING
-            else -> return Manga.UNKNOWN
-        }
-    }
-
-    override fun chapterListSelector() = "div.chapters-link tbody tr"
-
-    override fun chapterFromElement(element: Element, chapter: Chapter) {
-        val urlElement = element.select("a").first()
-
-        chapter.setUrlWithoutDomain(urlElement.attr("href") + "?mature=1")
-        chapter.name = urlElement.text().replace(" новое", "")
-        chapter.date_upload = element.select("td:eq(1)").first()?.text()?.let {
-            SimpleDateFormat("dd/MM/yy", Locale.US).parse(it).time
-        } ?: 0
-    }
-
-    override fun prepareNewChapter(chapter: Chapter, manga: Manga) {
-        chapter.chapter_number = -2f
-    }
-
-    override fun pageListParse(response: Response, pages: MutableList<Page>) {
-        val html = response.body().string()
-        val beginIndex = html.indexOf("rm_h.init( [")
-        val endIndex = html.indexOf("], 0, false);", beginIndex)
-        val trimmedHtml = html.substring(beginIndex, endIndex)
-
-        val p = Pattern.compile("'.+?','.+?',\".+?\"")
-        val m = p.matcher(trimmedHtml)
-
-        var i = 0
-        while (m.find()) {
-            val urlParts = m.group().replace("[\"\']+".toRegex(), "").split(',')
-            pages.add(Page(i++, "", urlParts[1] + urlParts[0] + urlParts[2]))
-        }
-    }
-
-    override fun pageListParse(document: Document, pages: MutableList<Page>) { }
-
-    override fun imageUrlParse(document: Document) = ""
-
-    /* [...document.querySelectorAll("tr.advanced_option:nth-child(1) > td:nth-child(3) span.js-link")].map((el,i) => {
-    *  const onClick=el.getAttribute('onclick');const id=onClick.substr(31,onClick.length-33);
-    *  return `Filter("${id}", "${el.textContent.trim()}")` }).join(',\n')
-    *  on http://readmanga.me/search
-    */
-    override fun getFilterList(): List<Filter> = listOf(
-            Filter("el_5685", "арт"),
-            Filter("el_2155", "боевик"),
-            Filter("el_2143", "боевые искусства"),
-            Filter("el_2148", "вампиры"),
-            Filter("el_2142", "гарем"),
-            Filter("el_2156", "гендерная интрига"),
-            Filter("el_2146", "героическое фэнтези"),
-            Filter("el_2152", "детектив"),
-            Filter("el_2158", "дзёсэй"),
-            Filter("el_2141", "додзинси"),
-            Filter("el_2118", "драма"),
-            Filter("el_2154", "игра"),
-            Filter("el_2119", "история"),
-            Filter("el_8032", "киберпанк"),
-            Filter("el_2137", "кодомо"),
-            Filter("el_2136", "комедия"),
-            Filter("el_2147", "махо-сёдзё"),
-            Filter("el_2126", "меха"),
-            Filter("el_2132", "мистика"),
-            Filter("el_2133", "научная фантастика"),
-            Filter("el_2135", "повседневность"),
-            Filter("el_2151", "постапокалиптика"),
-            Filter("el_2130", "приключения"),
-            Filter("el_2144", "психология"),
-            Filter("el_2121", "романтика"),
-            Filter("el_2124", "самурайский боевик"),
-            Filter("el_2159", "сверхъестественное"),
-            Filter("el_2122", "сёдзё"),
-            Filter("el_2128", "сёдзё-ай"),
-            Filter("el_2134", "сёнэн"),
-            Filter("el_2139", "сёнэн-ай"),
-            Filter("el_2129", "спорт"),
-            Filter("el_2138", "сэйнэн"),
-            Filter("el_2153", "трагедия"),
-            Filter("el_2150", "триллер"),
-            Filter("el_2125", "ужасы"),
-            Filter("el_2140", "фантастика"),
-            Filter("el_2131", "фэнтези"),
-            Filter("el_2127", "школа"),
-            Filter("el_2149", "этти"),
-            Filter("el_2123", "юри")
-    )
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt
@ -0,0 +1,28 @@
+package eu.kanade.tachiyomi.data.track
+
+import android.content.Context
+import eu.kanade.tachiyomi.data.track.anilist.Anilist
+import eu.kanade.tachiyomi.data.track.kitsu.Kitsu
+import eu.kanade.tachiyomi.data.track.myanimelist.Myanimelist
+
+class TrackManager(private val context: Context) {
+
+    companion object {
+        const val MYANIMELIST = 1
+        const val ANILIST = 2
+        const val KITSU = 3
+    }
+
+    val myAnimeList = Myanimelist(context, MYANIMELIST)
+
+    val aniList = Anilist(context, ANILIST)
+
+    val kitsu = Kitsu(context, KITSU)
+
+    val services = listOf(myAnimeList, aniList, kitsu)
+
+    fun getService(id: Int) = services.find { it.id == id }
+
+    fun hasLoggedServices() = services.any { it.isLogged }
+
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackService.kt
@ -0,0 +1,70 @@
+package eu.kanade.tachiyomi.data.track
+
+import android.support.annotation.CallSuper
+import android.support.annotation.DrawableRes
+import eu.kanade.tachiyomi.data.database.models.Track
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.network.NetworkHelper
+import okhttp3.OkHttpClient
+import rx.Completable
+import rx.Observable
+import uy.kohesive.injekt.injectLazy
+
+abstract class TrackService(val id: Int) {
+
+    val preferences: PreferencesHelper by injectLazy()
+    val networkService: NetworkHelper by injectLazy()
+
+    open val client: OkHttpClient
+        get() = networkService.client
+
+    // Name of the manga sync service to display
+    abstract val name: String
+
+    @DrawableRes
+    abstract fun getLogo(): Int
+
+    abstract fun getLogoColor(): Int
+
+    abstract fun getStatusList(): List<Int>
+
+    abstract fun getStatus(status: Int): String
+
+    abstract fun getScoreList(): List<String>
+
+    open fun indexToScore(index: Int): Float {
+        return index.toFloat()
+    }
+
+    abstract fun displayScore(track: Track): String
+
+    abstract fun add(track: Track): Observable<Track>
+
+    abstract fun update(track: Track): Observable<Track>
+
+    abstract fun bind(track: Track): Observable<Track>
+
+    abstract fun search(query: String): Observable<List<Track>>
+
+    abstract fun refresh(track: Track): Observable<Track>
+
+    abstract fun login(username: String, password: String): Completable
+
+    @CallSuper
+    open fun logout() {
+        preferences.setTrackCredentials(this, "", "")
+    }
+
+    open val isLogged: Boolean
+        get() = !getUsername().isEmpty() &&
+                !getPassword().isEmpty()
+
+    fun getUsername() = preferences.trackUsername(this)
+
+    fun getPassword() = preferences.trackPassword(this)
+
+    fun saveCredentials(username: String, password: String) {
+        preferences.setTrackCredentials(this, username, password)
+    }
+
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt
@ -0,0 +1,160 @@
+package eu.kanade.tachiyomi.data.track.anilist
+
+import android.content.Context
+import android.graphics.Color
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.database.models.Track
+import eu.kanade.tachiyomi.data.preference.getOrDefault
+import eu.kanade.tachiyomi.data.track.TrackService
+import rx.Completable
+import rx.Observable
+
+class Anilist(private val context: Context, id: Int) : TrackService(id) {
+
+    companion object {
+        const val READING = 1
+        const val COMPLETED = 2
+        const val ON_HOLD = 3
+        const val DROPPED = 4
+        const val PLAN_TO_READ = 5
+
+        const val DEFAULT_STATUS = READING
+        const val DEFAULT_SCORE = 0
+    }
+
+    override val name = "AniList"
+
+    private val interceptor by lazy { AnilistInterceptor(getPassword()) }
+
+    private val api by lazy { AnilistApi(client, interceptor) }
+
+    override fun getLogo() = R.drawable.al
+
+    override fun getLogoColor() = Color.rgb(18, 25, 35)
+
+    override fun getStatusList(): List<Int> {
+        return listOf(READING, COMPLETED, ON_HOLD, DROPPED, PLAN_TO_READ)
+    }
+
+    override fun getStatus(status: Int): String = with(context) {
+        when (status) {
+            READING -> getString(R.string.reading)
+            COMPLETED -> getString(R.string.completed)
+            ON_HOLD -> getString(R.string.on_hold)
+            DROPPED -> getString(R.string.dropped)
+            PLAN_TO_READ -> getString(R.string.plan_to_read)
+            else -> ""
+        }
+    }
+
+    override fun getScoreList(): List<String> {
+        return when (preferences.anilistScoreType().getOrDefault()) {
+            // 10 point
+            0 -> IntRange(0, 10).map(Int::toString)
+            // 100 point
+            1 -> IntRange(0, 100).map(Int::toString)
+            // 5 stars
+            2 -> IntRange(0, 5).map { "$it ★" }
+            // Smiley
+            3 -> listOf("-", "😦", "😐", "😊")
+            // 10 point decimal
+            4 -> IntRange(0, 100).map { (it / 10f).toString() }
+            else -> throw Exception("Unknown score type")
+        }
+    }
+
+    override fun indexToScore(index: Int): Float {
+        return when (preferences.anilistScoreType().getOrDefault()) {
+            // 10 point
+            0 -> index * 10f
+            // 100 point
+            1 -> index.toFloat()
+            // 5 stars
+            2 -> index * 20f
+            // Smiley
+            3 -> index * 30f
+            // 10 point decimal
+            4 -> index.toFloat()
+            else -> throw Exception("Unknown score type")
+        }
+    }
+
+    override fun displayScore(track: Track): String {
+        val score = track.score
+        return when (preferences.anilistScoreType().getOrDefault()) {
+            2 -> "${(score / 20).toInt()} ★"
+            3 -> when {
+                score == 0f -> "0"
+                score <= 30 -> "😦"
+                score <= 60 -> "😐"
+                else -> "😊"
+            }
+            else -> track.toAnilistScore()
+        }
+    }
+
+    override fun add(track: Track): Observable<Track> {
+        return api.addLibManga(track)
+    }
+
+    override fun update(track: Track): Observable<Track> {
+        if (track.total_chapters != 0 && track.last_chapter_read == track.total_chapters) {
+            track.status = COMPLETED
+        }
+
+        return api.updateLibManga(track)
+    }
+
+    override fun bind(track: Track): Observable<Track> {
+        return api.findLibManga(track, getUsername())
+                .flatMap { remoteTrack ->
+                    if (remoteTrack != null) {
+                        track.copyPersonalFrom(remoteTrack)
+                        update(track)
+                    } else {
+                        // Set default fields if it's not found in the list
+                        track.score = DEFAULT_SCORE.toFloat()
+                        track.status = DEFAULT_STATUS
+                        add(track)
+                    }
+                }
+    }
+
+    override fun search(query: String): Observable<List<Track>> {
+        return api.search(query)
+    }
+
+    override fun refresh(track: Track): Observable<Track> {
+        return api.getLibManga(track, getUsername())
+                .map { remoteTrack ->
+                    track.copyPersonalFrom(remoteTrack)
+                    track.total_chapters = remoteTrack.total_chapters
+                    track
+                }
+    }
+
+    override fun login(username: String, password: String) = login(password)
+
+    fun login(authCode: String): Completable {
+        return api.login(authCode)
+                // Save the token in the interceptor.
+                .doOnNext { interceptor.setAuth(it) }
+                // Obtain the authenticated user from the API.
+                .zipWith(api.getCurrentUser().map { pair ->
+                    preferences.anilistScoreType().set(pair.second)
+                    pair.first
+                }, { oauth, user -> Pair(user, oauth.refresh_token!!) })
+                // Save service credentials (username and refresh token).
+                .doOnNext { saveCredentials(it.first, it.second) }
+                // Logout on any error.
+                .doOnError { logout() }
+                .toCompletable()
+    }
+
+    override fun logout() {
+        super.logout()
+        interceptor.setAuth(null)
+    }
+
+}
+
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt
@ -0,0 +1,161 @@
+package eu.kanade.tachiyomi.data.track.anilist
+
+import android.net.Uri
+import com.github.salomonbrys.kotson.int
+import com.github.salomonbrys.kotson.string
+import com.google.gson.JsonObject
+import eu.kanade.tachiyomi.data.database.models.Track
+import eu.kanade.tachiyomi.network.POST
+import okhttp3.FormBody
+import okhttp3.OkHttpClient
+import okhttp3.ResponseBody
+import retrofit2.Response
+import retrofit2.Retrofit
+import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory
+import retrofit2.converter.gson.GsonConverterFactory
+import retrofit2.http.*
+import rx.Observable
+
+class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
+
+    private val rest = restBuilder()
+            .client(client.newBuilder().addInterceptor(interceptor).build())
+            .build()
+            .create(Rest::class.java)
+
+    fun addLibManga(track: Track): Observable<Track> {
+        return rest.addLibManga(track.remote_id, track.last_chapter_read, track.toAnilistStatus())
+                .map { response ->
+                    response.body()?.close()
+                    if (!response.isSuccessful) {
+                        throw Exception("Could not add manga")
+                    }
+                    track
+                }
+    }
+
+    fun updateLibManga(track: Track): Observable<Track> {
+        return rest.updateLibManga(track.remote_id, track.last_chapter_read, track.toAnilistStatus(),
+                track.toAnilistScore())
+                .map { response ->
+                    response.body()?.close()
+                    if (!response.isSuccessful) {
+                        throw Exception("Could not update manga")
+                    }
+                    track
+                }
+    }
+
+    fun search(query: String): Observable<List<Track>> {
+        return rest.search(query, 1)
+                .map { list ->
+                    list.filter { it.type != "Novel" }.map { it.toTrack() }
+                }
+                .onErrorReturn { emptyList() }
+    }
+
+    fun getList(username: String): Observable<List<Track>> {
+        return rest.getLib(username)
+                .map { lib ->
+                    lib.flatten().map { it.toTrack() }
+                }
+    }
+
+    fun findLibManga(track: Track, username: String) : Observable<Track?> {
+        // TODO avoid getting the entire list
+        return getList(username)
+                .map { list -> list.find { it.remote_id == track.remote_id } }
+    }
+
+    fun getLibManga(track: Track, username: String): Observable<Track> {
+        return findLibManga(track, username)
+                .map { it ?: throw Exception("Could not find manga") }
+    }
+
+    fun login(authCode: String): Observable<OAuth> {
+        return restBuilder()
+                .client(client)
+                .build()
+                .create(Rest::class.java)
+                .requestAccessToken(authCode)
+    }
+
+    fun getCurrentUser(): Observable<Pair<String, Int>> {
+        return rest.getCurrentUser()
+                .map { it["id"].string to it["score_type"].int }
+    }
+
+    private fun restBuilder() = Retrofit.Builder()
+            .baseUrl(baseUrl)
+            .addConverterFactory(GsonConverterFactory.create())
+            .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+
+    private interface Rest {
+
+        @FormUrlEncoded
+        @POST("auth/access_token")
+        fun requestAccessToken(
+                @Field("code") code: String,
+                @Field("grant_type") grant_type: String = "authorization_code",
+                @Field("client_id") client_id: String = clientId,
+                @Field("client_secret") client_secret: String = clientSecret,
+                @Field("redirect_uri") redirect_uri: String = clientUrl
+        ) : Observable<OAuth>
+
+        @GET("user")
+        fun getCurrentUser(): Observable<JsonObject>
+
+        @GET("manga/search/{query}")
+        fun search(
+                @Path("query") query: String,
+                @Query("page") page: Int
+        ): Observable<List<ALManga>>
+
+        @GET("user/{username}/mangalist")
+        fun getLib(
+                @Path("username") username: String
+        ): Observable<ALUserLists>
+
+        @FormUrlEncoded
+        @PUT("mangalist")
+        fun addLibManga(
+                @Field("id") id: Int,
+                @Field("chapters_read") chapters_read: Int,
+                @Field("list_status") list_status: String
+        ) : Observable<Response<ResponseBody>>
+
+        @FormUrlEncoded
+        @PUT("mangalist")
+        fun updateLibManga(
+                @Field("id") id: Int,
+                @Field("chapters_read") chapters_read: Int,
+                @Field("list_status") list_status: String,
+                @Field("score") score_raw: String
+        ) : Observable<Response<ResponseBody>>
+
+    }
+
+    companion object {
+        private const val clientId = "tachiyomi-hrtje"
+        private const val clientSecret = "nlGB5OmgE9YWq5dr3gIDbTQV0C"
+        private const val clientUrl = "tachiyomi://anilist-auth"
+        private const val baseUrl = "https://anilist.co/api/"
+
+        fun authUrl() = Uri.parse("${baseUrl}auth/authorize").buildUpon()
+                .appendQueryParameter("grant_type", "authorization_code")
+                .appendQueryParameter("client_id", clientId)
+                .appendQueryParameter("redirect_uri", clientUrl)
+                .appendQueryParameter("response_type", "code")
+                .build()
+
+        fun refreshTokenRequest(token: String) = POST("${baseUrl}auth/access_token",
+                body = FormBody.Builder()
+                        .add("grant_type", "refresh_token")
+                        .add("client_id", clientId)
+                        .add("client_secret", clientSecret)
+                        .add("refresh_token", token)
+                        .build())
+
+    }
+
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/anilist/AnilistInterceptor.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/mangasync/anilist/AnilistInterceptor.kt
@ -1,61 +1,60 @@
-package eu.kanade.tachiyomi.data.mangasync.anilist
-
-import com.google.gson.Gson
-import eu.kanade.tachiyomi.data.mangasync.anilist.model.OAuth
-import okhttp3.Interceptor
-import okhttp3.Response
-
-class AnilistInterceptor(private var refreshToken: String?) : Interceptor {
-
-    /**
-     * OAuth object used for authenticated requests.
-     *
-     * Anilist returns the date without milliseconds. We fix that and make the token expire 1 minute
-     * before its original expiration date.
-     */
-    private var oauth: OAuth? = null
-        set(value) {
-            field = value?.copy(expires = value.expires * 1000 - 60 * 1000)
-        }
-
-    override fun intercept(chain: Interceptor.Chain): Response {
-        val originalRequest = chain.request()
-
-        if (refreshToken.isNullOrEmpty()) {
-            throw Exception("Not authenticated with Anilist")
-        }
-
-        // Refresh access token if null or expired.
-        if (oauth == null || oauth!!.isExpired()) {
-            val response = chain.proceed(AnilistApi.refreshTokenRequest(refreshToken!!))
-            oauth = if (response.isSuccessful) {
-                Gson().fromJson(response.body().string(), OAuth::class.java)
-            } else {
-                response.close()
-                null
-            }
-        }
-
-        // Throw on null auth.
-        if (oauth == null) {
-            throw Exception("Access token wasn't refreshed")
-        }
-
-        // Add the authorization header to the original request.
-        val authRequest = originalRequest.newBuilder()
-                .addHeader("Authorization", "Bearer ${oauth!!.access_token}")
-                .build()
-
-        return chain.proceed(authRequest)
-    }
-
-    /**
-     * Called when the user authenticates with Anilist for the first time. Sets the refresh token
-     * and the oauth object.
-     */
-    fun setAuth(oauth: OAuth?) {
-        refreshToken = oauth?.refresh_token
-        this.oauth = oauth
-    }
-
+package eu.kanade.tachiyomi.data.track.anilist
+
+import com.google.gson.Gson
+import okhttp3.Interceptor
+import okhttp3.Response
+
+class AnilistInterceptor(private var refreshToken: String?) : Interceptor {
+
+    /**
+     * OAuth object used for authenticated requests.
+     *
+     * Anilist returns the date without milliseconds. We fix that and make the token expire 1 minute
+     * before its original expiration date.
+     */
+    private var oauth: OAuth? = null
+        set(value) {
+            field = value?.copy(expires = value.expires * 1000 - 60 * 1000)
+        }
+
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val originalRequest = chain.request()
+
+        if (refreshToken.isNullOrEmpty()) {
+            throw Exception("Not authenticated with Anilist")
+        }
+
+        // Refresh access token if null or expired.
+        if (oauth == null || oauth!!.isExpired()) {
+            val response = chain.proceed(AnilistApi.refreshTokenRequest(refreshToken!!))
+            oauth = if (response.isSuccessful) {
+                Gson().fromJson(response.body()!!.string(), OAuth::class.java)
+            } else {
+                response.close()
+                null
+            }
+        }
+
+        // Throw on null auth.
+        if (oauth == null) {
+            throw Exception("Access token wasn't refreshed")
+        }
+
+        // Add the authorization header to the original request.
+        val authRequest = originalRequest.newBuilder()
+                .addHeader("Authorization", "Bearer ${oauth!!.access_token}")
+                .build()
+
+        return chain.proceed(authRequest)
+    }
+
+    /**
+     * Called when the user authenticates with Anilist for the first time. Sets the refresh token
+     * and the oauth object.
+     */
+    fun setAuth(oauth: OAuth?) {
+        refreshToken = oauth?.refresh_token
+        this.oauth = oauth
+    }
+
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistModels.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistModels.kt
@ -0,0 +1,86 @@
+package eu.kanade.tachiyomi.data.track.anilist
+
+import eu.kanade.tachiyomi.data.database.models.Track
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.data.preference.getOrDefault
+import eu.kanade.tachiyomi.data.track.TrackManager
+import uy.kohesive.injekt.injectLazy
+
+data class ALManga(
+        val id: Int,
+        val title_romaji: String,
+        val type: String,
+        val total_chapters: Int) {
+
+    fun toTrack() = Track.create(TrackManager.ANILIST).apply {
+        remote_id = this@ALManga.id
+        title = title_romaji
+        total_chapters = this@ALManga.total_chapters
+    }
+}
+
+data class ALUserManga(
+        val id: Int,
+        val list_status: String,
+        val score_raw: Int,
+        val chapters_read: Int,
+        val manga: ALManga) {
+
+    fun toTrack() = Track.create(TrackManager.ANILIST).apply {
+        remote_id = manga.id
+        status = toTrackStatus()
+        score = score_raw.toFloat()
+        last_chapter_read = chapters_read
+    }
+
+    fun toTrackStatus() = when (list_status) {
+        "reading" -> Anilist.READING
+        "completed" -> Anilist.COMPLETED
+        "on-hold" -> Anilist.ON_HOLD
+        "dropped" -> Anilist.DROPPED
+        "plan to read" -> Anilist.PLAN_TO_READ
+        else -> throw NotImplementedError("Unknown status")
+    }
+}
+
+data class ALUserLists(val lists: Map<String, List<ALUserManga>>) {
+
+    fun flatten() = lists.values.flatten()
+}
+
+fun Track.toAnilistStatus() = when (status) {
+    Anilist.READING -> "reading"
+    Anilist.COMPLETED -> "completed"
+    Anilist.ON_HOLD -> "on-hold"
+    Anilist.DROPPED -> "dropped"
+    Anilist.PLAN_TO_READ -> "plan to read"
+    else -> throw NotImplementedError("Unknown status")
+}
+
+private val preferences: PreferencesHelper by injectLazy()
+
+fun Track.toAnilistScore(): String = when (preferences.anilistScoreType().getOrDefault()) {
+    // 10 point
+    0 -> (score.toInt() / 10).toString()
+    // 100 point
+    1 -> score.toInt().toString()
+    // 5 stars
+    2 -> when {
+        score == 0f -> "0"
+        score < 30 -> "1"
+        score < 50 -> "2"
+        score < 70 -> "3"
+        score < 90 -> "4"
+        else -> "5"
+    }
+    // Smiley
+    3 -> when {
+        score == 0f -> "0"
+        score <= 30 -> ":("
+        score <= 60 -> ":|"
+        else -> ":)"
+    }
+    // 10 point decimal
+    4 -> (score / 10).toString()
+    else -> throw Exception("Unknown score type")
+}
--- a/Show More
+++ b/Show More