Release v0.7.4

* vanity url

* vanity url

* vanity url

.github/CONTRIBUTING.md

@@ -1,5 +1,5 @@
 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)
+2. If you are unsure, ask here: [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/tachiyomi)
 3. What is your type of issue?
     * [Catalogue request](#catalogue-requests)
     * [Bugs](#bugs)

.github/ISSUE_TEMPLATE.md

@@ -1 +1,13 @@
-**Please read https://github.com/inorichi/tachiyomi/blob/master/.github/CONTRIBUTING.md before posting**
+**Please fill out this form and remove the first two lines before posting.**
+**If your issue is a request for a catalogue it belongs here https://github.com/inorichi/tachiyomi-extensions/**
+**App version:**
+
+**Issue/Request:**
+
+**Steps to reproduce (if applicable)**
+
+ 1.
+ 2.
+ 3.
+
+**Other details:**

.travis.yml

@@ -1,8 +1,8 @@
 language: android
 android:
   components:
-  - build-tools-27.0.1
-  - android-26
+  - build-tools-27.0.3
+  - android-27
   - extra-android-m2repository
   - extra-google-m2repository
   - extra-android-support
@@ -10,6 +10,7 @@ android:
   licenses:
   - android-sdk-license-.+
 before_install:
+- yes | sdkmanager "platforms;android-27" # workaround for accepting the license
 - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
     openssl aes-256-cbc -K $encrypted_e56be693d4fd_key -iv $encrypted_e56be693d4fd_iv -in "$PWD/.travis/secrets.tar.enc" -out secrets.tar -d;
     tar xf secrets.tar;

.travis/build.sh

@@ -2,6 +2,8 @@
 
 git fetch --unshallow #required for commit count
 
+cp .travis/google-services.json app/
+
 if [ -z "$TRAVIS_TAG" ]; then
     ./gradlew clean assembleStandardDebug
 

.travis/google-services.json

@@ -0,0 +1,73 @@
+{
+  "project_info": {
+    "project_number": "777921915939",
+    "firebase_url": "https://tachiyomi-47364.firebaseio.com",
+    "project_id": "tachiyomi-47364",
+    "storage_bucket": "tachiyomi-47364.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:777921915939:android:36544cd2d96c50c7",
+        "android_client_info": {
+          "package_name": "eu.kanade.tachiyomi"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "777921915939-9q25jvgbdtpk91daqlk7sa1cbdcg77o6.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAHr8RxyeiSPC_MxJTnivz-hmdo5oX0QQQ"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:777921915939:android:564fdc1d62efd1de",
+        "android_client_info": {
+          "package_name": "eu.kanade.tachiyomi.debug"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "777921915939-9q25jvgbdtpk91daqlk7sa1cbdcg77o6.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAHr8RxyeiSPC_MxJTnivz-hmdo5oX0QQQ"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

README.md

@@ -1,6 +1,6 @@
-| Build | Download | F-Droid | Contribute | Contact |
+| Build | Stable | Dev | Contribute | Contact |
 |-------|----------|---------|------------|---------|
-| [![Travis](https://img.shields.io/travis/inorichi/tachiyomi.svg)](https://travis-ci.org/inorichi/tachiyomi) | [![stable release](https://img.shields.io/github/release/inorichi/tachiyomi.svg?maxAge=3600&label=stable)](https://github.com/inorichi/tachiyomi/releases) [![latest dev build](https://img.shields.io/badge/dev-latest%20build-blue.svg)](http://tachiyomi.kanade.eu/latest) | [![fdroid release](https://img.shields.io/badge/stable-f--droid.org-blue.svg)](https://f-droid.org/repository/browse/?fdid=eu.kanade.tachiyomi) [![fdroid dev](https://img.shields.io/badge/dev-wiki-blue.svg)](//github.com/inorichi/tachiyomi/wiki/FDroid-for-dev-versions) | [![Translation status](http://weblate.j2ghz.com/widgets/tachiyomi/-/svg-badge.svg)](https://github.com/inorichi/tachiyomi/wiki/Translation) | [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/2dDQBv2) |
+| [![Travis](https://img.shields.io/travis/inorichi/tachiyomi.svg)](https://travis-ci.org/inorichi/tachiyomi) | [![stable release](https://img.shields.io/github/release/inorichi/tachiyomi.svg?maxAge=3600&label=download%20(autoupdate%20included))](https://github.com/inorichi/tachiyomi/releases) | [![latest dev build](https://img.shields.io/badge/download-latest%20build-blue.svg)](http://tachiyomi.kanade.eu/latest) [![fdroid dev](https://img.shields.io/badge/autoupdate-wiki-blue.svg)](//github.com/inorichi/tachiyomi/wiki/F-Droid-for-dev-versions) | [![Translation status](https://hosted.weblate.org/widgets/tachiyomi/-/svg-badge.svg)](https://hosted.weblate.org/engage/tachiyomi/?utm_source=widget) | [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/tachiyomi) |
 
 
 # ![app icon](./.github/readme-images/app-icon.png)Tachiyomi
@@ -11,23 +11,55 @@ Tachiyomi is a free and open source manga reader for Android.
 ## Features
 
 Features include:
-* Online reading from sources like Batoto, KissManga, MangaFox, [and more](https://github.com/inorichi/tachiyomi-extensions)
+* Online reading from sources such as KissManga, MangaFox, [and more](https://github.com/inorichi/tachiyomi-extensions)
 * Local reading of downloaded manga
 * Configurable reader with multiple viewers, reading directions and other settings
-* MyAnimeList, AniList, and Kitsu support
+* [MyAnimeList](https://myanimelist.net/), [AniList](https://anilist.co/), and [Kitsu](https://kitsu.io/explore/anime) support
 * Categories to organize your library
 * Light and dark themes
 * Schedule updating your library for new chapters
-* Create backups locally or to your cloud service of choice
+* Create backups locally to read offline or to your desired cloud service 
 
 ## Download
-Get the app from our [releases page](https://github.com/inorichi/tachiyomi/releases) or from [f-droid](https://f-droid.org/packages/eu.kanade.tachiyomi/).
+Get the app from our [releases page](https://github.com/inorichi/tachiyomi/releases).
 
-If you want to try new features before they get to the stable release, you can download the dev version [here](http://tachiyomi.kanade.eu/latest) (auto-updates not included), or add our [F-Droid repo](https://github.com/inorichi/tachiyomi/wiki/FDroid-for-dev-versions).
+If you want to try new features before they get to the stable release, you can download the dev version [here](http://tachiyomi.kanade.eu/latest) (auto-updates not included), or add our [F-Droid repo](https://github.com/inorichi/tachiyomi/wiki/F-Droid-for-dev-versions).
 
 ## Issues, Feature Requests and Contributing
 
-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.
+Please make sure to read the full guidelines. Your issue may be closed without warning if you do not.
+
+<details><summary>Issues</summary>
+
+1. **Before reporting a new issue, take a look at the [FAQ](https://github.com/inorichi/tachiyomi/wiki/FAQ), the [changelog](https://github.com/inorichi/tachiyomi/releases) and the already opened [issues](https://github.com/inorichi/tachiyomi/issues).**
+2. If you are unsure, ask here: [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/tachiyomi)
+
+</details>
+
+<details><summary>Bugs</summary>
+
+* Include version (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)
+* For large logs use http://pastebin.com/ (or similar)
+* Don't group unrelated requests into one issue
+
+DO: https://github.com/inorichi/tachiyomi/issues/24 https://github.com/inorichi/tachiyomi/issues/71
+
+DON'T: https://github.com/inorichi/tachiyomi/issues/75
+
+</details>
+
+<details><summary>Feature Requests</summary>
+
+* Write a detailed issue, explaning what it should do or how. Avoid writing just "like X app does"
+* Include screenshot (if needed)
+
+Catalogue requests should be created at https://github.com/inorichi/tachiyomi-extensions, they do not belong in this repository.
+</details>
 
 ## FAQ
 

app/.gitignore

@@ -1,4 +1,5 @@
 /build
 *iml
 *.iml
-custom.gradle
+custom.gradle
+google-services.json

app/build.gradle

@@ -29,17 +29,17 @@ ext {
 }
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "27.0.1"
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
     publishNonDefault true
 
     defaultConfig {
         applicationId "eu.kanade.tachiyomi"
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 27
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        versionCode 30
-        versionName "0.6.7"
+        versionCode 37
+        versionName "0.7.4"
 
         buildConfigField "String", "COMMIT_COUNT", "\"${getCommitCount()}\""
         buildConfigField "String", "COMMIT_SHA", "\"${getGitSha()}\""
@@ -102,7 +102,7 @@ android {
 dependencies {
 
     // Modified dependencies
-    implementation 'com.github.inorichi:subsampling-scale-image-view:c19b883'
+    implementation 'com.github.inorichi:subsampling-scale-image-view:81b9d68'
     implementation 'com.github.inorichi:junrar-android:634c1f5'
 
     // Android support library
@@ -116,20 +116,22 @@ dependencies {
     implementation "com.android.support:support-annotations:$support_library_version"
     implementation "com.android.support:customtabs:$support_library_version"
 
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.0-beta6'
 
     implementation 'com.android.support:multidex:1.0.2'
 
+    standardImplementation 'com.google.firebase:firebase-core:11.8.0'
+
     // ReactiveX
     implementation 'io.reactivex:rxandroid:1.2.1'
-    implementation 'io.reactivex:rxjava:1.3.4'
+    implementation 'io.reactivex:rxjava:1.3.6'
     implementation 'com.jakewharton.rxrelay:rxrelay:1.2.0'
     implementation 'com.f2prateek.rx.preferences:rx-preferences:1.0.2'
     implementation 'com.github.pwittchen:reactivenetwork:0.7.0'
 
     // Network client
-    implementation "com.squareup.okhttp3:okhttp:3.9.1"
-    implementation 'com.squareup.okio:okio:1.13.0'
+    implementation "com.squareup.okhttp3:okhttp:3.10.0"
+    implementation 'com.squareup.okio:okio:1.14.0'
 
     // REST
     final retrofit_version = '2.3.0'
@@ -141,9 +143,6 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.2'
     implementation 'com.github.salomonbrys.kotson:kotson:2.5.0'
 
-    // YAML
-    implementation 'com.github.bmoliveira:snake-yaml:v1.18-android'
-
     // JavaScript engine
     implementation 'com.squareup.duktape:duktape-android:1.2.0'
 
@@ -155,8 +154,8 @@ dependencies {
     implementation 'org.jsoup:jsoup:1.10.2'
 
     // Job scheduling
-    implementation 'com.evernote:android-job:1.2.1'
-    implementation 'com.google.android.gms:play-services-gcm:11.6.2'
+    implementation 'com.evernote:android-job:1.2.5'
+    implementation 'com.google.android.gms:play-services-gcm:11.8.0'
 
     // Changelog
     implementation 'com.github.gabrielemariotti.changeloglib:changelog:2.1.0'
@@ -170,19 +169,19 @@ dependencies {
     implementation "info.android15.nucleus:nucleus-support-v7:$nucleus_version"
 
     // Dependency injection
-    implementation "uy.kohesive.injekt:injekt-core:1.16.1"
+    implementation "com.github.inorichi.injekt:injekt-core:65b0440"
 
     // Image library
-    final glide_version = '4.3.1'
+    final glide_version = '4.6.1'
     implementation "com.github.bumptech.glide:glide:$glide_version"
     implementation "com.github.bumptech.glide:okhttp3-integration:$glide_version"
     kapt "com.github.bumptech.glide:compiler:$glide_version"
 
     // Transformations
-    implementation 'jp.wasabeef:glide-transformations:3.0.1'
+    implementation 'jp.wasabeef:glide-transformations:3.1.1'
 
     // Logging
-    implementation 'com.jakewharton.timber:timber:4.6.0'
+    implementation 'com.jakewharton.timber:timber:4.6.1'
 
     // Crash reports
     implementation 'ch.acra:acra:4.9.2'
@@ -193,19 +192,22 @@ dependencies {
     // UI
     implementation 'com.dmitrymalkovich.android:material-design-dimens:1.4'
     implementation 'com.github.dmytrodanylyk.android-process-button:library:1.0.4'
-    implementation 'eu.davidea:flexible-adapter:5.0.0-rc3'
+    implementation 'eu.davidea:flexible-adapter:5.0.0-rc4'
+    implementation 'eu.davidea:flexible-adapter-ui:1.0.0-b1'
     implementation 'com.nononsenseapps:filepicker:2.5.2'
     implementation 'com.github.amulyakhare:TextDrawable:558677e'
-    implementation('com.afollestad.material-dialogs:core:0.9.4.7') {
-        exclude group: "com.android.support", module: "support-v13"
-    }
+    implementation 'com.afollestad.material-dialogs:core:0.9.6.0'
     implementation 'me.zhanghai.android.systemuihelper:library:1.0.0'
     implementation 'com.nightlynexus.viewstatepageradapter:viewstatepageradapter:1.0.4'
     implementation 'com.github.mthli:Slice:v1.2'
+    implementation 'me.gujun.android.taggroup:library:1.4@aar'
 
     // Conductor
-    implementation "com.bluelinelabs:conductor:2.1.4"
-    implementation 'com.github.inorichi:conductor-support-preference:26.0.2'
+    implementation "com.github.inorichi.Conductor:conductor:be8b3c5"
+    implementation ("com.bluelinelabs:conductor-support:2.1.5-SNAPSHOT") {
+        exclude group: "com.bluelinelabs", module: "conductor"
+    }
+    implementation 'com.github.inorichi:conductor-support-preference:27.0.2'
 
     // RxBindings
     final rxbindings_version = '1.0.1'
@@ -226,13 +228,13 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-    final coroutines_version = '0.19.1'
+    final coroutines_version = '0.22.2'
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
 }
 
 buildscript {
-    ext.kotlin_version = '1.2.0'
+    ext.kotlin_version = '1.2.30'
     repositories {
         mavenCentral()
     }
@@ -250,6 +252,11 @@ kotlin {
         coroutines 'enable'
     }
 }
+
 androidExtensions {
     experimental = true
 }
+
+if (getGradle().getStartParameter().getTaskRequests().toString().contains("Standard")) {
+    apply plugin: 'com.google.gms.google-services'
+}

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

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

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

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

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

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

app/src/main/AndroidManifest.xml

@@ -52,6 +52,9 @@
                     android:scheme="tachiyomi" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".extension.util.ExtensionInstallActivity"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
 
         <provider
             android:name="android.support.v4.content.FileProvider"

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

@@ -8,34 +8,55 @@ import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.download.DownloadManager
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.track.TrackManager
+import eu.kanade.tachiyomi.extension.ExtensionManager
 import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.source.SourceManager
-import uy.kohesive.injekt.api.InjektModule
-import uy.kohesive.injekt.api.InjektRegistrar
-import uy.kohesive.injekt.api.addSingletonFactory
+import rx.Observable
+import rx.schedulers.Schedulers
+import uy.kohesive.injekt.api.*
 
 class AppModule(val app: Application) : InjektModule {
 
     override fun InjektRegistrar.registerInjectables() {
 
-            addSingletonFactory { PreferencesHelper(app) }
+        addSingleton(app)
 
-            addSingletonFactory { DatabaseHelper(app) }
+        addSingletonFactory { PreferencesHelper(app) }
 
-            addSingletonFactory { ChapterCache(app) }
+        addSingletonFactory { DatabaseHelper(app) }
 
-            addSingletonFactory { CoverCache(app) }
+        addSingletonFactory { ChapterCache(app) }
 
-            addSingletonFactory { NetworkHelper(app) }
+        addSingletonFactory { CoverCache(app) }
 
-            addSingletonFactory { SourceManager(app) }
+        addSingletonFactory { NetworkHelper(app) }
 
-            addSingletonFactory { DownloadManager(app) }
+        addSingletonFactory { SourceManager(app).also { get<ExtensionManager>().init(it) } }
 
-            addSingletonFactory { TrackManager(app) }
+        addSingletonFactory { ExtensionManager(app) }
 
-            addSingletonFactory { Gson() }
+        addSingletonFactory { DownloadManager(app) }
+
+        addSingletonFactory { TrackManager(app) }
+
+        addSingletonFactory { Gson() }
+
+        // Asynchronously init expensive components for a faster cold start
+
+        rxAsync { get<PreferencesHelper>() }
+
+        rxAsync { get<NetworkHelper>() }
+
+        rxAsync { get<SourceManager>() }
+
+        rxAsync { get<DatabaseHelper>() }
+
+        rxAsync { get<DownloadManager>() }
 
     }
 
-}
+    private fun rxAsync(block: () -> Unit) {
+        Observable.fromCallable { block() }.subscribeOn(Schedulers.computation()).subscribe()
+    }
+
+}

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

@@ -4,17 +4,8 @@ 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
 
 /**
@@ -26,8 +17,6 @@ class BackupCreateService : IntentService(NAME) {
         // 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"
 
@@ -48,12 +37,10 @@ class BackupCreateService : IntentService(NAME) {
          * @param context context of application
          * @param uri path of Uri
          * @param flags determines what to backup
-         * @param isJob backup called from job
          */
-        fun makeBackup(context: Context, uri: Uri, flags: Int, isJob: Boolean = false) {
+        fun makeBackup(context: Context, uri: Uri, flags: Int) {
             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)
@@ -68,95 +55,9 @@ class BackupCreateService : IntentService(NAME) {
 
         // 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)
+        backupManager.createBackup(uri, flags, false)
     }
 
-    /**
-     * Create backup Json file from database
-     *
-     * @param uri path of Uri
-     * @param isJob backup called from job
-     */
-    private fun createBackupFromApp(uri: Uri, flags: Int, isJob: Boolean) {
-        // Create root object
-        val root = JsonObject()
-
-        // Create manga array
-        val mangaEntries = JsonArray()
-
-        // Create category array
-        val categoryEntries = JsonArray()
-
-        // Add value's to root
-        root[VERSION] = Backup.CURRENT_VERSION
-        root[MANGAS] = mangaEntries
-        root[CATEGORIES] = categoryEntries
-
-        backupManager.databaseHelper.inTransaction {
-            // Get manga from database
-            val mangas = backupManager.getFavoriteManga()
-
-            // Backup library manga and its dependencies
-            mangas.forEach { manga ->
-                mangaEntries.add(backupManager.backupMangaObject(manga, flags))
-            }
-
-            // Backup categories
-            if ((flags and BACKUP_CATEGORY_MASK) == BACKUP_CATEGORY) {
-                backupManager.backupCategories(categoryEntries)
-            }
-        }
-
-        try {
-            // When BackupCreatorJob
-            if (isJob) {
-                // Get dir of file and create
-                var dir = UniFile.fromUri(this, uri)
-                dir = dir.createDirectory("automatic")
-
-                // Delete older backups
-                val numberOfBackups = backupManager.numberOfBackups()
-                val backupRegex = Regex("""tachiyomi_\d+-\d+-\d+_\d+-\d+.json""")
-                dir.listFiles { _, filename -> backupRegex.matches(filename) }
-                        .orEmpty()
-                        .sortedByDescending { it.name }
-                        .drop(numberOfBackups - 1)
-                        .forEach { it.delete() }
-
-                // Create new file to place backup
-                val newFile = dir.createFile(Backup.getDefaultFilename())
-                        ?: throw Exception("Couldn't create backup file")
-
-                newFile.openOutputStream().bufferedWriter().use {
-                    backupManager.parser.toJson(root, it)
-                }
-            } else {
-                val file = UniFile.fromUri(this, uri)
-                        ?: throw Exception("Couldn't create backup file")
-                file.openOutputStream().bufferedWriter().use {
-                    backupManager.parser.toJson(root, it)
-                }
-
-                // Show completed dialog
-                val intent = Intent(BackupConst.INTENT_FILTER).apply {
-                    putExtra(BackupConst.ACTION, BackupConst.ACTION_BACKUP_COMPLETED_DIALOG)
-                    putExtra(BackupConst.EXTRA_URI, file.uri.toString())
-                }
-                sendLocalBroadcast(intent)
-            }
-        } catch (e: Exception) {
-            Timber.e(e)
-            if (!isJob) {
-                // Show error dialog
-                val intent = Intent(BackupConst.INTENT_FILTER).apply {
-                    putExtra(BackupConst.ACTION, BackupConst.ACTION_ERROR_BACKUP_DIALOG)
-                    putExtra(BackupConst.EXTRA_ERROR_MESSAGE, e.message)
-                }
-                sendLocalBroadcast(intent)
-            }
-        }
-    }
-}
+}

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

@@ -13,9 +13,10 @@ class BackupCreatorJob : Job() {
 
     override fun onRunJob(params: Params): Result {
         val preferences = Injekt.get<PreferencesHelper>()
+        val backupManager = BackupManager(context)
         val uri = Uri.parse(preferences.backupsDirectory().getOrDefault())
         val flags = BackupCreateService.BACKUP_ALL
-        BackupCreateService.makeBackup(context, uri, flags, true)
+        backupManager.createBackup(uri, flags, true)
         return Result.SUCCESS
     }
 
@@ -38,4 +39,4 @@ class BackupCreatorJob : Job() {
             JobManager.instance().cancelAllForTag(TAG)
         }
     }
-}
+}

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

@@ -1,8 +1,11 @@
 package eu.kanade.tachiyomi.data.backup
 
 import android.content.Context
+import android.content.Intent
+import android.net.Uri
 import com.github.salomonbrys.kotson.*
 import com.google.gson.*
+import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CATEGORY
 import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CATEGORY_MASK
 import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CHAPTER
@@ -11,6 +14,7 @@ import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_HIST
 import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_HISTORY_MASK
 import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_TRACK
 import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_TRACK_MASK
+import eu.kanade.tachiyomi.data.backup.models.Backup
 import eu.kanade.tachiyomi.data.backup.models.Backup.CATEGORIES
 import eu.kanade.tachiyomi.data.backup.models.Backup.CHAPTERS
 import eu.kanade.tachiyomi.data.backup.models.Backup.CURRENT_VERSION
@@ -26,8 +30,10 @@ import eu.kanade.tachiyomi.data.preference.getOrDefault
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
+import eu.kanade.tachiyomi.util.sendLocalBroadcast
 import eu.kanade.tachiyomi.util.syncChaptersWithSource
 import rx.Observable
+import timber.log.Timber
 import uy.kohesive.injekt.injectLazy
 
 class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
@@ -85,6 +91,92 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
         else -> throw Exception("Json version unknown")
     }
 
+    /**
+     * Create backup Json file from database
+     *
+     * @param uri path of Uri
+     * @param isJob backup called from job
+     */
+    fun createBackup(uri: Uri, flags: Int, isJob: Boolean) {
+        // Create root object
+        val root = JsonObject()
+
+        // Create manga array
+        val mangaEntries = JsonArray()
+
+        // Create category array
+        val categoryEntries = JsonArray()
+
+        // Add value's to root
+        root[Backup.VERSION] = Backup.CURRENT_VERSION
+        root[Backup.MANGAS] = mangaEntries
+        root[CATEGORIES] = categoryEntries
+
+        databaseHelper.inTransaction {
+            // Get manga from database
+            val mangas = getFavoriteManga()
+
+            // Backup library manga and its dependencies
+            mangas.forEach { manga ->
+                mangaEntries.add(backupMangaObject(manga, flags))
+            }
+
+            // Backup categories
+            if ((flags and BACKUP_CATEGORY_MASK) == BACKUP_CATEGORY) {
+                backupCategories(categoryEntries)
+            }
+        }
+
+        try {
+            // When BackupCreatorJob
+            if (isJob) {
+                // Get dir of file and create
+                var dir = UniFile.fromUri(context, uri)
+                dir = dir.createDirectory("automatic")
+
+                // Delete older backups
+                val numberOfBackups = numberOfBackups()
+                val backupRegex = Regex("""tachiyomi_\d+-\d+-\d+_\d+-\d+.json""")
+                dir.listFiles { _, filename -> backupRegex.matches(filename) }
+                        .orEmpty()
+                        .sortedByDescending { it.name }
+                        .drop(numberOfBackups - 1)
+                        .forEach { it.delete() }
+
+                // Create new file to place backup
+                val newFile = dir.createFile(Backup.getDefaultFilename())
+                        ?: throw Exception("Couldn't create backup file")
+
+                newFile.openOutputStream().bufferedWriter().use {
+                    parser.toJson(root, it)
+                }
+            } else {
+                val file = UniFile.fromUri(context, uri)
+                        ?: throw Exception("Couldn't create backup file")
+                file.openOutputStream().bufferedWriter().use {
+                    parser.toJson(root, it)
+                }
+
+                // Show completed dialog
+                val intent = Intent(BackupConst.INTENT_FILTER).apply {
+                    putExtra(BackupConst.ACTION, BackupConst.ACTION_BACKUP_COMPLETED_DIALOG)
+                    putExtra(BackupConst.EXTRA_URI, file.uri.toString())
+                }
+                context.sendLocalBroadcast(intent)
+            }
+        } 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)
+                }
+                context.sendLocalBroadcast(intent)
+            }
+        }
+    }
+
     /**
      * Backup the categories of library
      *
@@ -310,8 +402,11 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
                 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
+                        if (track.media_id != dbTrack.media_id) {
+                            dbTrack.media_id = track.media_id
+                        }
+                        if (track.library_id != dbTrack.library_id) {
+                            dbTrack.library_id = track.library_id
                         }
                         dbTrack.last_chapter_read = Math.max(dbTrack.last_chapter_read, track.last_chapter_read)
                         isInDatabase = true

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

@@ -1,5 +1,6 @@
 package eu.kanade.tachiyomi.data.backup.serializer
 
+import android.telecom.DisconnectCause.REMOTE
 import com.github.salomonbrys.kotson.typeAdapter
 import com.google.gson.TypeAdapter
 import com.google.gson.stream.JsonToken
@@ -11,9 +12,11 @@ import eu.kanade.tachiyomi.data.database.models.TrackImpl
 object TrackTypeAdapter {
 
     private const val SYNC = "s"
-    private const val REMOTE = "r"
+    private const val MEDIA = "r"
+    private const val LIBRARY = "ml"
     private const val TITLE = "t"
     private const val LAST_READ = "l"
+    private const val TRACKING_URL = "u"
 
     fun build(): TypeAdapter<TrackImpl> {
         return typeAdapter {
@@ -23,10 +26,14 @@ object TrackTypeAdapter {
                 value(it.title)
                 name(SYNC)
                 value(it.sync_id)
-                name(REMOTE)
-                value(it.remote_id)
+                name(MEDIA)
+                value(it.media_id)
+                name(LIBRARY)
+                value(it.library_id)
                 name(LAST_READ)
                 value(it.last_chapter_read)
+                name(TRACKING_URL)
+                value(it.tracking_url)
                 endObject()
             }
 
@@ -40,8 +47,10 @@ object TrackTypeAdapter {
                         when (name) {
                             TITLE -> track.title = nextString()
                             SYNC -> track.sync_id = nextInt()
-                            REMOTE -> track.remote_id = nextInt()
+                            MEDIA -> track.media_id = nextInt()
+                            LIBRARY -> track.library_id = nextLong()
                             LAST_READ -> track.last_chapter_read = nextInt()
+                            TRACKING_URL -> track.tracking_url = nextString()
                         }
                     }
                 }

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

@@ -17,7 +17,7 @@ class DbOpenHelper(context: Context)
         /**
          * Version of the database.
          */
-        const val DATABASE_VERSION = 5
+        const val DATABASE_VERSION = 7
     }
 
     override fun onCreate(db: SQLiteDatabase) = with(db) {
@@ -54,6 +54,12 @@ class DbOpenHelper(context: Context)
         if (oldVersion < 5) {
             db.execSQL(ChapterTable.addScanlator)
         }
+        if (oldVersion < 6) {
+            db.execSQL(TrackTable.addTrackingUrl)
+        }
+        if (oldVersion < 7) {
+            db.execSQL(TrackTable.addLibraryId)
+        }
     }
 
     override fun onConfigure(db: SQLiteDatabase) {

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

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

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

@@ -10,7 +10,9 @@ interface Track : Serializable {
 
     var sync_id: Int
 
-    var remote_id: Int
+    var media_id: Int
+
+    var library_id: Long?
 
     var title: String
 
@@ -22,6 +24,8 @@ interface Track : Serializable {
 
     var status: Int
 
+    var tracking_url: String
+
     fun copyPersonalFrom(other: Track) {
         last_chapter_read = other.last_chapter_read
         score = other.score
@@ -29,7 +33,6 @@ interface Track : Serializable {
     }
 
     companion object {
-
         fun create(serviceId: Int): Track = TrackImpl().apply {
             sync_id = serviceId
         }

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

@@ -8,7 +8,9 @@ class TrackImpl : Track {
 
     override var sync_id: Int = 0
 
-    override var remote_id: Int = 0
+    override var media_id: Int = 0
+
+    override var library_id: Long? = null
 
     override lateinit var title: String
 
@@ -20,6 +22,8 @@ class TrackImpl : Track {
 
     override var status: Int = 0
 
+    override var tracking_url: String = ""
+
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (other == null || javaClass != other.javaClass) return false
@@ -28,13 +32,13 @@ class TrackImpl : Track {
 
         if (manga_id != other.manga_id) return false
         if (sync_id != other.sync_id) return false
-        return remote_id == other.remote_id
+        return media_id == other.media_id
     }
 
     override fun hashCode(): Int {
         var result = (manga_id xor manga_id.ushr(32)).toInt()
         result = 31 * result + sync_id
-        result = 31 * result + remote_id
+        result = 31 * result + media_id
         return result
     }
 

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

@@ -7,6 +7,7 @@ import eu.kanade.tachiyomi.data.database.DbProvider
 import eu.kanade.tachiyomi.data.database.models.LibraryManga
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.database.resolvers.LibraryMangaGetResolver
+import eu.kanade.tachiyomi.data.database.resolvers.MangaFavoritePutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.MangaFlagsPutResolver
 import eu.kanade.tachiyomi.data.database.resolvers.MangaLastUpdatedPutResolver
 import eu.kanade.tachiyomi.data.database.tables.CategoryTable
@@ -74,6 +75,11 @@ interface MangaQueries : DbProvider {
             .withPutResolver(MangaLastUpdatedPutResolver())
             .prepare()
 
+    fun updateMangaFavorite(manga: Manga) = db.put()
+            .`object`(manga)
+            .withPutResolver(MangaFavoritePutResolver())
+            .prepare()
+
     fun deleteManga(manga: Manga) = db.delete().`object`(manga).prepare()
 
     fun deleteMangas(mangas: List<Manga>) = db.delete().objects(mangas).prepare()

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

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

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

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

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

@@ -36,7 +36,6 @@ 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)
@@ -44,11 +43,6 @@ internal class DownloadNotifier(private val context: Context) {
             field = value
         }
 
-    /**
-     * Simultaneous download setting > 1.
-     */
-    var multipleDownloadThreads = false
-
     /**
      * Updated when error is thrown
      */
@@ -91,36 +85,10 @@ internal class DownloadNotifier(private val context: Context) {
 
     /**
      * Called when download progress changes.
-     * Note: Only accepted when multi download active.
-     *
-     * @param queue the queue containing downloads.
-     */
-    fun onProgressChange(queue: DownloadQueue) {
-        if (multipleDownloadThreads) {
-            doOnProgressChange(null, queue)
-        }
-    }
-
-    /**
-     * Called when download progress changes.
-     * Note: Only accepted when single download active.
      *
      * @param download download object containing download information.
-     * @param queue the queue containing downloads.
      */
-    fun onProgressChange(download: Download, queue: DownloadQueue) {
-        if (!multipleDownloadThreads) {
-            doOnProgressChange(download, queue)
-        }
-    }
-
-    /**
-     * Show notification progress of chapter.
-     *
-     * @param download download object containing download information.
-     * @param queue the queue containing downloads.
-     */
-    private fun doOnProgressChange(download: Download?, queue: DownloadQueue) {
+    fun onProgressChange(download: Download) {
         // Create notification
         with(notification) {
             // Check if first call.
@@ -133,28 +101,13 @@ internal class DownloadNotifier(private val context: Context) {
                 isDownloading = true
             }
 
-            if (multipleDownloadThreads) {
-                setContentTitle(context.getString(R.string.app_name))
-
-                // Reset the queue size if the download progress is negative
-                if ((initialQueueSize - queue.size) < 0)
-                    initialQueueSize = queue.size
-
-                setContentText(context.getString(R.string.chapter_downloading_progress)
-                        .format(initialQueueSize - queue.size, initialQueueSize))
-                setProgress(initialQueueSize, initialQueueSize - queue.size, false)
-            } else {
-                download?.let {
-                    val title = it.manga.title.chop(15)
-                    val quotedTitle = Pattern.quote(title)
-                    val chapter = download.chapter.name.replaceFirst("$quotedTitle[\\s]*[-]*[\\s]*".toRegex(RegexOption.IGNORE_CASE), "")
-                    setContentTitle("$title - $chapter".chop(30))
-                    setContentText(context.getString(R.string.chapter_downloading_progress)
-                            .format(it.downloadedImages, it.pages!!.size))
-                    setProgress(it.pages!!.size, it.downloadedImages, false)
-
-                }
-            }
+            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.chapter_downloading_progress)
+                    .format(download.downloadedImages, download.pages!!.size))
+            setProgress(download.pages!!.size, download.downloadedImages, false)
         }
         // Displays the progress bar on notification
         notification.show()

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

@@ -1,16 +1,20 @@
 package eu.kanade.tachiyomi.data.download
 
+import android.app.Notification
 import android.app.Service
 import android.content.Context
 import android.content.Intent
 import android.net.NetworkInfo.State.CONNECTED
 import android.net.NetworkInfo.State.DISCONNECTED
+import android.os.Build
 import android.os.IBinder
 import android.os.PowerManager
+import android.support.v4.app.NotificationCompat
 import com.github.pwittchen.reactivenetwork.library.Connectivity
 import com.github.pwittchen.reactivenetwork.library.ReactiveNetwork
 import com.jakewharton.rxrelay.BehaviorRelay
 import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.util.connectivityManager
 import eu.kanade.tachiyomi.util.plusAssign
@@ -41,7 +45,12 @@ class DownloadService : Service() {
          * @param context the application context.
          */
         fun start(context: Context) {
-            context.startService(Intent(context, DownloadService::class.java))
+            val intent = Intent(context, DownloadService::class.java)
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+                context.startService(intent)
+            } else {
+                context.startForegroundService(intent)
+            }
         }
 
         /**
@@ -81,6 +90,7 @@ class DownloadService : Service() {
      */
     override fun onCreate() {
         super.onCreate()
+        startForeground(Notifications.ID_DOWNLOAD_CHAPTER, getPlaceholderNotification())
         runningRelay.call(true)
         subscriptions = CompositeSubscription()
         listenDownloaderState()
@@ -176,4 +186,10 @@ class DownloadService : Service() {
         if (!isHeld) acquire()
     }
 
+    private fun getPlaceholderNotification(): Notification {
+        return NotificationCompat.Builder(this, Notifications.CHANNEL_DOWNLOADER)
+            .setContentTitle(getString(R.string.download_notifier_downloader_title))
+            .build()
+    }
+
 }

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

@@ -9,8 +9,6 @@ import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.download.model.Download
 import eu.kanade.tachiyomi.data.download.model.DownloadQueue
-import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.data.preference.getOrDefault
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.online.HttpSource
@@ -21,7 +19,6 @@ import okhttp3.Response
 import rx.Observable
 import rx.android.schedulers.AndroidSchedulers
 import rx.schedulers.Schedulers
-import rx.subjects.BehaviorSubject
 import rx.subscriptions.CompositeSubscription
 import timber.log.Timber
 import uy.kohesive.injekt.injectLazy
@@ -39,9 +36,11 @@ import uy.kohesive.injekt.injectLazy
  * @param provider the downloads directory provider.
  * @param cache the downloads cache, used to add the downloads to the cache after their completion.
  */
-class Downloader(private val context: Context,
-                 private val provider: DownloadProvider,
-                 private val cache: DownloadCache) {
+class Downloader(
+        private val context: Context,
+        private val provider: DownloadProvider,
+        private val cache: DownloadCache
+) {
 
     /**
      * Store for persisting downloads across restarts.
@@ -58,11 +57,6 @@ class Downloader(private val context: Context,
      */
     private val sourceManager: SourceManager by injectLazy()
 
-    /**
-     * Preferences.
-     */
-    private val preferences: PreferencesHelper by injectLazy()
-
     /**
      * Notifier for the downloader state and progress.
      */
@@ -73,11 +67,6 @@ class Downloader(private val context: Context,
      */
     private val subscriptions = CompositeSubscription()
 
-    /**
-     * Subject to do a live update of the number of simultaneous downloads.
-     */
-    private val threadsSubject = BehaviorSubject.create<Int>()
-
     /**
      * Relay to send a list of downloads to the downloader.
      */
@@ -116,9 +105,6 @@ class Downloader(private val context: Context,
         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()
     }
@@ -185,14 +171,8 @@ class Downloader(private val context: Context,
 
         subscriptions.clear()
 
-        subscriptions += preferences.downloadThreads().asObservable()
-                .subscribe {
-                    threadsSubject.onNext(it)
-                    notifier.multipleDownloadThreads = it > 1
-                }
-
-        subscriptions += downloadsRelay.flatMap { Observable.from(it) }
-                .lift(DynamicConcurrentMergeOperator<Download, Download>({ downloadChapter(it) }, threadsSubject))
+        subscriptions += downloadsRelay.concatMapIterable { it }
+                .concatMap { downloadChapter(it).subscribeOn(Schedulers.io()) }
                 .onBackpressureBuffer()
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe({ completeDownload(it)
@@ -250,15 +230,9 @@ class Downloader(private val context: Context,
             // Initialize queue size.
             notifier.initialQueueSize = queue.size
 
-            // Initial multi-thread
-            notifier.multipleDownloadThreads = preferences.downloadThreads().getOrDefault() > 1
-
             if (isRunning) {
                 // Send the list of downloads to the downloader.
                 downloadsRelay.call(chaptersToQueue)
-            } else {
-                // Show initial notification.
-                notifier.onProgressChange(queue)
             }
 
             // Start downloader if needed
@@ -273,7 +247,7 @@ class Downloader(private val context: Context,
      *
      * @param download the chapter to be downloaded.
      */
-    private fun downloadChapter(download: Download): Observable<Download> {
+    private fun downloadChapter(download: Download): Observable<Download> = Observable.defer {
         val chapterDirname = provider.getChapterDirName(download.chapter)
         val mangaDir = provider.getMangaDir(download.manga, download.source)
         val tmpDir = mangaDir.createDirectory("${chapterDirname}_tmp")
@@ -292,7 +266,7 @@ class Downloader(private val context: Context,
             Observable.just(download.pages!!)
         }
 
-        return pageListObservable
+        pageListObservable
                 .doOnNext { _ ->
                     // Delete all temporary (unfinished) files
                     tmpDir.listFiles()
@@ -307,7 +281,7 @@ class Downloader(private val context: Context,
                 // Start downloading images, consider we can have downloaded images already
                 .concatMap { page -> getOrDownloadImage(page, download, tmpDir) }
                 // Do when page is downloaded.
-                .doOnNext { notifier.onProgressChange(download, queue) }
+                .doOnNext { notifier.onProgressChange(download) }
                 .toList()
                 .map { _ -> download }
                 // Do after download completes
@@ -318,7 +292,7 @@ class Downloader(private val context: Context,
                     notifier.onError(error.message, download.chapter.name)
                     download
                 }
-                .subscribeOn(Schedulers.io())
+
     }
 
     /**
@@ -448,7 +422,6 @@ class Downloader(private val context: Context,
         if (download.status == Download.DOWNLOADED) {
             // remove downloaded chapter from queue
             queue.remove(download)
-            notifier.onProgressChange(queue)
         }
         if (areAllDownloadsFinished()) {
             if (notifier.isSingleChapter && !notifier.errorThrown) {
@@ -465,4 +438,4 @@ class Downloader(private val context: Context,
         return queue.none { it.status <= Download.DOWNLOADING }
     }
 
-}
+}

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

@@ -79,7 +79,7 @@ class MangaModelLoader : ModelLoader<Manga, InputStream> {
      * @param height the height of the view where the resource will be loaded.
      */
     override fun buildLoadData(manga: Manga, width: Int, height: Int,
-                               options: Options?): ModelLoader.LoadData<InputStream>? {
+                               options: Options): ModelLoader.LoadData<InputStream>? {
         // Check thumbnail is not null or empty
         val url = manga.thumbnail_url
         if (url == null || url.isEmpty()) {

app/src/main/java/eu/kanade/tachiyomi/data/preference/EmptyPreferenceDataStore.kt

@@ -0,0 +1,48 @@
+package eu.kanade.tachiyomi.data.preference
+
+import android.support.v7.preference.PreferenceDataStore
+
+class EmptyPreferenceDataStore : PreferenceDataStore() {
+
+    override fun getBoolean(key: String?, defValue: Boolean): Boolean {
+        return false
+    }
+
+    override fun putBoolean(key: String?, value: Boolean) {
+    }
+
+    override fun getInt(key: String?, defValue: Int): Int {
+        return 0
+    }
+
+    override fun putInt(key: String?, value: Int) {
+    }
+
+    override fun getLong(key: String?, defValue: Long): Long {
+        return 0
+    }
+
+    override fun putLong(key: String?, value: Long) {
+    }
+
+    override fun getFloat(key: String?, defValue: Float): Float {
+        return 0f
+    }
+
+    override fun putFloat(key: String?, value: Float) {
+    }
+
+    override fun getString(key: String?, defValue: String?): String? {
+        return null
+    }
+
+    override fun putString(key: String?, value: String?) {
+    }
+
+    override fun getStringSet(key: String?, defValues: Set<String>?): Set<String>? {
+        return null
+    }
+
+    override fun putStringSet(key: String?, values: Set<String>?) {
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt

@@ -11,6 +11,8 @@ object PreferenceKeys {
 
     const val enableTransitions = "pref_enable_transitions_key"
 
+    const val doubleTapAnimationSpeed = "pref_double_tap_anim_speed"
+
     const val showPageNumber = "pref_show_page_number_key"
 
     const val fullscreen = "fullscreen"
@@ -37,6 +39,8 @@ object PreferenceKeys {
 
     const val cropBorders = "crop_borders"
 
+    const val cropBordersWebtoon = "crop_borders_webtoon"
+
     const val readWithTapping = "reader_tap"
 
     const val readWithVolumeKeys = "reader_volume_keys"
@@ -65,8 +69,6 @@ object PreferenceKeys {
 
     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"
@@ -107,10 +109,14 @@ object PreferenceKeys {
 
     const val downloadBadge = "display_download_badge"
 
+    @Deprecated("Use the preferences of the source")
     fun sourceUsername(sourceId: Long) = "pref_source_username_$sourceId"
 
+    @Deprecated("Use the preferences of the source")
     fun sourcePassword(sourceId: Long) = "pref_source_password_$sourceId"
 
+    fun sourceSharedPref(sourceId: Long) = "source_$sourceId"
+
     fun trackUsername(syncId: Int) = "pref_mangasync_username_$syncId"
 
     fun trackPassword(syncId: Int) = "pref_mangasync_password_$syncId"

app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt

@@ -39,6 +39,8 @@ class PreferencesHelper(val context: Context) {
 
     fun pageTransitions() = rxPrefs.getBoolean(Keys.enableTransitions, true)
 
+    fun doubleTapAnimSpeed() = rxPrefs.getInteger(Keys.doubleTapAnimationSpeed, 500)
+
     fun showPageNumber() = rxPrefs.getBoolean(Keys.showPageNumber, true)
 
     fun fullscreen() = rxPrefs.getBoolean(Keys.fullscreen, true)
@@ -65,6 +67,8 @@ class PreferencesHelper(val context: Context) {
 
     fun cropBorders() = rxPrefs.getBoolean(Keys.cropBorders, false)
 
+    fun cropBordersWebtoon() = rxPrefs.getBoolean(Keys.cropBordersWebtoon, false)
+
     fun readWithTapping() = rxPrefs.getBoolean(Keys.readWithTapping, true)
 
     fun readWithVolumeKeys() = rxPrefs.getBoolean(Keys.readWithVolumeKeys, false)
@@ -115,14 +119,12 @@ class PreferencesHelper(val context: Context) {
 
     fun trackToken(sync: TrackService) = rxPrefs.getString(Keys.trackToken(sync.id), "")
 
-    fun anilistScoreType() = rxPrefs.getInteger("anilist_score_type", 0)
+    fun anilistScoreType() = rxPrefs.getString("anilist_score_type", "POINT_10")
 
     fun backupsDirectory() = rxPrefs.getString(Keys.backupDirectory, defaultBackupDir.toString())
 
     fun downloadsDirectory() = rxPrefs.getString(Keys.downloadsDirectory, defaultDownloadsDir.toString())
 
-    fun downloadThreads() = rxPrefs.getInteger(Keys.downloadThreads, 1)
-
     fun downloadOnlyOverWifi() = prefs.getBoolean(Keys.downloadOnlyOverWifi, true)
 
     fun numberOfBackups() = rxPrefs.getInteger(Keys.numberOfBackups, 1)
@@ -165,4 +167,7 @@ class PreferencesHelper(val context: Context) {
 
     fun defaultCategory() = prefs.getInt(Keys.defaultCategory, -1)
 
+    fun migrateFlags() = rxPrefs.getInteger("migrate_flags", Int.MAX_VALUE)
+
+    fun trustedSignatures() = rxPrefs.getStringSet("trusted_signatures", emptySet())
 }

app/src/main/java/eu/kanade/tachiyomi/data/preference/SharedPreferencesDataStore.kt

@@ -0,0 +1,55 @@
+package eu.kanade.tachiyomi.data.preference
+
+import android.content.SharedPreferences
+import android.support.v7.preference.PreferenceDataStore
+
+class SharedPreferencesDataStore(private val prefs: SharedPreferences) : PreferenceDataStore() {
+
+    override fun getBoolean(key: String?, defValue: Boolean): Boolean {
+        return prefs.getBoolean(key, defValue)
+    }
+
+    override fun putBoolean(key: String?, value: Boolean) {
+        prefs.edit().putBoolean(key, value).apply()
+    }
+
+    override fun getInt(key: String?, defValue: Int): Int {
+        return prefs.getInt(key, defValue)
+    }
+
+    override fun putInt(key: String?, value: Int) {
+        prefs.edit().putInt(key, value).apply()
+    }
+
+    override fun getLong(key: String?, defValue: Long): Long {
+        return prefs.getLong(key, defValue)
+    }
+
+    override fun putLong(key: String?, value: Long) {
+        prefs.edit().putLong(key, value).apply()
+    }
+
+    override fun getFloat(key: String?, defValue: Float): Float {
+        return prefs.getFloat(key, defValue)
+    }
+
+    override fun putFloat(key: String?, value: Float) {
+        prefs.edit().putFloat(key, value).apply()
+    }
+
+    override fun getString(key: String?, defValue: String?): String? {
+        return prefs.getString(key, defValue)
+    }
+
+    override fun putString(key: String?, value: String?) {
+        prefs.edit().putString(key, value).apply()
+    }
+
+    override fun getStringSet(key: String?, defValues: MutableSet<String>?): MutableSet<String> {
+        return prefs.getStringSet(key, defValues)
+    }
+
+    override fun putStringSet(key: String?, values: MutableSet<String>?) {
+        prefs.edit().putStringSet(key, values).apply()
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/data/track/TrackService.kt

@@ -3,6 +3,7 @@ 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.track.model.TrackSearch
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.network.NetworkHelper
 import okhttp3.OkHttpClient
@@ -44,7 +45,7 @@ abstract class TrackService(val id: Int) {
 
     abstract fun bind(track: Track): Observable<Track>
 
-    abstract fun search(query: String): Observable<List<Track>>
+    abstract fun search(query: String): Observable<List<TrackSearch>>
 
     abstract fun refresh(track: Track): Observable<Track>
 

app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt

@@ -2,12 +2,15 @@ package eu.kanade.tachiyomi.data.track.anilist
 
 import android.content.Context
 import android.graphics.Color
+import com.google.gson.Gson
 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 eu.kanade.tachiyomi.data.track.model.TrackSearch
 import rx.Completable
 import rx.Observable
+import uy.kohesive.injekt.injectLazy
 
 class Anilist(private val context: Context, id: Int) : TrackService(id) {
 
@@ -16,24 +19,45 @@ class Anilist(private val context: Context, id: Int) : TrackService(id) {
         const val COMPLETED = 2
         const val ON_HOLD = 3
         const val DROPPED = 4
-        const val PLAN_TO_READ = 5
+        const val PLANNING = 5
+        const val REPEATING = 6
 
         const val DEFAULT_STATUS = READING
         const val DEFAULT_SCORE = 0
+
+        const val POINT_100 = "POINT_100"
+        const val POINT_10 = "POINT_10"
+        const val POINT_10_DECIMAL = "POINT_10_DECIMAL"
+        const val POINT_5 = "POINT_5"
+        const val POINT_3 = "POINT_3"
     }
 
     override val name = "AniList"
 
-    private val interceptor by lazy { AnilistInterceptor(getPassword()) }
+    private val gson: Gson by injectLazy()
+
+    private val interceptor by lazy { AnilistInterceptor(this, getPassword()) }
 
     private val api by lazy { AnilistApi(client, interceptor) }
 
+    private val scorePreference = preferences.anilistScoreType()
+
+    init {
+        // If the preference is an int from APIv1, logout user to force using APIv2
+        try {
+            scorePreference.get()
+        } catch (e: ClassCastException) {
+            logout()
+            scorePreference.delete()
+        }
+    }
+
     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)
+        return listOf(READING, COMPLETED, ON_HOLD, DROPPED, PLANNING, REPEATING)
     }
 
     override fun getStatus(status: Int): String = with(context) {
@@ -42,48 +66,50 @@ class Anilist(private val context: Context, id: Int) : TrackService(id) {
             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)
+            PLANNING -> getString(R.string.plan_to_read)
+            REPEATING -> getString(R.string.repeating)
             else -> ""
         }
     }
 
     override fun getScoreList(): List<String> {
-        return when (preferences.anilistScoreType().getOrDefault()) {
+        return when (scorePreference.getOrDefault()) {
             // 10 point
-            0 -> IntRange(0, 10).map(Int::toString)
+            POINT_10 -> IntRange(0, 10).map(Int::toString)
             // 100 point
-            1 -> IntRange(0, 100).map(Int::toString)
+            POINT_100 -> IntRange(0, 100).map(Int::toString)
             // 5 stars
-            2 -> IntRange(0, 5).map { "$it ★" }
+            POINT_5 -> IntRange(0, 5).map { "$it ★" }
             // Smiley
-            3 -> listOf("-", "😦", "😐", "😊")
+            POINT_3 -> listOf("-", "😦", "😐", "😊")
             // 10 point decimal
-            4 -> IntRange(0, 100).map { (it / 10f).toString() }
+            POINT_10_DECIMAL -> IntRange(0, 100).map { (it / 10f).toString() }
             else -> throw Exception("Unknown score type")
         }
     }
 
     override fun indexToScore(index: Int): Float {
-        return when (preferences.anilistScoreType().getOrDefault()) {
+        return when (scorePreference.getOrDefault()) {
             // 10 point
-            0 -> index * 10f
+            POINT_10 -> index * 10f
             // 100 point
-            1 -> index.toFloat()
+            POINT_100 -> index.toFloat()
             // 5 stars
-            2 -> index * 20f
+            POINT_5 -> index * 20f
             // Smiley
-            3 -> index * 30f
+            POINT_3 -> index * 30f
             // 10 point decimal
-            4 -> index.toFloat()
+            POINT_10_DECIMAL -> 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 {
+
+        return when (scorePreference.getOrDefault()) {
+            POINT_5 -> "${(score / 20).toInt()} ★"
+            POINT_3 -> when {
                 score == 0f -> "0"
                 score <= 30 -> "😦"
                 score <= 60 -> "😐"
@@ -101,15 +127,26 @@ class Anilist(private val context: Context, id: Int) : TrackService(id) {
         if (track.total_chapters != 0 && track.last_chapter_read == track.total_chapters) {
             track.status = COMPLETED
         }
+        // If user was using API v1 fetch library_id
+        if (track.library_id == null || track.library_id!! == 0L){
+            return api.findLibManga(track, getUsername().toInt()).flatMap {
+                if (it == null) {
+                    throw Exception("$track not found on user library")
+                }
+                track.library_id = it.library_id
+                api.updateLibManga(track)
+            }
+        }
 
         return api.updateLibManga(track)
     }
 
     override fun bind(track: Track): Observable<Track> {
-        return api.findLibManga(track, getUsername())
+        return api.findLibManga(track, getUsername().toInt())
                 .flatMap { remoteTrack ->
                     if (remoteTrack != null) {
                         track.copyPersonalFrom(remoteTrack)
+                        track.library_id = remoteTrack.library_id
                         update(track)
                     } else {
                         // Set default fields if it's not found in the list
@@ -120,12 +157,12 @@ class Anilist(private val context: Context, id: Int) : TrackService(id) {
                 }
     }
 
-    override fun search(query: String): Observable<List<Track>> {
+    override fun search(query: String): Observable<List<TrackSearch>> {
         return api.search(query)
     }
 
     override fun refresh(track: Track): Observable<Track> {
-        return api.getLibManga(track, getUsername())
+        return api.getLibManga(track, getUsername().toInt())
                 .map { remoteTrack ->
                     track.copyPersonalFrom(remoteTrack)
                     track.total_chapters = remoteTrack.total_chapters
@@ -135,26 +172,34 @@ class Anilist(private val context: Context, id: Int) : TrackService(id) {
 
     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()
+    fun login(token: String): Completable {
+        val oauth = api.createOAuth(token)
+        interceptor.setAuth(oauth)
+        return api.getCurrentUser().map { (username, scoreType) ->
+            scorePreference.set(scoreType)
+            saveCredentials(username.toString(), oauth.access_token)
+         }.doOnError{
+            logout()
+        }.toCompletable()
     }
 
     override fun logout() {
         super.logout()
+        preferences.trackToken(this).set(null)
         interceptor.setAuth(null)
     }
 
+    fun saveOAuth(oAuth: OAuth?) {
+        preferences.trackToken(this).set(gson.toJson(oAuth))
+    }
+
+    fun loadOAuth(): OAuth? {
+        return try {
+            gson.fromJson(preferences.trackToken(this).get(), OAuth::class.java)
+        } catch (e: Exception) {
+            null
+        }
+    }
+
 }
 

app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt

@@ -1,161 +1,275 @@
 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.github.salomonbrys.kotson.*
 import com.google.gson.JsonObject
+import com.google.gson.JsonParser
 import eu.kanade.tachiyomi.data.database.models.Track
-import eu.kanade.tachiyomi.network.POST
-import okhttp3.FormBody
+import eu.kanade.tachiyomi.data.track.model.TrackSearch
+import eu.kanade.tachiyomi.network.asObservableSuccess
+import okhttp3.MediaType
 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 okhttp3.Request
+import okhttp3.RequestBody
 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)
+    private val parser = JsonParser()
+    private val jsonMime = MediaType.parse("application/json; charset=utf-8")
+    private val authClient = client.newBuilder().addInterceptor(interceptor).build()
+
 
     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")
+        val query = """
+            mutation AddManga(${'$'}mangaId: Int, ${'$'}progress: Int, ${'$'}status: MediaListStatus) {
+                     SaveMediaListEntry (mediaId: ${'$'}mangaId, progress: ${'$'}progress, status: ${'$'}status)
+                     { id status } }
+                     """
+        val variables = jsonObject(
+                "mangaId" to track.media_id,
+                "progress" to track.last_chapter_read,
+                "status" to track.toAnilistStatus()
+        )
+        val payload = jsonObject(
+                "query" to query,
+                "variables" to variables
+        )
+        val body = RequestBody.create(jsonMime, payload.toString())
+        val request = Request.Builder()
+                .url(apiUrl)
+                .post(body)
+                .build()
+        return authClient.newCall(request)
+                .asObservableSuccess()
+                .map { netResponse ->
+                    val responseBody = netResponse.body()?.string().orEmpty()
+                    netResponse.close()
+                    if (responseBody.isEmpty()) {
+                        throw Exception("Null Response")
                     }
+                    val response = parser.parse(responseBody).obj
+                    track.library_id = response["data"]["SaveMediaListEntry"]["id"].asLong
                     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")
+        val query = """
+            mutation UpdateManga(${'$'}listId: Int, ${'$'}progress: Int, ${'$'}status: MediaListStatus, ${'$'}score: Int) {
+                        SaveMediaListEntry (id: ${'$'}listId, progress: ${'$'}progress, status: ${'$'}status, scoreRaw: ${'$'}score) {
+                            id
+                            status
+                            progress
+                        }
                     }
+            """
+        val variables = jsonObject(
+                "listId" to track.library_id,
+                "progress" to track.last_chapter_read,
+                "status" to track.toAnilistStatus(),
+                "score" to track.score.toInt()
+        )
+        val payload = jsonObject(
+                "query" to query,
+                "variables" to variables
+        )
+        val body = RequestBody.create(jsonMime, payload.toString())
+        val request = Request.Builder()
+                .url(apiUrl)
+                .post(body)
+                .build()
+        return authClient.newCall(request)
+                .asObservableSuccess()
+                .map {
                     track
                 }
     }
 
-    fun search(query: String): Observable<List<Track>> {
-        return rest.search(query, 1)
-                .map { list ->
-                    list.filter { it.type != "Novel" }.map { it.toTrack() }
+    fun search(search: String): Observable<List<TrackSearch>> {
+        val query = """
+            query Search(${'$'}query: String) {
+                  Page (perPage: 25) {
+                    media(search: ${'$'}query, type: MANGA, format: MANGA) {
+                      id
+                      title {
+                        romaji
+                      }
+                      coverImage {
+                        large
+                      }
+                      type
+                      status
+                      chapters
+                      startDate {
+                        year
+                        month
+                        day
+                      }
+                    }
+                  }
                 }
-                .onErrorReturn { emptyList() }
-    }
-
-    fun getList(username: String): Observable<List<Track>> {
-        return rest.getLib(username)
-                .map { lib ->
-                    lib.flatten().map { it.toTrack() }
+            """
+        val variables = jsonObject(
+                "query" to search
+        )
+        val payload = jsonObject(
+                "query" to query,
+                "variables" to variables
+        )
+        val body = RequestBody.create(jsonMime, payload.toString())
+        val request = Request.Builder()
+                .url(apiUrl)
+                .post(body)
+                .build()
+        return authClient.newCall(request)
+                .asObservableSuccess()
+                .map { netResponse ->
+                    val responseBody = netResponse.body()?.string().orEmpty()
+                    if (responseBody.isEmpty()) {
+                        throw Exception("Null Response")
+                    }
+                    val response = parser.parse(responseBody).obj
+                    val data = response["data"]!!.obj
+                    val page = data["Page"].obj
+                    val media = page["media"].array
+                    val entries = media.map { jsonToALManga(it.obj) }
+                    entries.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 findLibManga(track: Track, userid: Int) : Observable<Track?> {
+        val query = """
+            query (${'$'}id: Int!, ${'$'}manga_id: Int!) {
+                  Page {
+                    mediaList(userId: ${'$'}id, type: MANGA, mediaId: ${'$'}manga_id) {
+                      id
+                      status
+                      scoreRaw: score(format: POINT_100)
+                      progress
+                      media{
+                        id
+                        title {
+                          romaji
+                        }
+                      coverImage {
+                        large
+                      }
+                      type
+                      status
+                      chapters
+                      startDate {
+                       year
+                       month
+                       day
+                       }
+                      }
+                    }
+                  }
+                }
+            """
+        val variables = jsonObject(
+                "id" to userid,
+                "manga_id" to track.media_id
+        )
+        val payload = jsonObject(
+                "query" to query,
+                "variables" to variables
+        )
+        val body = RequestBody.create(jsonMime, payload.toString())
+        val request = Request.Builder()
+                .url(apiUrl)
+                .post(body)
+                .build()
+        return authClient.newCall(request)
+                .asObservableSuccess()
+                .map { netResponse ->
+                    val responseBody = netResponse.body()?.string().orEmpty()
+                    if (responseBody.isEmpty()) {
+                        throw Exception("Null Response")
+                    }
+                    val response = parser.parse(responseBody).obj
+                    val data = response["data"]!!.obj
+                    val page = data["Page"].obj
+                    val media = page["mediaList"].array
+                    val entries = media.map { jsonToALUserManga(it.obj) }
+                    entries.firstOrNull()?.toTrack()
+
+                }
     }
 
-    fun getLibManga(track: Track, username: String): Observable<Track> {
-        return findLibManga(track, username)
+    fun getLibManga(track: Track, userid: Int): Observable<Track> {
+        return findLibManga(track, userid)
                 .map { it ?: throw Exception("Could not find manga") }
     }
 
-    fun login(authCode: String): Observable<OAuth> {
-        return restBuilder()
-                .client(client)
+    fun createOAuth(token: String): OAuth {
+        return OAuth(token, "Bearer", System.currentTimeMillis() + 31536000000, 31536000000)
+    }
+
+    fun getCurrentUser(): Observable<Pair<Int, String>> {
+        val query = """
+            query User
+                {
+                  Viewer {
+                    id
+                    mediaListOptions {
+                      scoreFormat
+                    }
+                  }
+                }
+                """
+        val payload = jsonObject(
+                "query" to query
+        )
+        val body = RequestBody.create(jsonMime, payload.toString())
+        val request = Request.Builder()
+                .url(apiUrl)
+                .post(body)
                 .build()
-                .create(Rest::class.java)
-                .requestAccessToken(authCode)
+        return authClient.newCall(request)
+                .asObservableSuccess()
+                .map { netResponse ->
+                    val responseBody = netResponse.body()?.string().orEmpty()
+                    if (responseBody.isEmpty()) {
+                        throw Exception("Null Response")
+                    }
+                    val response = parser.parse(responseBody).obj
+                    val data = response["data"]!!.obj
+                    val viewer = data["Viewer"].obj
+                    Pair(viewer["id"].asInt, viewer["mediaListOptions"]["scoreFormat"].asString)
+                }
     }
 
-    fun getCurrentUser(): Observable<Pair<String, Int>> {
-        return rest.getCurrentUser()
-                .map { it["id"].string to it["score_type"].int }
+    fun jsonToALManga(struct: JsonObject): ALManga{
+        return ALManga(struct["id"].asInt, struct["title"]["romaji"].asString, struct["coverImage"]["large"].asString,
+                null, struct["type"].asString, struct["status"].asString,
+                struct["startDate"]["year"].nullString.orEmpty() + struct["startDate"]["month"].nullString.orEmpty()
+                        + struct["startDate"]["day"].nullString.orEmpty(), struct["chapters"].nullInt ?: 0)
     }
 
-    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>>
-
+    fun jsonToALUserManga(struct: JsonObject): ALUserManga{
+        return ALUserManga(struct["id"].asLong, struct["status"].asString, struct["scoreRaw"].asInt, struct["progress"].asInt, jsonToALManga(struct["media"].obj) )
     }
 
+
     companion object {
-        private const val clientId = "tachiyomi-hrtje"
-        private const val clientSecret = "nlGB5OmgE9YWq5dr3gIDbTQV0C"
+        private const val clientId = "385"
         private const val clientUrl = "tachiyomi://anilist-auth"
-        private const val baseUrl = "https://anilist.co/api/"
+        private const val apiUrl = "https://graphql.anilist.co/"
+        private const val baseUrl = "https://anilist.co/api/v2/"
+        private const val baseMangaUrl = "https://anilist.co/manga/"
 
-        fun authUrl() = Uri.parse("${baseUrl}auth/authorize").buildUpon()
-                .appendQueryParameter("grant_type", "authorization_code")
+        fun mangaUrl(mediaId: Int): String {
+            return baseMangaUrl + mediaId
+        }
+
+        fun authUrl() = Uri.parse("${baseUrl}oauth/authorize").buildUpon()
                 .appendQueryParameter("client_id", clientId)
-                .appendQueryParameter("redirect_uri", clientUrl)
-                .appendQueryParameter("response_type", "code")
+                .appendQueryParameter("response_type", "token")
                 .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())
-
     }
 
-}
+}

app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistInterceptor.kt

@@ -1,10 +1,10 @@
 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 {
+
+class AnilistInterceptor(val anilist: Anilist, private var token: String?) : Interceptor {
 
     /**
      * OAuth object used for authenticated requests.
@@ -20,24 +20,21 @@ class AnilistInterceptor(private var refreshToken: String?) : Interceptor {
     override fun intercept(chain: Interceptor.Chain): Response {
         val originalRequest = chain.request()
 
-        if (refreshToken.isNullOrEmpty()) {
+        if (token.isNullOrEmpty()) {
             throw Exception("Not authenticated with Anilist")
         }
-
+        if (oauth == null){
+            oauth = anilist.loadOAuth()
+        }
         // 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
-            }
+        if (oauth!!.isExpired()) {
+            anilist.logout()
+            throw Exception("Token expired")
         }
 
         // Throw on null auth.
         if (oauth == null) {
-            throw Exception("Access token wasn't refreshed")
+            throw Exception("No authentication token")
         }
 
         // Add the authorization header to the original request.
@@ -53,8 +50,9 @@ class AnilistInterceptor(private var refreshToken: String?) : Interceptor {
      * and the oauth object.
      */
     fun setAuth(oauth: OAuth?) {
-        refreshToken = oauth?.refresh_token
+        token = oauth?.access_token
         this.oauth = oauth
+        anilist.saveOAuth(oauth)
     }
 
 }

app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistModels.kt

@@ -1,71 +1,91 @@
 package eu.kanade.tachiyomi.data.track.anilist
 
+import eu.kanade.tachiyomi.BuildConfig
 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 eu.kanade.tachiyomi.data.track.model.TrackSearch
 import uy.kohesive.injekt.injectLazy
+import java.text.SimpleDateFormat
+import java.util.*
 
 data class ALManga(
-        val id: Int,
+        val media_id: Int,
         val title_romaji: String,
+        val image_url_lge: String,
+        val description: String?,
         val type: String,
+        val publishing_status: String,
+        val start_date_fuzzy: String,
         val total_chapters: Int) {
 
-    fun toTrack() = Track.create(TrackManager.ANILIST).apply {
-        remote_id = this@ALManga.id
+    fun toTrack() = TrackSearch.create(TrackManager.ANILIST).apply {
+        media_id = this@ALManga.media_id
         title = title_romaji
         total_chapters = this@ALManga.total_chapters
+        cover_url = image_url_lge
+        summary = description ?: ""
+        tracking_url = AnilistApi.mangaUrl(media_id)
+        publishing_status = this@ALManga.publishing_status
+        publishing_type = type
+        if (!start_date_fuzzy.isNullOrBlank()) {
+            start_date = try {
+                val inputDf = SimpleDateFormat("yyyyMMdd", Locale.US)
+                val outputDf = SimpleDateFormat("yyyy-MM-dd", Locale.US)
+                val date = inputDf.parse(BuildConfig.BUILD_TIME)
+                outputDf.format(date)
+            } catch (e: Exception) {
+                start_date_fuzzy.orEmpty()
+            }
+        }
     }
 }
 
 data class ALUserManga(
-        val id: Int,
+        val library_id: Long,
         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
+        media_id = manga.media_id
         status = toTrackStatus()
         score = score_raw.toFloat()
         last_chapter_read = chapters_read
+        library_id = this@ALUserManga.library_id
     }
 
     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
+        "CURRENT" -> Anilist.READING
+        "COMPLETED" -> Anilist.COMPLETED
+        "PAUSED" -> Anilist.ON_HOLD
+        "DROPPED" -> Anilist.DROPPED
+        "PLANNING" -> Anilist.PLANNING
         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"
+    Anilist.READING -> "CURRENT"
+    Anilist.COMPLETED -> "COMPLETED"
+    Anilist.ON_HOLD -> "PAUSED"
+    Anilist.DROPPED -> "DROPPED"
+    Anilist.PLANNING -> "PLANNING"
+    Anilist.REPEATING -> "REPEATING"
     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 {
+// 10 point
+    "POINT_10" -> (score.toInt() / 10).toString()
+// 100 point
+    "POINT_100" -> score.toInt().toString()
+// 5 stars
+    "POINT_5" -> when {
         score == 0f -> "0"
         score < 30 -> "1"
         score < 50 -> "2"
@@ -73,14 +93,14 @@ fun Track.toAnilistScore(): String = when (preferences.anilistScoreType().getOrD
         score < 90 -> "4"
         else -> "5"
     }
-    // Smiley
-    3 -> when {
+// Smiley
+    "POINT_3" -> when {
         score == 0f -> "0"
         score <= 30 -> ":("
         score <= 60 -> ":|"
         else -> ":)"
     }
-    // 10 point decimal
-    4 -> (score / 10).toString()
+// 10 point decimal
+    "POINT_10_DECIMAL" -> (score / 10).toString()
     else -> throw Exception("Unknown score type")
-}
+}

app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/OAuth.kt

@@ -4,8 +4,7 @@ data class OAuth(
         val access_token: String,
         val token_type: String,
         val expires: Long,
-        val expires_in: Long,
-        val refresh_token: String?) {
+        val expires_in: Long) {
 
     fun isExpired() = System.currentTimeMillis() > expires
 }

app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt

@@ -6,6 +6,7 @@ import com.google.gson.Gson
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.TrackService
+import eu.kanade.tachiyomi.data.track.model.TrackSearch
 import rx.Completable
 import rx.Observable
 import uy.kohesive.injekt.injectLazy
@@ -86,7 +87,7 @@ class Kitsu(private val context: Context, id: Int) : TrackService(id) {
                 .flatMap { remoteTrack ->
                     if (remoteTrack != null) {
                         track.copyPersonalFrom(remoteTrack)
-                        track.remote_id = remoteTrack.remote_id
+                        track.media_id = remoteTrack.media_id
                         update(track)
                     } else {
                         track.score = DEFAULT_SCORE
@@ -96,7 +97,7 @@ class Kitsu(private val context: Context, id: Int) : TrackService(id) {
                 }
     }
 
-    override fun search(query: String): Observable<List<Track>> {
+    override fun search(query: String): Observable<List<TrackSearch>> {
         return api.search(query)
     }
 
@@ -140,4 +141,4 @@ class Kitsu(private val context: Context, id: Int) : TrackService(id) {
         }
     }
 
-}
+}

app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/KitsuApi.kt

@@ -4,6 +4,7 @@ import com.github.salomonbrys.kotson.*
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonObject
 import eu.kanade.tachiyomi.data.database.models.Track
+import eu.kanade.tachiyomi.data.track.model.TrackSearch
 import eu.kanade.tachiyomi.network.POST
 import okhttp3.FormBody
 import okhttp3.OkHttpClient
@@ -27,31 +28,31 @@ class KitsuApi(private val client: OkHttpClient, interceptor: KitsuInterceptor)
         return Observable.defer {
             // @formatter:off
             val data = jsonObject(
-                "type" to "libraryEntries",
-                "attributes" to jsonObject(
-                    "status" to track.toKitsuStatus(),
-                    "progress" to track.last_chapter_read
-                ),
-                "relationships" to jsonObject(
-                    "user" to jsonObject(
-                        "data" to jsonObject(
-                            "id" to userId,
-                            "type" to "users"
-                        )
+                    "type" to "libraryEntries",
+                    "attributes" to jsonObject(
+                            "status" to track.toKitsuStatus(),
+                            "progress" to track.last_chapter_read
                     ),
-                    "media" to jsonObject(
-                        "data" to jsonObject(
-                            "id" to track.remote_id,
-                            "type" to "manga"
-                        )
+                    "relationships" to jsonObject(
+                            "user" to jsonObject(
+                                    "data" to jsonObject(
+                                            "id" to userId,
+                                            "type" to "users"
+                                    )
+                            ),
+                            "media" to jsonObject(
+                                    "data" to jsonObject(
+                                            "id" to track.media_id,
+                                            "type" to "manga"
+                                    )
+                            )
                     )
-                )
             )
             // @formatter:on
 
             rest.addLibManga(jsonObject("data" to data))
                     .map { json ->
-                        track.remote_id = json["data"]["id"].int
+                        track.media_id = json["data"]["id"].int
                         track
                     }
         }
@@ -61,22 +62,22 @@ class KitsuApi(private val client: OkHttpClient, interceptor: KitsuInterceptor)
         return Observable.defer {
             // @formatter:off
             val data = jsonObject(
-                "type" to "libraryEntries",
-                "id" to track.remote_id,
-                "attributes" to jsonObject(
-                    "status" to track.toKitsuStatus(),
-                    "progress" to track.last_chapter_read,
-                    "ratingTwenty" to track.toKitsuScore()
-                )
+                    "type" to "libraryEntries",
+                    "id" to track.media_id,
+                    "attributes" to jsonObject(
+                            "status" to track.toKitsuStatus(),
+                            "progress" to track.last_chapter_read,
+                            "ratingTwenty" to track.toKitsuScore()
+                    )
             )
             // @formatter:on
 
-            rest.updateLibManga(track.remote_id, jsonObject("data" to data))
+            rest.updateLibManga(track.media_id, jsonObject("data" to data))
                     .map { track }
         }
     }
 
-    fun search(query: String): Observable<List<Track>> {
+    fun search(query: String): Observable<List<TrackSearch>> {
         return rest.search(query)
                 .map { json ->
                     val data = json["data"].array
@@ -87,7 +88,7 @@ class KitsuApi(private val client: OkHttpClient, interceptor: KitsuInterceptor)
     }
 
     fun findLibManga(track: Track, userId: String): Observable<Track?> {
-        return rest.findLibManga(track.remote_id, userId)
+        return rest.findLibManga(track.media_id, userId)
                 .map { json ->
                     val data = json["data"].array
                     if (data.size() > 0) {
@@ -100,7 +101,7 @@ class KitsuApi(private val client: OkHttpClient, interceptor: KitsuInterceptor)
     }
 
     fun getLibManga(track: Track): Observable<Track> {
-        return rest.getLibManga(track.remote_id)
+        return rest.getLibManga(track.media_id)
                 .map { json ->
                     val data = json["data"].array
                     if (data.size() > 0) {
@@ -186,6 +187,11 @@ class KitsuApi(private val client: OkHttpClient, interceptor: KitsuInterceptor)
         private const val clientSecret = "54d7307928f63414defd96399fc31ba847961ceaecef3a5fd93144e960c0e151"
         private const val baseUrl = "https://kitsu.io/api/edge/"
         private const val loginUrl = "https://kitsu.io/api/"
+        private const val baseMangaUrl = "https://kitsu.io/manga/"
+
+        fun mangaUrl(remoteId: Int): String {
+            return baseMangaUrl + remoteId
+        }
 
 
         fun refreshTokenRequest(token: String) = POST("${loginUrl}oauth/token",
@@ -198,4 +204,4 @@ class KitsuApi(private val client: OkHttpClient, interceptor: KitsuInterceptor)
 
     }
 
-}
+}

app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/KitsuModels.kt

@@ -5,29 +5,40 @@ import com.github.salomonbrys.kotson.*
 import com.google.gson.JsonObject
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.TrackManager
+import eu.kanade.tachiyomi.data.track.model.TrackSearch
 
 open class KitsuManga(obj: JsonObject) {
     val id by obj.byInt
     val canonicalTitle by obj["attributes"].byString
     val chapterCount = obj["attributes"].obj.get("chapterCount").nullInt
-    val type = obj["attributes"].obj.get("mangaType").nullString
+    val type = obj["attributes"].obj.get("mangaType").nullString.orEmpty()
+    val original by obj["attributes"].obj["posterImage"].byString
+    val synopsis by obj["attributes"].byString
+    val startDate = obj["attributes"].obj.get("startDate").nullString.orEmpty()
+    open val status = obj["attributes"].obj.get("status").nullString.orEmpty()
 
     @CallSuper
-    open fun toTrack() = Track.create(TrackManager.KITSU).apply {
-        remote_id = this@KitsuManga.id
+    open fun toTrack() = TrackSearch.create(TrackManager.KITSU).apply {
+        media_id = this@KitsuManga.id
         title = canonicalTitle
         total_chapters = chapterCount ?: 0
+        cover_url = original
+        summary = synopsis
+        tracking_url = KitsuApi.mangaUrl(media_id)
+        publishing_status = this@KitsuManga.status
+        publishing_type = type
+        start_date = startDate.orEmpty()
     }
 }
 
 class KitsuLibManga(obj: JsonObject, manga: JsonObject) : KitsuManga(manga) {
-    val remoteId by obj.byInt("id")
-    val status by obj["attributes"].byString
+    val libraryId by obj.byInt("id")
+    override val status by obj["attributes"].byString
     val ratingTwenty = obj["attributes"].obj.get("ratingTwenty").nullString
     val progress by obj["attributes"].byInt
 
     override fun toTrack() = super.toTrack().apply {
-        remote_id = remoteId
+        media_id = libraryId // TODO migrate media ids to library ids
         status = toTrackStatus()
         score = ratingTwenty?.let { it.toInt() / 2f } ?: 0f
         last_chapter_read = progress

app/src/main/java/eu/kanade/tachiyomi/data/track/model/TrackSearch.kt

@@ -0,0 +1,64 @@
+package eu.kanade.tachiyomi.data.track.model
+
+import eu.kanade.tachiyomi.data.database.models.Track
+
+class TrackSearch : Track {
+
+    override var id: Long? = null
+
+    override var manga_id: Long = 0
+
+    override var sync_id: Int = 0
+
+    override var media_id: Int = 0
+
+    override var library_id: Long? = null
+
+    override lateinit var title: String
+
+    override var last_chapter_read: Int = 0
+
+    override var total_chapters: Int = 0
+
+    override var score: Float = 0f
+
+    override var status: Int = 0
+
+    override lateinit var tracking_url: String
+
+    var cover_url: String = ""
+
+    var summary: String = ""
+
+    var publishing_status: String = ""
+
+    var publishing_type: String = ""
+
+    var start_date: String = ""
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other == null || javaClass != other.javaClass) return false
+
+        other as Track
+
+        if (manga_id != other.manga_id) return false
+        if (sync_id != other.sync_id) return false
+        return media_id == other.media_id
+    }
+
+    override fun hashCode(): Int {
+        var result = (manga_id xor manga_id.ushr(32)).toInt()
+        result = 31 * result + sync_id
+        result = 31 * result + media_id
+        return result
+    }
+    companion object {
+
+        fun create(serviceId: Int): TrackSearch = TrackSearch().apply {
+            sync_id = serviceId
+        }
+
+    }
+
+}

app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt

@@ -4,6 +4,7 @@ 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.track.model.TrackSearch
 import eu.kanade.tachiyomi.data.track.TrackService
 import rx.Completable
 import rx.Observable
@@ -81,7 +82,7 @@ class Myanimelist(private val context: Context, id: Int) : TrackService(id) {
                 }
     }
 
-    override fun search(query: String): Observable<List<Track>> {
+    override fun search(query: String): Observable<List<TrackSearch>> {
         return api.search(query, getUsername())
     }
 

app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyanimelistApi.kt

@@ -4,6 +4,7 @@ import android.net.Uri
 import android.util.Xml
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.TrackManager
+import eu.kanade.tachiyomi.data.track.model.TrackSearch
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.network.asObservable
@@ -12,6 +13,7 @@ import eu.kanade.tachiyomi.util.selectInt
 import eu.kanade.tachiyomi.util.selectText
 import okhttp3.*
 import org.jsoup.Jsoup
+import org.jsoup.parser.Parser
 import org.xmlpull.v1.XmlSerializer
 import rx.Observable
 import java.io.StringWriter
@@ -36,7 +38,7 @@ class MyanimelistApi(private val client: OkHttpClient, username: String, passwor
         }
     }
 
-    fun search(query: String, username: String): Observable<List<Track>> {
+    fun search(query: String, username: String): Observable<List<TrackSearch>> {
         return if (query.startsWith(PREFIX_MY)) {
             val realQuery = query.substring(PREFIX_MY.length).toLowerCase().trim()
             getList(username)
@@ -46,34 +48,42 @@ class MyanimelistApi(private val client: OkHttpClient, username: String, passwor
         } else {
             client.newCall(GET(getSearchUrl(query), headers))
                     .asObservable()
-                    .map { Jsoup.parse(it.body()!!.string()) }
+                    .map { Jsoup.parse(Parser.unescapeEntities(it.body()!!.string(), false), "", Parser.xmlParser()) }
                     .flatMap { Observable.from(it.select("entry")) }
                     .filter { it.select("type").text() != "Novel" }
                     .map {
-                        Track.create(TrackManager.MYANIMELIST).apply {
+                        TrackSearch.create(TrackManager.MYANIMELIST).apply {
                             title = it.selectText("title")!!
-                            remote_id = it.selectInt("id")
+                            media_id = it.selectInt("id")
                             total_chapters = it.selectInt("chapters")
+                            summary = it.selectText("synopsis")!!
+                            cover_url = it.selectText("image")!!
+                            tracking_url = MyanimelistApi.mangaUrl(media_id)
+                            publishing_status = it.selectText("status")!!
+                            publishing_type = it.selectText("type")!!
+                            start_date = it.selectText("start_date")!!
                         }
                     }
                     .toList()
         }
     }
 
-    fun getList(username: String): Observable<List<Track>> {
+    fun getList(username: String): Observable<List<TrackSearch>> {
         return client
                 .newCall(GET(getListUrl(username), headers))
                 .asObservable()
-                .map { Jsoup.parse(it.body()!!.string()) }
+                .map { Jsoup.parse(Parser.unescapeEntities(it.body()!!.string(), false), "", Parser.xmlParser()) }
                 .flatMap { Observable.from(it.select("manga")) }
                 .map {
-                    Track.create(TrackManager.MYANIMELIST).apply {
+                    TrackSearch.create(TrackManager.MYANIMELIST).apply {
                         title = it.selectText("series_title")!!
-                        remote_id = it.selectInt("series_mangadb_id")
+                        media_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")
+                        cover_url = it.selectText("series_image")!!
+                        tracking_url = MyanimelistApi.mangaUrl(media_id)
                     }
                 }
                 .toList()
@@ -81,7 +91,7 @@ class MyanimelistApi(private val client: OkHttpClient, username: String, passwor
 
     fun findLibManga(track: Track, username: String): Observable<Track?> {
         return getList(username)
-                .map { list -> list.find { it.remote_id == track.remote_id } }
+                .map { list -> list.find { it.media_id == track.media_id } }
     }
 
     fun getLibManga(track: Track, username: String): Observable<Track> {
@@ -159,12 +169,12 @@ class MyanimelistApi(private val client: OkHttpClient, username: String, passwor
 
     fun getUpdateUrl(track: Track) = Uri.parse(baseUrl).buildUpon()
             .appendEncodedPath("api/mangalist/update")
-            .appendPath("${track.remote_id}.xml")
+            .appendPath("${track.media_id}.xml")
             .toString()
 
     fun getAddUrl(track: Track) = Uri.parse(baseUrl).buildUpon()
             .appendEncodedPath("api/mangalist/add")
-            .appendPath("${track.remote_id}.xml")
+            .appendPath("${track.media_id}.xml")
             .toString()
 
     fun createHeaders(username: String, password: String): Headers {
@@ -176,6 +186,11 @@ class MyanimelistApi(private val client: OkHttpClient, username: String, passwor
 
     companion object {
         const val baseUrl = "https://myanimelist.net"
+        const val baseMangaUrl = baseUrl + "/manga/"
+
+        fun mangaUrl(remoteId: Int): String {
+            return baseMangaUrl + remoteId
+        }
 
         private val ENTRY_TAG = "entry"
         private val CHAPTER_TAG = "chapter"

app/src/main/java/eu/kanade/tachiyomi/data/updater/GithubService.kt

@@ -1,10 +1,13 @@
 package eu.kanade.tachiyomi.data.updater
 
+import eu.kanade.tachiyomi.network.NetworkHelper
 import retrofit2.Retrofit
 import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory
 import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.http.GET
 import rx.Observable
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
 
 /**
  * Used to connect with the Github API.
@@ -17,6 +20,7 @@ interface GithubService {
                     .baseUrl("https://api.github.com")
                     .addConverterFactory(GsonConverterFactory.create())
                     .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+                    .client(Injekt.get<NetworkHelper>().client)
                     .build()
 
             return restAdapter.create(GithubService::class.java)

app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt

@@ -0,0 +1,334 @@
+package eu.kanade.tachiyomi.extension
+
+import android.content.Context
+import com.jakewharton.rxrelay.BehaviorRelay
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.data.preference.getOrDefault
+import eu.kanade.tachiyomi.extension.api.ExtensionGithubApi
+import eu.kanade.tachiyomi.extension.model.Extension
+import eu.kanade.tachiyomi.extension.model.InstallStep
+import eu.kanade.tachiyomi.extension.model.LoadResult
+import eu.kanade.tachiyomi.extension.util.ExtensionInstallReceiver
+import eu.kanade.tachiyomi.extension.util.ExtensionInstaller
+import eu.kanade.tachiyomi.extension.util.ExtensionLoader
+import eu.kanade.tachiyomi.source.SourceManager
+import eu.kanade.tachiyomi.util.launchNow
+import kotlinx.coroutines.experimental.async
+import rx.Observable
+import rx.android.schedulers.AndroidSchedulers
+import rx.schedulers.Schedulers
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+/**
+ * The manager of extensions installed as another apk which extend the available sources. It handles
+ * the retrieval of remotely available extensions as well as installing, updating and removing them.
+ * To avoid malicious distribution, every extension must be signed and it will only be loaded if its
+ * signature is trusted, otherwise the user will be prompted with a warning to trust it before being
+ * loaded.
+ *
+ * @param context The application context.
+ * @param preferences The application preferences.
+ */
+class ExtensionManager(
+        private val context: Context,
+        private val preferences: PreferencesHelper = Injekt.get()
+) {
+
+    /**
+     * API where all the available extensions can be found.
+     */
+    private val api = ExtensionGithubApi()
+
+    /**
+     * The installer which installs, updates and uninstalls the extensions.
+     */
+    private val installer by lazy { ExtensionInstaller(context) }
+
+    /**
+     * Relay used to notify the installed extensions.
+     */
+    private val installedExtensionsRelay = BehaviorRelay.create<List<Extension.Installed>>()
+
+    /**
+     * List of the currently installed extensions.
+     */
+    var installedExtensions = emptyList<Extension.Installed>()
+        private set(value) {
+            field = value
+            installedExtensionsRelay.call(value)
+        }
+
+    /**
+     * Relay used to notify the available extensions.
+     */
+    private val availableExtensionsRelay = BehaviorRelay.create<List<Extension.Available>>()
+
+    /**
+     * List of the currently available extensions.
+     */
+    var availableExtensions = emptyList<Extension.Available>()
+        private set(value) {
+            field = value
+            availableExtensionsRelay.call(value)
+            setUpdateFieldOfInstalledExtensions(value)
+        }
+
+    /**
+     * Relay used to notify the untrusted extensions.
+     */
+    private val untrustedExtensionsRelay = BehaviorRelay.create<List<Extension.Untrusted>>()
+
+    /**
+     * List of the currently untrusted extensions.
+     */
+    var untrustedExtensions = emptyList<Extension.Untrusted>()
+        private set(value) {
+            field = value
+            untrustedExtensionsRelay.call(value)
+        }
+
+    /**
+     * The source manager where the sources of the extensions are added.
+     */
+    private lateinit var sourceManager: SourceManager
+
+    /**
+     * Initializes this manager with the given source manager.
+     */
+    fun init(sourceManager: SourceManager) {
+        this.sourceManager = sourceManager
+        initExtensions()
+        ExtensionInstallReceiver(InstallationListener()).register(context)
+    }
+
+    /**
+     * Loads and registers the installed extensions.
+     */
+    private fun initExtensions() {
+        val extensions = ExtensionLoader.loadExtensions(context)
+
+        installedExtensions = extensions
+                .filterIsInstance<LoadResult.Success>()
+                .map { it.extension }
+        installedExtensions
+                .flatMap { it.sources }
+                // overwrite is needed until the bundled sources are removed
+                .forEach { sourceManager.registerSource(it, true) }
+
+        untrustedExtensions = extensions
+                .filterIsInstance<LoadResult.Untrusted>()
+                .map { it.extension }
+    }
+
+    /**
+     * Returns the relay of the installed extensions as an observable.
+     */
+    fun getInstalledExtensionsObservable(): Observable<List<Extension.Installed>> {
+        return installedExtensionsRelay.asObservable()
+    }
+
+    /**
+     * Returns the relay of the available extensions as an observable.
+     */
+    fun getAvailableExtensionsObservable(): Observable<List<Extension.Available>> {
+        return availableExtensionsRelay.asObservable()
+    }
+
+    /**
+     * Returns the relay of the untrusted extensions as an observable.
+     */
+    fun getUntrustedExtensionsObservable(): Observable<List<Extension.Untrusted>> {
+        return untrustedExtensionsRelay.asObservable()
+    }
+
+    /**
+     * Finds the available extensions in the [api] and updates [availableExtensions].
+     */
+    fun findAvailableExtensions() {
+        api.findExtensions()
+                .onErrorReturn { emptyList() }
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe { availableExtensions = it }
+    }
+
+    /**
+     * Sets the update field of the installed extensions with the given [availableExtensions].
+     *
+     * @param availableExtensions The list of extensions given by the [api].
+     */
+    private fun setUpdateFieldOfInstalledExtensions(availableExtensions: List<Extension.Available>) {
+        val mutInstalledExtensions = installedExtensions.toMutableList()
+        var changed = false
+
+        for ((index, installedExt) in mutInstalledExtensions.withIndex()) {
+            val pkgName = installedExt.pkgName
+            val availableExt = availableExtensions.find { it.pkgName == pkgName } ?: continue
+
+            val hasUpdate = availableExt.versionCode > installedExt.versionCode
+            if (installedExt.hasUpdate != hasUpdate) {
+                mutInstalledExtensions[index] = installedExt.copy(hasUpdate = hasUpdate)
+                changed = true
+            }
+        }
+        if (changed) {
+            installedExtensions = mutInstalledExtensions
+        }
+    }
+
+    /**
+     * Returns an observable of the installation process for the given extension. It will complete
+     * once the extension is installed or throws an error. The process will be canceled if
+     * unsubscribed before its completion.
+     *
+     * @param extension The extension to be installed.
+     */
+    fun installExtension(extension: Extension.Available): Observable<InstallStep> {
+        return installer.downloadAndInstall(api.getApkUrl(extension), extension)
+    }
+
+    /**
+     * Returns an observable of the installation process for the given extension. It will complete
+     * once the extension is updated or throws an error. The process will be canceled if
+     * unsubscribed before its completion.
+     *
+     * @param extension The extension to be updated.
+     */
+    fun updateExtension(extension: Extension.Installed): Observable<InstallStep>  {
+        val availableExt = availableExtensions.find { it.pkgName == extension.pkgName }
+                ?: return Observable.empty()
+        return installExtension(availableExt)
+    }
+
+    /**
+     * Sets the result of the installation of an extension.
+     *
+     * @param downloadId The id of the download.
+     * @param result Whether the extension was installed or not.
+     */
+    fun setInstallationResult(downloadId: Long, result: Boolean) {
+        installer.setInstallationResult(downloadId, result)
+    }
+
+    /**
+     * Uninstalls the extension that matches the given package name.
+     *
+     * @param pkgName The package name of the application to uninstall.
+     */
+    fun uninstallExtension(pkgName: String) {
+        installer.uninstallApk(pkgName)
+    }
+
+    /**
+     * Adds the given signature to the list of trusted signatures. It also loads in background the
+     * extensions that match this signature.
+     *
+     * @param signature The signature to whitelist.
+     */
+    fun trustSignature(signature: String) {
+        val untrustedSignatures = untrustedExtensions.map { it.signatureHash }.toSet()
+        if (signature !in untrustedSignatures) return
+
+        ExtensionLoader.trustedSignatures += signature
+        val preference = preferences.trustedSignatures()
+        preference.set(preference.getOrDefault() + signature)
+
+        val nowTrustedExtensions = untrustedExtensions.filter { it.signatureHash == signature }
+        untrustedExtensions -= nowTrustedExtensions
+
+        val ctx = context
+        launchNow {
+            nowTrustedExtensions
+                    .map { extension ->
+                        async { ExtensionLoader.loadExtensionFromPkgName(ctx, extension.pkgName) }
+                    }
+                    .map { it.await() }
+                    .forEach { result ->
+                        if (result is LoadResult.Success) {
+                            registerNewExtension(result.extension)
+                        }
+                    }
+        }
+    }
+
+    /**
+     * Registers the given extension in this and the source managers.
+     *
+     * @param extension The extension to be registered.
+     */
+    private fun registerNewExtension(extension: Extension.Installed) {
+        installedExtensions += extension
+        extension.sources.forEach { sourceManager.registerSource(it) }
+    }
+
+    /**
+     * Registers the given updated extension in this and the source managers previously removing
+     * the outdated ones.
+     *
+     * @param extension The extension to be registered.
+     */
+    private fun registerUpdatedExtension(extension: Extension.Installed) {
+        val mutInstalledExtensions = installedExtensions.toMutableList()
+        val oldExtension = mutInstalledExtensions.find { it.pkgName == extension.pkgName }
+        if (oldExtension != null) {
+            mutInstalledExtensions -= oldExtension
+            extension.sources.forEach { sourceManager.unregisterSource(it) }
+        }
+        mutInstalledExtensions += extension
+        installedExtensions = mutInstalledExtensions
+        extension.sources.forEach { sourceManager.registerSource(it) }
+    }
+
+    /**
+     * Unregisters the extension in this and the source managers given its package name. Note this
+     * method is called for every uninstalled application in the system.
+     *
+     * @param pkgName The package name of the uninstalled application.
+     */
+    private fun unregisterExtension(pkgName: String) {
+        val installedExtension = installedExtensions.find { it.pkgName == pkgName }
+        if (installedExtension != null) {
+            installedExtensions -= installedExtension
+            installedExtension.sources.forEach { sourceManager.unregisterSource(it) }
+        }
+        val untrustedExtension = untrustedExtensions.find { it.pkgName == pkgName }
+        if (untrustedExtension != null) {
+            untrustedExtensions -= untrustedExtension
+        }
+    }
+
+    /**
+     * Listener which receives events of the extensions being installed, updated or removed.
+     */
+    private inner class InstallationListener : ExtensionInstallReceiver.Listener {
+
+        override fun onExtensionInstalled(extension: Extension.Installed) {
+            registerNewExtension(extension.withUpdateCheck())
+        }
+
+        override fun onExtensionUpdated(extension: Extension.Installed) {
+            registerUpdatedExtension(extension.withUpdateCheck())
+        }
+
+        override fun onExtensionUntrusted(extension: Extension.Untrusted) {
+            untrustedExtensions += extension
+        }
+
+        override fun onPackageUninstalled(pkgName: String) {
+            unregisterExtension(pkgName)
+        }
+    }
+
+    /**
+     * Extension method to set the update field of an installed extension.
+     */
+    private fun Extension.Installed.withUpdateCheck(): Extension.Installed {
+        val availableExt = availableExtensions.find { it.pkgName == pkgName }
+        if (availableExt != null && availableExt.versionCode > versionCode) {
+            return copy(hasUpdate = true)
+        }
+        return this
+    }
+
+}

app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt

@@ -0,0 +1,55 @@
+package eu.kanade.tachiyomi.extension.api
+
+import com.github.salomonbrys.kotson.fromJson
+import com.github.salomonbrys.kotson.get
+import com.github.salomonbrys.kotson.int
+import com.github.salomonbrys.kotson.string
+import com.google.gson.Gson
+import com.google.gson.JsonArray
+import eu.kanade.tachiyomi.extension.model.Extension
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.NetworkHelper
+import eu.kanade.tachiyomi.network.asObservableSuccess
+import okhttp3.Response
+import rx.Observable
+import uy.kohesive.injekt.injectLazy
+
+internal class ExtensionGithubApi {
+
+    private val network: NetworkHelper by injectLazy()
+
+    private val client get() = network.client
+
+    private val gson: Gson by injectLazy()
+
+    private val repoUrl = "https://raw.githubusercontent.com/inorichi/tachiyomi-extensions/repo"
+
+    fun findExtensions(): Observable<List<Extension.Available>> {
+        val call = GET("$repoUrl/index.json")
+
+        return client.newCall(call).asObservableSuccess()
+                .map(::parseResponse)
+    }
+
+    private fun parseResponse(response: Response): List<Extension.Available> {
+        val text = response.body()?.use { it.string() } ?: return emptyList()
+
+        val json = gson.fromJson<JsonArray>(text)
+
+        return json.map { element ->
+            val name = element["name"].string.substringAfter("Tachiyomi: ")
+            val pkgName = element["pkg"].string
+            val apkName = element["apk"].string
+            val versionName = element["version"].string
+            val versionCode = element["code"].int
+            val lang = element["lang"].string
+            val icon = "$repoUrl/icon/${apkName.replace(".apk", ".png")}"
+
+            Extension.Available(name, pkgName, versionName, versionCode, lang, apkName, icon)
+        }
+    }
+
+    fun getApkUrl(extension: Extension.Available): String {
+        return "$repoUrl/apk/${extension.apkName}"
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/extension/model/Extension.kt

@@ -0,0 +1,36 @@
+package eu.kanade.tachiyomi.extension.model
+
+import eu.kanade.tachiyomi.source.Source
+
+sealed class Extension {
+
+    abstract val name: String
+    abstract val pkgName: String
+    abstract val versionName: String
+    abstract val versionCode: Int
+    abstract val lang: String?
+
+    data class Installed(override val name: String,
+                         override val pkgName: String,
+                         override val versionName: String,
+                         override val versionCode: Int,
+                         val sources: List<Source>,
+                         override val lang: String,
+                         val hasUpdate: Boolean = false) : Extension()
+
+    data class Available(override val name: String,
+                         override val pkgName: String,
+                         override val versionName: String,
+                         override val versionCode: Int,
+                         override val lang: String,
+                         val apkName: String,
+                         val iconUrl: String) : Extension()
+
+    data class Untrusted(override val name: String,
+                         override val pkgName: String,
+                         override val versionName: String,
+                         override val versionCode: Int,
+                         val signatureHash: String,
+                         override val lang: String? = null) : Extension()
+
+}

app/src/main/java/eu/kanade/tachiyomi/extension/model/InstallStep.kt

@@ -0,0 +1,9 @@
+package eu.kanade.tachiyomi.extension.model
+
+enum class InstallStep {
+    Pending, Downloading, Installing, Installed, Error;
+
+    fun isCompleted(): Boolean {
+        return this == Installed || this == Error
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/extension/model/LoadResult.kt

@@ -0,0 +1,10 @@
+package eu.kanade.tachiyomi.extension.model
+
+sealed class LoadResult {
+
+    class Success(val extension: Extension.Installed) : LoadResult()
+    class Untrusted(val extension: Extension.Untrusted) : LoadResult()
+    class Error(val message: String? = null) : LoadResult() {
+        constructor(exception: Throwable) : this(exception.message)
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallActivity.kt

@@ -0,0 +1,52 @@
+package eu.kanade.tachiyomi.extension.util
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import eu.kanade.tachiyomi.extension.ExtensionManager
+import eu.kanade.tachiyomi.util.toast
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+/**
+ * Activity used to install extensions, because we can only receive the result of the installation
+ * with [startActivityForResult], which we need to update the UI.
+ */
+class ExtensionInstallActivity : Activity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val installIntent = Intent(Intent.ACTION_INSTALL_PACKAGE)
+                .setDataAndType(intent.data, intent.type)
+                .putExtra(Intent.EXTRA_RETURN_RESULT, true)
+                .setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+
+        try {
+            startActivityForResult(installIntent, INSTALL_REQUEST_CODE)
+        } catch (error: Exception) {
+            // Either install package can't be found (probably bots) or there's a security exception
+            // with the download manager. Nothing we can workaround.
+            toast(error.message)
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        if (requestCode == INSTALL_REQUEST_CODE) {
+            checkInstallationResult(resultCode)
+        }
+        finish()
+    }
+
+    private fun checkInstallationResult(resultCode: Int) {
+        val downloadId = intent.extras.getLong(ExtensionInstaller.EXTRA_DOWNLOAD_ID)
+        val success = resultCode == RESULT_OK
+
+        val extensionManager = Injekt.get<ExtensionManager>()
+        extensionManager.setInstallationResult(downloadId, success)
+    }
+
+    private companion object {
+        const val INSTALL_REQUEST_CODE = 500
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallReceiver.kt

@@ -0,0 +1,114 @@
+package eu.kanade.tachiyomi.extension.util
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import eu.kanade.tachiyomi.extension.model.Extension
+import eu.kanade.tachiyomi.extension.model.LoadResult
+import eu.kanade.tachiyomi.util.launchNow
+import kotlinx.coroutines.experimental.async
+
+/**
+ * Broadcast receiver that listens for the system's packages installed, updated or removed, and only
+ * notifies the given [listener] when the package is an extension.
+ *
+ * @param listener The listener that should be notified of extension installation events.
+ */
+internal class ExtensionInstallReceiver(private val listener: Listener) :
+        BroadcastReceiver() {
+
+    /**
+     * Registers this broadcast receiver
+     */
+    fun register(context: Context) {
+        context.registerReceiver(this, filter)
+    }
+
+    /**
+     * Returns the intent filter this receiver should subscribe to.
+     */
+    private val filter get() = IntentFilter().apply {
+        addAction(Intent.ACTION_PACKAGE_ADDED)
+        addAction(Intent.ACTION_PACKAGE_REPLACED)
+        addAction(Intent.ACTION_PACKAGE_REMOVED)
+        addDataScheme("package")
+    }
+
+    /**
+     * Called when one of the events of the [filter] is received. When the package is an extension,
+     * it's loaded in background and it notifies the [listener] when finished.
+     */
+    override fun onReceive(context: Context, intent: Intent?) {
+        if (intent == null) return
+
+        when (intent.action) {
+            Intent.ACTION_PACKAGE_ADDED -> {
+                if (!isReplacing(intent)) launchNow {
+                    val result = getExtensionFromIntent(context, intent)
+                    when (result) {
+                        is LoadResult.Success -> listener.onExtensionInstalled(result.extension)
+                        is LoadResult.Untrusted -> listener.onExtensionUntrusted(result.extension)
+                    }
+                }
+            }
+            Intent.ACTION_PACKAGE_REPLACED -> {
+                launchNow {
+                    val result = getExtensionFromIntent(context, intent)
+                    when (result) {
+                        is LoadResult.Success -> listener.onExtensionUpdated(result.extension)
+                        // Not needed as a package can't be upgraded if the signature is different
+                        is LoadResult.Untrusted -> {}
+                    }
+                }
+            }
+            Intent.ACTION_PACKAGE_REMOVED -> {
+                if (!isReplacing(intent)) {
+                    val pkgName = getPackageNameFromIntent(intent)
+                    if (pkgName != null) {
+                        listener.onPackageUninstalled(pkgName)
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Returns true if this package is performing an update.
+     *
+     * @param intent The intent that triggered the event.
+     */
+    private fun isReplacing(intent: Intent): Boolean {
+        return intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)
+    }
+
+    /**
+     * Returns the extension triggered by the given intent.
+     *
+     * @param context The application context.
+     * @param intent The intent containing the package name of the extension.
+     */
+    private suspend fun getExtensionFromIntent(context: Context, intent: Intent?): LoadResult {
+        val pkgName = getPackageNameFromIntent(intent) ?:
+                return LoadResult.Error("Package name not found")
+        return async { ExtensionLoader.loadExtensionFromPkgName(context, pkgName) }.await()
+    }
+
+    /**
+     * Returns the package name of the installed, updated or removed application.
+     */
+    private fun getPackageNameFromIntent(intent: Intent?): String? {
+        return intent?.data?.encodedSchemeSpecificPart ?: return null
+    }
+
+    /**
+     * Listener that receives extension installation events.
+     */
+    interface Listener {
+        fun onExtensionInstalled(extension: Extension.Installed)
+        fun onExtensionUpdated(extension: Extension.Installed)
+        fun onExtensionUntrusted(extension: Extension.Untrusted)
+        fun onPackageUninstalled(pkgName: String)
+    }
+
+}

app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstaller.kt

@@ -0,0 +1,247 @@
+package eu.kanade.tachiyomi.extension.util
+
+import android.app.DownloadManager
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.net.Uri
+import android.os.Build
+import com.jakewharton.rxrelay.PublishRelay
+import eu.kanade.tachiyomi.extension.model.Extension
+import eu.kanade.tachiyomi.extension.model.InstallStep
+import eu.kanade.tachiyomi.util.getUriCompat
+import rx.Observable
+import rx.android.schedulers.AndroidSchedulers
+import timber.log.Timber
+import java.io.File
+import java.util.concurrent.TimeUnit
+
+/**
+ * The installer which installs, updates and uninstalls the extensions.
+ *
+ * @param context The application context.
+ */
+internal class ExtensionInstaller(private val context: Context) {
+
+    /**
+     * The system's download manager
+     */
+    private val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
+
+    /**
+     * The broadcast receiver which listens to download completion events.
+     */
+    private val downloadReceiver = DownloadCompletionReceiver()
+
+    /**
+     * The currently requested downloads, with the package name (unique id) as key, and the id
+     * returned by the download manager.
+     */
+    private val activeDownloads = hashMapOf<String, Long>()
+
+    /**
+     * Relay used to notify the installation step of every download.
+     */
+    private val downloadsRelay = PublishRelay.create<Pair<Long, InstallStep>>()
+
+    /**
+     * Adds the given extension to the downloads queue and returns an observable containing its
+     * step in the installation process.
+     *
+     * @param url The url of the apk.
+     * @param extension The extension to install.
+     */
+    fun downloadAndInstall(url: String, extension: Extension) = Observable.defer {
+        val pkgName = extension.pkgName
+
+        val oldDownload = activeDownloads[pkgName]
+        if (oldDownload != null) {
+            deleteDownload(pkgName)
+        }
+
+        // Register the receiver after removing (and unregistering) the previous download
+        downloadReceiver.register()
+
+        val request = DownloadManager.Request(Uri.parse(url))
+                .setTitle(extension.name)
+                .setMimeType(APK_MIME)
+                .setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
+
+        val id = downloadManager.enqueue(request)
+        activeDownloads[pkgName] = id
+
+        downloadsRelay.filter { it.first == id }
+                .map { it.second }
+                // Poll download status
+                .mergeWith(pollStatus(id))
+                // Force an error if the download takes more than 3 minutes
+                .mergeWith(Observable.timer(3, TimeUnit.MINUTES).map { InstallStep.Error })
+                // Stop when the application is installed or errors
+                .takeUntil { it.isCompleted() }
+                // Always notify on main thread
+                .observeOn(AndroidSchedulers.mainThread())
+                // Always remove the download when unsubscribed
+                .doOnUnsubscribe { deleteDownload(pkgName) }
+    }
+
+    /**
+     * Returns an observable that polls the given download id for its status every second, as the
+     * manager doesn't have any notification system. It'll stop once the download finishes.
+     *
+     * @param id The id of the download to poll.
+     */
+    private fun pollStatus(id: Long): Observable<InstallStep> {
+        val query = DownloadManager.Query().setFilterById(id)
+
+        return Observable.interval(0, 1, TimeUnit.SECONDS)
+                // Get the current download status
+                .map {
+                    downloadManager.query(query).use { cursor ->
+                        cursor.moveToFirst()
+                        cursor.getInt(cursor.getColumnIndex(DownloadManager.COLUMN_STATUS))
+                    }
+                }
+                // Ignore duplicate results
+                .distinctUntilChanged()
+                // Stop polling when the download fails or finishes
+                .takeUntil { it == DownloadManager.STATUS_SUCCESSFUL || it == DownloadManager.STATUS_FAILED }
+                // Map to our model
+                .flatMap { status ->
+                    when (status) {
+                        DownloadManager.STATUS_PENDING -> Observable.just(InstallStep.Pending)
+                        DownloadManager.STATUS_RUNNING -> Observable.just(InstallStep.Downloading)
+                        else -> Observable.empty()
+                    }
+                }
+    }
+
+    /**
+     * Starts an intent to install the extension at the given uri.
+     *
+     * @param uri The uri of the extension to install.
+     */
+    fun installApk(downloadId: Long, uri: Uri) {
+        val intent = Intent(context, ExtensionInstallActivity::class.java)
+                .setDataAndType(uri, APK_MIME)
+                .putExtra(EXTRA_DOWNLOAD_ID, downloadId)
+                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_GRANT_READ_URI_PERMISSION)
+
+        context.startActivity(intent)
+    }
+
+    /**
+     * Starts an intent to uninstall the extension by the given package name.
+     *
+     * @param pkgName The package name of the extension to uninstall
+     */
+    fun uninstallApk(pkgName: String) {
+        val packageUri = Uri.parse("package:$pkgName")
+        val intent = Intent(Intent.ACTION_UNINSTALL_PACKAGE, packageUri)
+                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+
+        context.startActivity(intent)
+    }
+
+    /**
+     * Sets the result of the installation of an extension.
+     *
+     * @param downloadId The id of the download.
+     * @param result Whether the extension was installed or not.
+     */
+    fun setInstallationResult(downloadId: Long, result: Boolean) {
+        val step = if (result) InstallStep.Installed else InstallStep.Error
+        downloadsRelay.call(downloadId to step)
+    }
+
+    /**
+     * Deletes the download for the given package name.
+     *
+     * @param pkgName The package name of the download to delete.
+     */
+    fun deleteDownload(pkgName: String) {
+        val downloadId = activeDownloads.remove(pkgName)
+        if (downloadId != null) {
+            downloadManager.remove(downloadId)
+        }
+        if (activeDownloads.isEmpty()) {
+            downloadReceiver.unregister()
+        }
+    }
+
+    /**
+     * Receiver that listens to download status events.
+     */
+    private inner class DownloadCompletionReceiver : BroadcastReceiver() {
+
+        /**
+         * Whether this receiver is currently registered.
+         */
+        private var isRegistered = false
+
+        /**
+         * Registers this receiver if it's not already.
+         */
+        fun register() {
+            if (isRegistered) return
+            isRegistered = true
+
+            val filter = IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
+            context.registerReceiver(this, filter)
+        }
+
+        /**
+         * Unregisters this receiver if it's not already.
+         */
+        fun unregister() {
+            if (!isRegistered) return
+            isRegistered = false
+
+            context.unregisterReceiver(this)
+        }
+
+        /**
+         * Called when a download event is received. It looks for the download in the current active
+         * downloads and notifies its installation step.
+         */
+        override fun onReceive(context: Context, intent: Intent?) {
+            val id = intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, 0) ?: return
+
+            // Avoid events for downloads we didn't request
+            if (id !in activeDownloads.values) return
+
+            val uri = downloadManager.getUriForDownloadedFile(id)
+
+            // Set next installation step
+            if (uri != null) {
+                downloadsRelay.call(id to InstallStep.Installing)
+            } else {
+                Timber.e("Couldn't locate downloaded APK")
+                downloadsRelay.call(id to InstallStep.Error)
+                return
+            }
+
+            // Due to a bug in Android versions prior to N, the installer can't open files that do
+            // not contain the extension in the path, even if you specify the correct MIME.
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+                val query = DownloadManager.Query().setFilterById(id)
+                downloadManager.query(query).use { cursor ->
+                    if (cursor.moveToFirst()) {
+                        @Suppress("DEPRECATION")
+                        val uriCompat = File(cursor.getString(cursor.getColumnIndex(
+                                DownloadManager.COLUMN_LOCAL_FILENAME))).getUriCompat(context)
+                        installApk(id, uriCompat)
+                    }
+                }
+            } else {
+                installApk(id, uri)
+            }
+        }
+    }
+
+    companion object {
+        const val APK_MIME = "application/vnd.android.package-archive"
+        const val EXTRA_DOWNLOAD_ID = "ExtensionInstaller.extra.DOWNLOAD_ID"
+    }
+
+}

app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt

@@ -0,0 +1,183 @@
+package eu.kanade.tachiyomi.extension.util
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import dalvik.system.PathClassLoader
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.data.preference.getOrDefault
+import eu.kanade.tachiyomi.extension.model.Extension
+import eu.kanade.tachiyomi.extension.model.LoadResult
+import eu.kanade.tachiyomi.source.CatalogueSource
+import eu.kanade.tachiyomi.source.Source
+import eu.kanade.tachiyomi.source.SourceFactory
+import eu.kanade.tachiyomi.util.Hash
+import kotlinx.coroutines.experimental.async
+import kotlinx.coroutines.experimental.runBlocking
+import timber.log.Timber
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+/**
+ * Class that handles the loading of the extensions installed in the system.
+ */
+@SuppressLint("PackageManagerGetSignatures")
+internal object ExtensionLoader {
+
+    private const val EXTENSION_FEATURE = "tachiyomi.extension"
+    private const val METADATA_SOURCE_CLASS = "tachiyomi.extension.class"
+    private const val LIB_VERSION_MIN = 1
+    private const val LIB_VERSION_MAX = 1
+
+    private const val PACKAGE_FLAGS = PackageManager.GET_CONFIGURATIONS or PackageManager.GET_SIGNATURES
+
+    /**
+     * List of the trusted signatures.
+     */
+    var trustedSignatures = mutableSetOf<String>() +
+            Injekt.get<PreferencesHelper>().trustedSignatures().getOrDefault() +
+            // inorichi's key
+            "7ce04da7773d41b489f4693a366c36bcd0a11fc39b547168553c285bd7348e23"
+
+    /**
+     * Return a list of all the installed extensions initialized concurrently.
+     *
+     * @param context The application context.
+     */
+    fun loadExtensions(context: Context): List<LoadResult> {
+        val pkgManager = context.packageManager
+        val installedPkgs = pkgManager.getInstalledPackages(PACKAGE_FLAGS)
+        val extPkgs = installedPkgs.filter { isPackageAnExtension(it) }
+
+        if (extPkgs.isEmpty()) return emptyList()
+
+        // Load each extension concurrently and wait for completion
+        return runBlocking {
+            val deferred = extPkgs.map {
+                async { loadExtension(context, it.packageName, it) }
+            }
+            deferred.map { it.await() }
+        }
+    }
+
+    /**
+     * Attempts to load an extension from the given package name. It checks if the extension
+     * contains the required feature flag before trying to load it.
+     */
+    fun loadExtensionFromPkgName(context: Context, pkgName: String): LoadResult {
+        val pkgInfo = try {
+            context.packageManager.getPackageInfo(pkgName, PACKAGE_FLAGS)
+        } catch (error: PackageManager.NameNotFoundException) {
+            // Unlikely, but the package may have been uninstalled at this point
+            return LoadResult.Error(error)
+        }
+        if (!isPackageAnExtension(pkgInfo)) {
+            return LoadResult.Error("Tried to load a package that wasn't a extension")
+        }
+        return loadExtension(context, pkgName, pkgInfo)
+    }
+
+    /**
+     * Loads an extension given its package name.
+     *
+     * @param context The application context.
+     * @param pkgName The package name of the extension to load.
+     * @param pkgInfo The package info of the extension.
+     */
+    private fun loadExtension(context: Context, pkgName: String, pkgInfo: PackageInfo): LoadResult {
+        val pkgManager = context.packageManager
+
+        val appInfo = try {
+            pkgManager.getApplicationInfo(pkgName, PackageManager.GET_META_DATA)
+        } catch (error: PackageManager.NameNotFoundException) {
+            // Unlikely, but the package may have been uninstalled at this point
+            return LoadResult.Error(error)
+        }
+
+        val extName = pkgManager.getApplicationLabel(appInfo)?.toString()
+            .orEmpty().substringAfter("Tachiyomi: ")
+        val versionName = pkgInfo.versionName
+        val versionCode = pkgInfo.versionCode
+
+        // Validate lib version
+        val majorLibVersion = versionName.substringBefore('.').toInt()
+        if (majorLibVersion < LIB_VERSION_MIN || majorLibVersion > LIB_VERSION_MAX) {
+            val exception = Exception("Lib version is $majorLibVersion, while only versions " +
+                    "$LIB_VERSION_MIN to $LIB_VERSION_MAX are allowed")
+            Timber.w(exception)
+            return LoadResult.Error(exception)
+        }
+
+        val signatureHash = getSignatureHash(pkgInfo)
+
+        if (signatureHash == null) {
+            return LoadResult.Error("Package $pkgName isn't signed")
+        } else if (signatureHash !in trustedSignatures) {
+            val extension = Extension.Untrusted(extName, pkgName, versionName, versionCode, signatureHash)
+            Timber.w("Extension $pkgName isn't trusted")
+            return LoadResult.Untrusted(extension)
+        }
+
+        val classLoader = PathClassLoader(appInfo.sourceDir, null, context.classLoader)
+
+        val sources = appInfo.metaData.getString(METADATA_SOURCE_CLASS)
+                .split(";")
+                .map {
+                    val sourceClass = it.trim()
+                    if (sourceClass.startsWith("."))
+                        pkgInfo.packageName + sourceClass
+                    else
+                        sourceClass
+                }
+                .flatMap {
+                    try {
+                        val obj = Class.forName(it, false, classLoader).newInstance()
+                        when (obj) {
+                            is Source -> listOf(obj)
+                            is SourceFactory -> obj.createSources()
+                            else -> throw Exception("Unknown source class type! ${obj.javaClass}")
+                        }
+                    } catch (e: Throwable) {
+                        Timber.e(e, "Extension load error: $extName.")
+                        return LoadResult.Error(e)
+                    }
+                }
+        val langs = sources.filterIsInstance<CatalogueSource>()
+                .map { it.lang }
+                .toSet()
+
+        val lang = when (langs.size) {
+            0 -> ""
+            1 -> langs.first()
+            else -> "all"
+        }
+
+        val extension = Extension.Installed(extName, pkgName, versionName, versionCode, sources, lang)
+        return LoadResult.Success(extension)
+    }
+
+    /**
+     * Returns true if the given package is an extension.
+     *
+     * @param pkgInfo The package info of the application.
+     */
+    private fun isPackageAnExtension(pkgInfo: PackageInfo): Boolean {
+        return pkgInfo.reqFeatures.orEmpty().any { it.name == EXTENSION_FEATURE }
+    }
+
+    /**
+     * Returns the signature hash of the package or null if it's not signed.
+     *
+     * @param pkgInfo The package info of the application.
+     */
+    private fun getSignatureHash(pkgInfo: PackageInfo): String? {
+        val signatures = pkgInfo.signatures
+        return if (signatures != null && !signatures.isEmpty()) {
+            Hash.sha256(signatures.first().toByteArray())
+        } else {
+            null
+        }
+    }
+
+}

app/src/main/java/eu/kanade/tachiyomi/network/CloudflareInterceptor.kt

@@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi.network
 
 import com.squareup.duktape.Duktape
+import okhttp3.CacheControl
 import okhttp3.HttpUrl
 import okhttp3.Interceptor
 import okhttp3.Request
@@ -21,7 +22,7 @@ class CloudflareInterceptor : Interceptor {
         val response = chain.proceed(chain.request())
 
         // Check if Cloudflare anti-bot is on
-        if (response.code() == 503 && serverCheck.contains(response.header("Server"))) {
+        if (response.code() == 503 && response.header("Server") in serverCheck) {
             return chain.proceed(resolveChallenge(response))
         }
 
@@ -43,32 +44,33 @@ class CloudflareInterceptor : Interceptor {
             val pass = passPattern.find(content)?.groups?.get(1)?.value
 
             if (operation == null || challenge == null || pass == null) {
-                throw RuntimeException("Failed resolving Cloudflare challenge")
+                throw Exception("Failed resolving Cloudflare challenge")
             }
 
             val js = operation
-                    .replace(Regex("""a\.value =(.+?) \+.*"""), "$1")
+                    .replace(Regex("""a\.value = (.+ \+ t\.length).+"""), "$1")
                     .replace(Regex("""\s{3,}[a-z](?: = |\.).+"""), "")
+                    .replace("t.length", "${domain.length}")
                     .replace("\n", "")
 
-            val result = (duktape.evaluate(js) as Double).toInt()
-
-            val answer = "${result + domain.length}"
+            val result = duktape.evaluate(js) as Double
 
             val cloudflareUrl = HttpUrl.parse("${url.scheme()}://$domain/cdn-cgi/l/chk_jschl")!!
                     .newBuilder()
                     .addQueryParameter("jschl_vc", challenge)
                     .addQueryParameter("pass", pass)
-                    .addQueryParameter("jschl_answer", answer)
+                    .addQueryParameter("jschl_answer", "$result")
                     .toString()
 
             val cloudflareHeaders = originalRequest.headers()
                     .newBuilder()
                     .add("Referer", url.toString())
+                    .add("Accept", "text/html,application/xhtml+xml,application/xml")
+                    .add("Accept-Language", "en")
                     .build()
 
-            return GET(cloudflareUrl, cloudflareHeaders)
+            return GET(cloudflareUrl, cloudflareHeaders, cache = CacheControl.Builder().build())
         }
     }
 
-}
+}

app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt

@@ -1,9 +1,25 @@
 package eu.kanade.tachiyomi.network
 
 import android.content.Context
+import android.os.Build
 import okhttp3.Cache
+import okhttp3.CipherSuite
+import okhttp3.ConnectionSpec
 import okhttp3.OkHttpClient
+import okhttp3.TlsVersion
 import java.io.File
+import java.io.IOException
+import java.net.InetAddress
+import java.net.Socket
+import java.net.UnknownHostException
+import java.security.KeyManagementException
+import java.security.KeyStore
+import java.security.NoSuchAlgorithmException
+import javax.net.ssl.SSLContext
+import javax.net.ssl.SSLSocket
+import javax.net.ssl.SSLSocketFactory
+import javax.net.ssl.TrustManagerFactory
+import javax.net.ssl.X509TrustManager
 
 class NetworkHelper(context: Context) {
 
@@ -16,6 +32,7 @@ class NetworkHelper(context: Context) {
     val client = OkHttpClient.Builder()
             .cookieJar(cookieManager)
             .cache(Cache(cacheDir, cacheSize))
+            .enableTLS12()
             .build()
 
     val cloudflareClient = client.newBuilder()
@@ -25,4 +42,87 @@ class NetworkHelper(context: Context) {
     val cookies: PersistentCookieStore
         get() = cookieManager.store
 
+    private fun OkHttpClient.Builder.enableTLS12(): OkHttpClient.Builder {
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) {
+            return this
+        }
+
+        val trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
+        trustManagerFactory.init(null as KeyStore?)
+        val trustManagers = trustManagerFactory.trustManagers
+        if (trustManagers.size == 1 && trustManagers[0] is X509TrustManager) {
+            class TLSSocketFactory @Throws(KeyManagementException::class, NoSuchAlgorithmException::class)
+            constructor() : SSLSocketFactory() {
+
+                private val internalSSLSocketFactory: SSLSocketFactory
+
+                init {
+                    val context = SSLContext.getInstance("TLS")
+                    context.init(null, null, null)
+                    internalSSLSocketFactory = context.socketFactory
+                }
+
+                override fun getDefaultCipherSuites(): Array<String> {
+                    return internalSSLSocketFactory.defaultCipherSuites
+                }
+
+                override fun getSupportedCipherSuites(): Array<String> {
+                    return internalSSLSocketFactory.supportedCipherSuites
+                }
+
+                @Throws(IOException::class)
+                override fun createSocket(): Socket? {
+                    return enableTLSOnSocket(internalSSLSocketFactory.createSocket())
+                }
+
+                @Throws(IOException::class)
+                override fun createSocket(s: Socket, host: String, port: Int, autoClose: Boolean): Socket? {
+                    return enableTLSOnSocket(internalSSLSocketFactory.createSocket(s, host, port, autoClose))
+                }
+
+                @Throws(IOException::class, UnknownHostException::class)
+                override fun createSocket(host: String, port: Int): Socket? {
+                    return enableTLSOnSocket(internalSSLSocketFactory.createSocket(host, port))
+                }
+
+                @Throws(IOException::class, UnknownHostException::class)
+                override fun createSocket(host: String, port: Int, localHost: InetAddress, localPort: Int): Socket? {
+                    return enableTLSOnSocket(internalSSLSocketFactory.createSocket(host, port, localHost, localPort))
+                }
+
+                @Throws(IOException::class)
+                override fun createSocket(host: InetAddress, port: Int): Socket? {
+                    return enableTLSOnSocket(internalSSLSocketFactory.createSocket(host, port))
+                }
+
+                @Throws(IOException::class)
+                override fun createSocket(address: InetAddress, port: Int, localAddress: InetAddress, localPort: Int): Socket? {
+                    return enableTLSOnSocket(internalSSLSocketFactory.createSocket(address, port, localAddress, localPort))
+                }
+
+                private fun enableTLSOnSocket(socket: Socket?): Socket? {
+                    if (socket != null && socket is SSLSocket) {
+                        socket.enabledProtocols = socket.supportedProtocols
+                    }
+                    return socket
+                }
+            }
+
+            sslSocketFactory(TLSSocketFactory(), trustManagers[0] as X509TrustManager)
+        }
+
+        val specCompat = ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
+            .tlsVersions(TlsVersion.TLS_1_2, TlsVersion.TLS_1_1, TlsVersion.TLS_1_0)
+            .cipherSuites(
+                    *ConnectionSpec.MODERN_TLS.cipherSuites().orEmpty().toTypedArray(),
+                    CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+                    CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
+            )
+            .build()
+
+        val specs = listOf(specCompat, ConnectionSpec.CLEARTEXT)
+        connectionSpecs(specs)
+
+        return this
+    }
 }

app/src/main/java/eu/kanade/tachiyomi/source/ConfigurableSource.kt

@@ -0,0 +1,8 @@
+package eu.kanade.tachiyomi.source
+
+import android.support.v7.preference.PreferenceScreen
+
+interface ConfigurableSource : Source {
+
+    fun setupPreferenceScreen(screen: PreferenceScreen)
+}

app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt

@@ -1,30 +1,19 @@
 package eu.kanade.tachiyomi.source
 
-import android.Manifest.permission.READ_EXTERNAL_STORAGE
 import android.content.Context
-import android.content.pm.ApplicationInfo
-import android.content.pm.PackageManager
-import android.os.Environment
-import dalvik.system.PathClassLoader
-import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.source.online.HttpSource
-import eu.kanade.tachiyomi.source.online.YamlHttpSource
 import eu.kanade.tachiyomi.source.online.english.*
 import eu.kanade.tachiyomi.source.online.german.WieManga
 import eu.kanade.tachiyomi.source.online.russian.Mangachan
 import eu.kanade.tachiyomi.source.online.russian.Mintmanga
 import eu.kanade.tachiyomi.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 = mutableMapOf<Long, Source>()
 
     init {
-        createSources()
+        createInternalSources().forEach { registerSource(it) }
     }
 
     open fun get(sourceKey: Long): Source? {
@@ -35,18 +24,16 @@ open class SourceManager(private val context: Context) {
 
     fun getCatalogueSources() = sourcesMap.values.filterIsInstance<CatalogueSource>()
 
-    private fun createSources() {
-        createExtensionSources().forEach { registerSource(it) }
-        createYamlSources().forEach { registerSource(it) }
-        createInternalSources().forEach { registerSource(it) }
-    }
-
-    private fun registerSource(source: Source, overwrite: Boolean = false) {
+    internal fun registerSource(source: Source, overwrite: Boolean = false) {
         if (overwrite || !sourcesMap.containsKey(source.id)) {
             sourcesMap.put(source.id, source)
         }
     }
 
+    internal fun unregisterSource(source: Source) {
+        sourcesMap.remove(source.id)
+    }
+
     private fun createInternalSources(): List<Source> = listOf(
             LocalSource(context),
             Batoto(),
@@ -60,92 +47,4 @@ open class SourceManager(private val context: Context) {
             Mangasee(),
             WieManga()
     )
-
-    private fun createYamlSources(): List<Source> {
-        val sources = mutableListOf<Source>()
-
-        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) }
-                    sources.add(YamlHttpSource(map))
-                } catch (e: Exception) {
-                    Timber.e("Error loading source from file. Bad format?", e)
-                }
-            }
-        }
-        return sources
-    }
-
-    private fun createExtensionSources(): List<Source> {
-        val pkgManager = context.packageManager
-        val flags = PackageManager.GET_CONFIGURATIONS or PackageManager.GET_SIGNATURES
-        val installedPkgs = pkgManager.getInstalledPackages(flags)
-        val extPkgs = installedPkgs.filter { it.reqFeatures.orEmpty().any { it.name == EXTENSION_FEATURE } }
-
-        val sources = mutableListOf<Source>()
-        for (pkgInfo in extPkgs) {
-            val appInfo = pkgManager.getApplicationInfo(pkgInfo.packageName,
-                    PackageManager.GET_META_DATA) ?: continue
-
-            val extName = pkgManager.getApplicationLabel(appInfo).toString()
-                    .substringAfter("Tachiyomi: ")
-            val version = pkgInfo.versionName
-            val sourceClasses = appInfo.metaData.getString(METADATA_SOURCE_CLASS)
-                    .split(";")
-                    .map {
-                        val sourceClass = it.trim()
-                        if(sourceClass.startsWith("."))
-                            pkgInfo.packageName + sourceClass
-                        else
-                            sourceClass
-                    }
-
-            val extension = Extension(extName, appInfo, version, sourceClasses)
-            try {
-                sources += loadExtension(extension)
-            } catch (e: Exception) {
-                Timber.e("Extension load error: $extName.", e)
-            } catch (e: LinkageError) {
-                Timber.e("Extension load error: $extName.", e)
-            }
-        }
-        return sources
-    }
-
-    private fun loadExtension(ext: Extension): List<Source> {
-        // Validate lib version
-        val majorLibVersion = ext.version.substringBefore('.').toInt()
-        if (majorLibVersion < LIB_VERSION_MIN || majorLibVersion > LIB_VERSION_MAX) {
-            throw Exception("Lib version is $majorLibVersion, while only versions "
-                    + "$LIB_VERSION_MIN to $LIB_VERSION_MAX are allowed")
-        }
-
-        val classLoader = PathClassLoader(ext.appInfo.sourceDir, null, context.classLoader)
-        return ext.sourceClasses.flatMap {
-            val obj = Class.forName(it, false, classLoader).newInstance()
-            when(obj) {
-                is Source -> listOf(obj)
-                is SourceFactory -> obj.createSources()
-                else -> throw Exception("Unknown source class type!")
-            }
-        }
-    }
-
-    class Extension(val name: String,
-                    val appInfo: ApplicationInfo,
-                    val version: String,
-                    val sourceClasses: List<String>)
-
-    private companion object {
-        const val EXTENSION_FEATURE = "tachiyomi.extension"
-        const val METADATA_SOURCE_CLASS = "tachiyomi.extension.class"
-        const val LIB_VERSION_MIN = 1
-        const val LIB_VERSION_MAX = 1
-    }
-
 }

app/src/main/java/eu/kanade/tachiyomi/source/online/HttpSource.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.source.online
 
-import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.network.asObservableSuccess
@@ -28,10 +27,12 @@ abstract class HttpSource : CatalogueSource {
      */
     protected val network: NetworkHelper by injectLazy()
 
-    /**
-     * Preferences helper.
-     */
-    protected val preferences: PreferencesHelper by injectLazy()
+//    /**
+//     * Preferences that a source may need.
+//     */
+//    val preferences: SharedPreferences by lazy {
+//        Injekt.get<Application>().getSharedPreferences("source_$id", Context.MODE_PRIVATE)
+//    }
 
     /**
      * Base url of the website without the trailing slash, like: http://mysite.com

app/src/main/java/eu/kanade/tachiyomi/source/online/YamlHttpSource.kt

@@ -1,231 +0,0 @@
-package eu.kanade.tachiyomi.source.online
-
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.source.model.*
-import eu.kanade.tachiyomi.util.asJsoup
-import eu.kanade.tachiyomi.util.attrOrText
-import okhttp3.Request
-import okhttp3.Response
-import org.jsoup.Jsoup
-import org.jsoup.nodes.Element
-import java.text.SimpleDateFormat
-import java.util.*
-
-class YamlHttpSource(mappings: Map<*, *>) : HttpSource() {
-
-    val map = YamlSourceNode(mappings)
-
-    override val name: String
-        get() = map.name
-
-    override val baseUrl = map.host.let {
-        if (it.endsWith("/")) it.dropLast(1) else it
-    }
-
-    override val lang = map.lang.toLowerCase()
-
-    override val supportsLatest = map.latestupdates != null
-
-    override val client = when (map.client) {
-        "cloudflare" -> network.cloudflareClient
-        else -> network.client
-    }
-
-    override val id = map.id.let {
-        (it as? Int ?: (lang.toUpperCase().hashCode() + 31 * it.hashCode()) and 0x7fffffff).toLong()
-    }
-
-    // Ugly, but needed after the changes
-    var popularNextPage: String? = null
-    var searchNextPage: String? = null
-    var latestNextPage: String? = null
-
-    override fun popularMangaRequest(page: Int): Request {
-        val url = if (page == 1) {
-            popularNextPage = null
-            map.popular.url
-        } else {
-            popularNextPage!!
-        }
-        return when (map.popular.method?.toLowerCase()) {
-            "post" -> POST(url, headers, map.popular.createForm())
-            else -> GET(url, headers)
-        }
-    }
-
-    override fun popularMangaParse(response: Response): MangasPage {
-        val document = response.asJsoup()
-
-        val mangas = document.select(map.popular.manga_css).map { element ->
-            SManga.create().apply {
-                title = element.text()
-                setUrlWithoutDomain(element.attr("href"))
-            }
-        }
-
-        popularNextPage = map.popular.next_url_css?.let { selector ->
-             document.select(selector).first()?.absUrl("href")
-        }
-
-        return MangasPage(mangas, popularNextPage != null)
-    }
-
-    override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = if (page == 1) {
-            searchNextPage = null
-            map.search.url.replace("\$query", query)
-        } else {
-            searchNextPage!!
-        }
-        return when (map.search.method?.toLowerCase()) {
-            "post" -> POST(url, headers, map.search.createForm())
-            else -> GET(url, headers)
-        }
-    }
-
-    override fun searchMangaParse(response: Response): MangasPage {
-        val document = response.asJsoup()
-
-        val mangas = document.select(map.search.manga_css).map { element ->
-            SManga.create().apply {
-                title = element.text()
-                setUrlWithoutDomain(element.attr("href"))
-            }
-        }
-
-        searchNextPage = map.search.next_url_css?.let { selector ->
-            document.select(selector).first()?.absUrl("href")
-        }
-
-        return MangasPage(mangas, searchNextPage != null)
-    }
-
-    override fun latestUpdatesRequest(page: Int): Request {
-        val url = if (page == 1) {
-            latestNextPage = null
-            map.latestupdates!!.url
-        } else {
-            latestNextPage!!
-        }
-        return when (map.latestupdates!!.method?.toLowerCase()) {
-            "post" -> POST(url, headers, map.latestupdates.createForm())
-            else -> GET(url, headers)
-        }
-    }
-
-    override fun latestUpdatesParse(response: Response): MangasPage {
-        val document = response.asJsoup()
-
-        val mangas = document.select(map.latestupdates!!.manga_css).map { element ->
-            SManga.create().apply {
-                title = element.text()
-                setUrlWithoutDomain(element.attr("href"))
-            }
-        }
-
-        popularNextPage = map.latestupdates.next_url_css?.let { selector ->
-            document.select(selector).first()?.absUrl("href")
-        }
-
-        return MangasPage(mangas, popularNextPage != null)
-    }
-
-    override fun mangaDetailsParse(response: Response): SManga {
-        val document = response.asJsoup()
-
-        val manga = SManga.create()
-        with(map.manga) {
-            val pool = parts.get(document)
-
-            manga.author = author?.process(document, pool)
-            manga.artist = artist?.process(document, pool)
-            manga.description = summary?.process(document, pool)
-            manga.thumbnail_url = cover?.process(document, pool)
-            manga.genre = genres?.process(document, pool)
-            manga.status = status?.getStatus(document, pool) ?: SManga.UNKNOWN
-        }
-        return manga
-    }
-
-    override fun chapterListParse(response: Response): List<SChapter> {
-        val document = response.asJsoup()
-
-        val chapters = mutableListOf<SChapter>()
-        with(map.chapters) {
-            val pool = emptyMap<String, Element>()
-            val dateFormat = SimpleDateFormat(date?.format, Locale.ENGLISH)
-
-            for (element in document.select(chapter_css)) {
-                val chapter = SChapter.create()
-                element.select(title).first().let {
-                    chapter.name = it.text()
-                    chapter.setUrlWithoutDomain(it.attr("href"))
-                }
-                val dateElement = element.select(date?.select).first()
-                chapter.date_upload = date?.getDate(dateElement, pool, dateFormat)?.time ?: 0
-                chapters.add(chapter)
-            }
-        }
-        return chapters
-    }
-
-    override fun pageListParse(response: Response): List<Page> {
-        val body = response.body()!!.string()
-        val url = response.request().url().toString()
-
-        val pages = mutableListOf<Page>()
-
-        val document by lazy { Jsoup.parse(body, url) }
-
-        with(map.pages) {
-            // Capture a list of values where page urls will be resolved.
-            val capturedPages = if (pages_regex != null)
-                pages_regex!!.toRegex().findAll(body).map { it.value }.toList()
-            else if (pages_css != null)
-                document.select(pages_css).map { it.attrOrText(pages_attr!!) }
-            else
-                null
-
-            // For each captured value, obtain the url and create a new page.
-            capturedPages?.forEach { value ->
-                // If the captured value isn't an url, we have to use replaces with the chapter url.
-                val pageUrl = if (replace != null && replacement != null)
-                    url.replace(replace!!.toRegex(), replacement!!.replace("\$value", value))
-                else
-                    value
-
-                pages.add(Page(pages.size, pageUrl))
-            }
-
-            // Capture a list of images.
-            val capturedImages = if (image_regex != null)
-                image_regex!!.toRegex().findAll(body).map { it.groups[1]?.value }.toList()
-            else if (image_css != null)
-                document.select(image_css).map { it.absUrl(image_attr) }
-            else
-                null
-
-            // Assign the image url to each page
-            capturedImages?.forEachIndexed { i, url ->
-                val page = pages.getOrElse(i) { Page(i, "").apply { pages.add(this) } }
-                page.imageUrl = url
-            }
-        }
-        return pages
-    }
-
-    override fun imageUrlParse(response: Response): String {
-        val body = response.body()!!.string()
-        val url = response.request().url().toString()
-
-        with(map.pages) {
-            return if (image_regex != null)
-                image_regex!!.toRegex().find(body)!!.groups[1]!!.value
-            else if (image_css != null)
-                Jsoup.parse(body, url).select(image_css).first().absUrl(image_attr)
-            else
-                throw Exception("image_regex and image_css are null")
-        }
-    }
-}

app/src/main/java/eu/kanade/tachiyomi/source/online/YamlHttpSourceMappings.kt

@@ -1,234 +0,0 @@
-@file:Suppress("UNCHECKED_CAST")
-
-package eu.kanade.tachiyomi.source.online
-
-import eu.kanade.tachiyomi.source.model.SManga
-import okhttp3.FormBody
-import okhttp3.RequestBody
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import java.text.ParseException
-import java.text.SimpleDateFormat
-import java.util.*
-
-private fun toMap(map: Any?) = map as? Map<String, Any?>
-
-class YamlSourceNode(uncheckedMap: Map<*, *>) {
-
-    val map = toMap(uncheckedMap)!!
-
-    val id: Any by map
-
-    val name: String by map
-
-    val host: String by map
-
-    val lang: String by map
-
-    val client: String?
-        get() = map["client"] as? String
-
-    val popular = PopularNode(toMap(map["popular"])!!)
-
-    val latestupdates = toMap(map["latest_updates"])?.let { LatestUpdatesNode(it) }
-
-    val search = SearchNode(toMap(map["search"])!!)
-
-    val manga = MangaNode(toMap(map["manga"])!!)
-
-    val chapters = ChaptersNode(toMap(map["chapters"])!!)
-
-    val pages = PagesNode(toMap(map["pages"])!!)
-}
-
-interface RequestableNode {
-
-    val map: Map<String, Any?>
-
-    val url: String
-        get() = map["url"] as String
-
-    val method: String?
-        get() = map["method"] as? String
-
-    val payload: Map<String, String>?
-        get() = map["payload"] as? Map<String, String>
-
-    fun createForm(): RequestBody {
-        return FormBody.Builder().apply {
-            payload?.let {
-                for ((key, value) in it) {
-                    add(key, value)
-                }
-            }
-        }.build()
-    }
-
-}
-
-class PopularNode(override val map: Map<String, Any?>): RequestableNode {
-
-    val manga_css: String by map
-
-    val next_url_css: String?
-        get() = map["next_url_css"] as? String
-
-}
-
-
-class LatestUpdatesNode(override val map: Map<String, Any?>): RequestableNode {
-
-    val manga_css: String by map
-
-    val next_url_css: String?
-        get() = map["next_url_css"] as? String
-
-}
-
-
-class SearchNode(override val map: Map<String, Any?>): RequestableNode {
-
-    val manga_css: String by map
-
-    val next_url_css: String?
-        get() = map["next_url_css"] as? String
-}
-
-class MangaNode(private val map: Map<String, Any?>) {
-
-    val parts = CacheNode(toMap(map["parts"]) ?: emptyMap())
-
-    val artist = toMap(map["artist"])?.let { SelectableNode(it) }
-
-    val author = toMap(map["author"])?.let { SelectableNode(it) }
-
-    val summary = toMap(map["summary"])?.let { SelectableNode(it) }
-
-    val status = toMap(map["status"])?.let { StatusNode(it) }
-
-    val genres = toMap(map["genres"])?.let { SelectableNode(it) }
-
-    val cover = toMap(map["cover"])?.let { CoverNode(it) }
-
-}
-
-class ChaptersNode(private val map: Map<String, Any?>) {
-
-    val chapter_css: String by map
-
-    val title: String by map
-
-    val date = toMap(toMap(map["date"]))?.let { DateNode(it) }
-}
-
-class CacheNode(private val map: Map<String, Any?>) {
-
-    fun get(document: Document) = map.mapValues { document.select(it.value as String).first() }
-}
-
-open class SelectableNode(private val map: Map<String, Any?>) {
-
-    val select: String by map
-
-    val from: String?
-        get() = map["from"] as? String
-
-    open val attr: String?
-        get() = map["attr"] as? String
-
-    val capture: String?
-        get() = map["capture"] as? String
-
-    fun process(document: Element, cache: Map<String, Element>): String {
-        val parent = from?.let { cache[it] } ?: document
-        val node = parent.select(select).first()
-        var text = attr?.let { node.attr(it) } ?: node.text()
-        capture?.let {
-            text = Regex(it).find(text)?.groupValues?.get(1) ?: text
-        }
-        return text
-    }
-}
-
-class StatusNode(private val map: Map<String, Any?>) : SelectableNode(map) {
-
-    val complete: String?
-        get() = map["complete"] as? String
-
-    val ongoing: String?
-        get() = map["ongoing"] as? String
-
-    val licensed: String?
-        get() = map["licensed"] as? String
-
-    fun getStatus(document: Element, cache: Map<String, Element>): Int {
-        val text = process(document, cache)
-        complete?.let {
-            if (text.contains(it)) return SManga.COMPLETED
-        }
-        ongoing?.let {
-            if (text.contains(it)) return SManga.ONGOING
-        }
-        licensed?.let {
-            if (text.contains(it)) return SManga.LICENSED
-        }
-        return SManga.UNKNOWN
-    }
-}
-
-class CoverNode(private val map: Map<String, Any?>) : SelectableNode(map) {
-
-    override val attr: String?
-        get() = map["attr"] as? String ?: "src"
-}
-
-class DateNode(private val map: Map<String, Any?>) : SelectableNode(map) {
-
-    val format: String by map
-
-    fun getDate(document: Element, cache: Map<String, Element>, formatter: SimpleDateFormat): Date {
-        val text = process(document, cache)
-        try {
-            return formatter.parse(text)
-        } catch (exception: ParseException) {}
-
-        for (i in 0..7) {
-            (map["day$i"] as? List<String>)?.let {
-                it.find { it.toRegex().containsMatchIn(text) }?.let {
-                    return Calendar.getInstance().apply { add(Calendar.DATE, -i) }.time
-                }
-            }
-        }
-
-        return Date(0)
-    }
-
-}
-
-class PagesNode(private val map: Map<String, Any?>) {
-
-    val pages_regex: String?
-        get() = map["pages_regex"] as? String
-
-    val pages_css: String?
-        get() = map["pages_css"] as? String
-
-    val pages_attr: String?
-        get() = map["pages_attr"] as? String ?: "value"
-
-    val replace: String?
-        get() = map["url_replace"] as? String
-
-    val replacement: String?
-        get() = map["url_replacement"] as? String
-
-    val image_regex: String?
-        get() = map["image_regex"] as? String
-
-    val image_css: String?
-        get() = map["image_css"] as? String
-
-    val image_attr: String
-        get() = map["image_attr"] as? String ?: "src"
-
-}

app/src/main/java/eu/kanade/tachiyomi/source/online/english/Batoto.kt

@@ -1,382 +1,31 @@
 package eu.kanade.tachiyomi.source.online.english
 
-import android.text.Html
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.asObservable
-import eu.kanade.tachiyomi.source.model.*
-import eu.kanade.tachiyomi.source.online.LoginSource
-import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import eu.kanade.tachiyomi.util.asJsoup
-import eu.kanade.tachiyomi.util.selectText
-import okhttp3.FormBody
-import okhttp3.HttpUrl
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
+import eu.kanade.tachiyomi.source.Source
+import eu.kanade.tachiyomi.source.model.Page
+import eu.kanade.tachiyomi.source.model.SChapter
+import eu.kanade.tachiyomi.source.model.SManga
 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 : ParsedHttpSource(), LoginSource {
+class Batoto : Source {
 
     override val id: Long = 1
 
     override val name = "Batoto"
 
-    override val baseUrl = "https://bato.to"
-
-    override val lang = "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 val client: OkHttpClient = network.cloudflareClient
-
-    override fun headersBuilder() = super.headersBuilder()
-            .add("Cookie", "lang_option=English")
-
-    private val pageHeaders = super.headersBuilder()
-            .add("Referer", "$baseUrl/reader")
-            .build()
-
-    override fun popularMangaRequest(page: Int): Request {
-        return GET("$baseUrl/search_ajax?order_cond=views&order=desc&p=$page", headers)
-    }
-
-    override fun latestUpdatesRequest(page: Int): Request {
-        return GET("$baseUrl/search_ajax?order_cond=update&order=desc&p=$page", headers)
-    }
-
-    override fun popularMangaSelector() = "tr:has(a)"
-
-    override fun latestUpdatesSelector() = "tr:has(a)"
-
-    override fun popularMangaFromElement(element: Element): SManga {
-        val manga = SManga.create()
-        element.select("a[href*=bato.to]").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.text().trim()
-        }
-        return manga
-    }
-
-    override fun latestUpdatesFromElement(element: Element): SManga {
-        return popularMangaFromElement(element)
-    }
-
-    override fun popularMangaNextPageSelector() = "#show_more_row"
-
-    override fun latestUpdatesNextPageSelector() = "#show_more_row"
-
-    override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/search_ajax")!!.newBuilder()
-        if (!query.isEmpty()) url.addQueryParameter("name", query).addQueryParameter("name_cond", "c")
-        var genres = ""
-        filters.forEach { filter ->
-            when (filter) {
-                is Status -> if (!filter.isIgnored()) {
-                    url.addQueryParameter("completed", if (filter.isExcluded()) "i" else "c")
-                }
-                is GenreList -> {
-                    filter.state.forEach { filter ->
-                        when (filter) {
-                            is Genre -> if (!filter.isIgnored()) {
-                                genres += (if (filter.isExcluded()) ";e" else ";i") + filter.id
-                            }
-                            is SelectField -> {
-                                val sel = filter.values[filter.state].value
-                                if (!sel.isEmpty()) url.addQueryParameter(filter.key, sel)
-                            }
-                        }
-                    }
-                }
-                is TextField -> {
-                    if (!filter.state.isEmpty()) url.addQueryParameter(filter.key, filter.state)
-                }
-                is SelectField -> {
-                    val sel = filter.values[filter.state].value
-                    if (!sel.isEmpty()) url.addQueryParameter(filter.key, sel)
-                }
-                is Flag -> {
-                    val sel = if (filter.state) filter.valTrue else filter.valFalse
-                    if (!sel.isEmpty()) url.addQueryParameter(filter.key, sel)
-                }
-                is OrderBy -> {
-                    url.addQueryParameter("order_cond", arrayOf("title", "author", "artist", "rating", "views", "update")[filter.state!!.index])
-                    url.addQueryParameter("order", if (filter.state?.ascending == true) "asc" else "desc")
-                }
-            }
-        }
-        if (!genres.isEmpty()) url.addQueryParameter("genres", genres)
-        url.addQueryParameter("p", page.toString())
-        return GET(url.toString(), headers)
-    }
-
-    override fun searchMangaSelector() = popularMangaSelector()
-
-    override fun searchMangaFromElement(element: Element): SManga {
-        return popularMangaFromElement(element)
-    }
-
-    override fun searchMangaNextPageSelector() = popularMangaNextPageSelector()
-
-    override fun mangaDetailsRequest(manga: SManga): Request {
-        val mangaId = manga.url.substringAfterLast("r")
-        return GET("$baseUrl/comic_pop?id=$mangaId", headers)
-    }
-
-    override fun mangaDetailsParse(document: Document): SManga {
-        val tbody = document.select("tbody").first()
-        val artistElement = tbody.select("tr:contains(Author/Artist:)").first()
-
-        val manga = SManga.create()
-        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(", ")
-        return manga
-    }
-
-    private fun parseStatus(status: String?) = when (status) {
-        "Ongoing" -> SManga.ONGOING
-        "Complete" -> SManga.COMPLETED
-        else -> SManga.UNKNOWN
-    }
-
-    override fun chapterListRequest(manga: SManga): Request {
-        // Https is currently very slow. The replace also saves a redirection.
-        var newUrl = "http://bato.to" + manga.url
-        if ("/comic/_/comics/" !in newUrl) {
-            newUrl = newUrl.replace("/comic/_/", "/comic/_/comics/")
-        }
-
-        return super.chapterListRequest(manga).newBuilder()
-                .url(newUrl)
-                .build()
-    }
-
-    override fun chapterListParse(response: Response): List<SChapter> {
-        val body = response.body()!!.string()
-        val matcher = staffNotice.matcher(body)
-        if (matcher.find()) {
-            @Suppress("DEPRECATION")
-            val notice = Html.fromHtml(matcher.group(1)).toString().trim()
-            throw Exception(notice)
-        }
-
-        val document = response.asJsoup(body)
-        return document.select(chapterListSelector()).map { chapterFromElement(it) }
-    }
-
-    override fun chapterListSelector() = "tr.row.lang_English.chapter_row"
-
-    override fun chapterFromElement(element: Element): SChapter {
-        val urlElement = element.select("a[href*=bato.to/reader").first()
-
-        val chapter = SChapter.create()
-        chapter.setUrlWithoutDomain(urlElement.attr("href"))
-        chapter.name = urlElement.text()
-        chapter.date_upload = element.select("td").getOrNull(4)?.let {
-            parseDateFromElement(it)
-        } ?: 0
-        chapter.scanlator = element.select("td").getOrNull(2)?.text()
-        return chapter
-    }
-
-    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: SChapter): Request {
-        val id = chapter.url.substringAfterLast("#")
-        return GET("$baseUrl/areader?id=$id&p=1", pageHeaders)
-    }
-
-    override fun pageListParse(document: Document): List<Page> {
-        val pages = mutableListOf<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")))
-            }
-        }
-        return pages
-    }
-
-    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 fetchMangaDetails(manga: SManga): Observable<SManga> {
+        return Observable.error(Exception("RIP Batoto"))
     }
 
     override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> {
-        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)
-        }
+        return Observable.error(Exception("RIP Batoto"))
     }
 
-    private data class ListValue(val name: String, val value: String) {
-        override fun toString(): String = name
+    override fun fetchPageList(chapter: SChapter): Observable<List<Page>> {
+        return Observable.error(Exception("RIP Batoto"))
     }
 
-    private class Status : Filter.TriState("Completed")
-    private class Genre(name: String, val id: Int) : Filter.TriState(name)
-    private class TextField(name: String, val key: String) : Filter.Text(name)
-    private class SelectField(name: String, val key: String, values: Array<ListValue>, state: Int = 0) : Filter.Select<ListValue>(name, values, state)
-    private class Flag(name: String, val key: String, val valTrue: String, val valFalse: String) : Filter.CheckBox(name)
-    private class GenreList(genres: List<Filter<*>>) : Filter.Group<Filter<*>>("Genres", genres)
-    private class OrderBy : Filter.Sort("Order by",
-            arrayOf("Title", "Author", "Artist", "Rating", "Views", "Last Update"),
-            Filter.Sort.Selection(4, false))
+    override fun toString(): String {
+        return "$name (EN)"
+    }
 
-    override fun getFilterList() = FilterList(
-            TextField("Author", "artist_name"),
-            SelectField("Type", "type", arrayOf(ListValue("Any", ""), ListValue("Manga (Jp)", "jp"), ListValue("Manhwa (Kr)", "kr"), ListValue("Manhua (Cn)", "cn"), ListValue("Artbook", "ar"), ListValue("Other", "ot"))),
-            Status(),
-            Flag("Exclude mature", "mature", "m", ""),
-            OrderBy(),
-            GenreList(getGenreList())
-    )
-
-    // [...document.querySelectorAll("#advanced_options div.genre_buttons")].map((el,i) => {
-    //     const onClick=el.getAttribute('onclick');const id=onClick.substr(14,onClick.length-16);return `Genre("${el.textContent.trim()}", ${id})`
-    // }).join(',\n')
-    // on https://bato.to/search
-    private fun getGenreList() = listOf(
-            SelectField("Inclusion mode", "genre_cond", arrayOf(ListValue("And (all selected genres)", "and"), ListValue("Or (any selected genres) ", "or"))),
-            Genre("4-Koma", 40),
-            Genre("Action", 1),
-            Genre("Adventure", 2),
-            Genre("Award Winning", 39),
-            Genre("Comedy", 3),
-            Genre("Cooking", 41),
-            Genre("Doujinshi", 9),
-            Genre("Drama", 10),
-            Genre("Ecchi", 12),
-            Genre("Fantasy", 13),
-            Genre("Gender Bender", 15),
-            Genre("Harem", 17),
-            Genre("Historical", 20),
-            Genre("Horror", 22),
-            Genre("Josei", 34),
-            Genre("Martial Arts", 27),
-            Genre("Mecha", 30),
-            Genre("Medical", 42),
-            Genre("Music", 37),
-            Genre("Mystery", 4),
-            Genre("Oneshot", 38),
-            Genre("Psychological", 5),
-            Genre("Romance", 6),
-            Genre("School Life", 7),
-            Genre("Sci-fi", 8),
-            Genre("Seinen", 32),
-            Genre("Shoujo", 35),
-            Genre("Shoujo Ai", 16),
-            Genre("Shounen", 33),
-            Genre("Shounen Ai", 19),
-            Genre("Slice of Life", 21),
-            Genre("Smut", 23),
-            Genre("Sports", 25),
-            Genre("Supernatural", 26),
-            Genre("Tragedy", 28),
-            Genre("Webtoon", 36),
-            Genre("Yaoi", 29),
-            Genre("Yuri", 31),
-            Genre("[no chapters]", 44)
-    )
-
-}
+}

app/src/main/java/eu/kanade/tachiyomi/source/online/english/Kissmanga.kt

@@ -226,7 +226,6 @@ class Kissmanga : ParsedHttpSource() {
             Genre("Mystery"),
             Genre("One shot"),
             Genre("Psychological"),
-            Genre("Reincarnation"),
             Genre("Romance"),
             Genre("School Life"),
             Genre("Sci-fi"),
@@ -240,9 +239,7 @@ class Kissmanga : ParsedHttpSource() {
             Genre("Smut"),
             Genre("Sports"),
             Genre("Supernatural"),
-            Genre("Time Travel"),
             Genre("Tragedy"),
-            Genre("Transported"),
             Genre("Webtoon"),
             Genre("Yaoi"),
             Genre("Yuri")

app/src/main/java/eu/kanade/tachiyomi/source/online/english/Mangahere.kt

@@ -21,7 +21,7 @@ class Mangahere : ParsedHttpSource() {
 
     override val name = "Mangahere"
 
-    override val baseUrl = "http://www.mangahere.co"
+    override val baseUrl = "http://www.mangahere.cc"
 
     override val lang = "en"
 
@@ -109,14 +109,21 @@ class Mangahere : ParsedHttpSource() {
     override fun mangaDetailsParse(document: Document): SManga {
         val detailElement = document.select(".manga_detail_top").first()
         val infoElement = detailElement.select(".detail_topText").first()
+        val licensedElement = document.select(".mt10.color_ff00.mb10").first()
 
         val manga = SManga.create()
-        manga.author = infoElement.select("a[href^=//www.mangahere.co/author/]").first()?.text()
-        manga.artist = infoElement.select("a[href^=//www.mangahere.co/artist/]").first()?.text()
+        manga.author = infoElement.select("a[href*=author/]").first()?.text()
+        manga.artist = infoElement.select("a[href*=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")
+
+        if (licensedElement?.text()?.contains("licensed") == true) {
+            manga.status = SManga.LICENSED
+        } else {
+            manga.status = infoElement.select("li:eq(6)").first()?.text().orEmpty().let { parseStatus(it) }
+        }
+
         return manga
     }
 

app/src/main/java/eu/kanade/tachiyomi/source/online/english/Readmangatoday.kt

@@ -17,7 +17,7 @@ class Readmangatoday : ParsedHttpSource() {
 
     override val name = "ReadMangaToday"
 
-    override val baseUrl = "http://www.readmng.com/"
+    override val baseUrl = "https://www.readmng.com"
 
     override val lang = "en"
 
@@ -96,14 +96,19 @@ class Readmangatoday : ParsedHttpSource() {
 
     override fun mangaDetailsParse(document: Document): SManga {
         val detailElement = document.select("div.movie-meta").first()
+        val genreElement = detailElement.select("dl.dl-horizontal > dd:eq(5) a")
 
         val manga = SManga.create()
         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")
+
+        var genres = mutableListOf<String>()
+        genreElement?.forEach { genres.add(it.text()) }
+        manga.genre = genres.joinToString(", ")
+
         return manga
     }
 

app/src/main/java/eu/kanade/tachiyomi/source/online/russian/Mangachan.kt

@@ -49,8 +49,12 @@ class Mangachan : ParsedHttpSource() {
                             }
                         }
                     }
-                    is OrderBy -> { if (filter.state!!.ascending && filter.state!!.index == 0) { statusParam = false } }
-                    is Status ->  status = arrayOf("", "all_done", "end", "ongoing", "new_ch")[filter.state]
+                    is OrderBy -> {
+                        if (filter.state!!.ascending && filter.state!!.index == 0) {
+                            statusParam = false
+                        }
+                    }
+                    is Status -> status = arrayOf("", "all_done", "end", "ongoing", "new_ch")[filter.state]
                 }
             }
 
@@ -103,6 +107,7 @@ class Mangachan : ParsedHttpSource() {
 
     override fun popularMangaFromElement(element: Element): SManga {
         val manga = SManga.create()
+        manga.thumbnail_url = element.select("div.manga_images img").first().attr("src")
         element.select("h2 > a").first().let {
             manga.setUrlWithoutDomain(it.attr("href"))
             manga.title = it.text()
@@ -220,32 +225,22 @@ class Mangachan : ParsedHttpSource() {
             GenreList(getGenreList())
     )
 
-//    private class StatusList(status: List<Status>) : Filter.Group<Status>("Статус", status)
-//    private class Status(name: String, val id: String) : Filter.CheckBox(name, false)
-//    private fun getStatusList() = listOf(
-//        Status("Перевод завершен", "/all_done"),
-//        Status("Выпуск завершен", "/end"),
-//        Status("Онгоинг", "/ongoing"),
-//        Status("Новые главы", "/new_ch")
-//    )
 
-
-    /* [...document.querySelectorAll("li.sidetag > a:nth-child(1)")].map((el,i) =>
-    *  { const link=el.getAttribute('href');const id=link.substr(6,link.length);
-    *  return `Genre("${id.replace("_", " ")}")` }).join(',\n')
+    /* [...document.querySelectorAll("li.sidetag > a:nth-child(1)")]
+    *  .map(el => `Genre("${el.getAttribute('href').substr(6)}")`).join(',\n')
     *  on http://mangachan.me/
     */
     private fun getGenreList() = listOf(
-            Genre("18 плюс"),
+            Genre("18_плюс"),
             Genre("bdsm"),
             Genre("арт"),
             Genre("боевик"),
-            Genre("боевые искусства"),
+            Genre("боевые_искусства"),
             Genre("вампиры"),
             Genre("веб"),
             Genre("гарем"),
-            Genre("гендерная интрига"),
-            Genre("героическое фэнтези"),
+            Genre("гендерная_интрига"),
+            Genre("героическое_фэнтези"),
             Genre("детектив"),
             Genre("дзёсэй"),
             Genre("додзинси"),
@@ -262,13 +257,13 @@ class Mangachan : ParsedHttpSource() {
             Genre("меха"),
             Genre("мистика"),
             Genre("музыка"),
-            Genre("научная фантастика"),
+            Genre("научная_фантастика"),
             Genre("повседневность"),
             Genre("постапокалиптика"),
             Genre("приключения"),
             Genre("психология"),
             Genre("романтика"),
-            Genre("самурайский боевик"),
+            Genre("самурайский_боевик"),
             Genre("сборник"),
             Genre("сверхъестественное"),
             Genre("сказка"),
@@ -279,7 +274,6 @@ class Mangachan : ParsedHttpSource() {
             Genre("сёдзё-ай"),
             Genre("сёнэн"),
             Genre("сёнэн-ай"),
-            Genre("темное фэнтези"),
             Genre("тентакли"),
             Genre("трагедия"),
             Genre("триллер"),

app/src/main/java/eu/kanade/tachiyomi/source/online/russian/Mintmanga.kt

@@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.source.online.russian
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.source.model.*
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
+import okhttp3.Headers
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -29,12 +30,13 @@ class Mintmanga : ParsedHttpSource() {
     override fun latestUpdatesRequest(page: Int): Request =
             GET("$baseUrl/list?sortType=updated&offset=${70 * (page - 1)}&max=70", headers)
 
-    override fun popularMangaSelector() = "div.desc"
+    override fun popularMangaSelector() = "div.tile"
 
-    override fun latestUpdatesSelector() = "div.desc"
+    override fun latestUpdatesSelector() = "div.tile"
 
     override fun popularMangaFromElement(element: Element): SManga {
         val manga = SManga.create()
+        manga.thumbnail_url = element.select("img.lazy").first().attr("data-original")
         element.select("h3 > a").first().let {
             manga.setUrlWithoutDomain(it.attr("href"))
             manga.title = it.attr("title")
@@ -84,10 +86,15 @@ class Mintmanga : ParsedHttpSource() {
 
     override fun chapterFromElement(element: Element): SChapter {
         val urlElement = element.select("a").first()
+        val urlText = urlElement.text()
 
         val chapter = SChapter.create()
-        chapter.setUrlWithoutDomain(urlElement.attr("href") + "?mature=1")
-        chapter.name = urlElement.text().replace(" новое", "")
+        chapter.setUrlWithoutDomain(urlElement.attr("href") + "?mtr=1")
+        if (urlText.endsWith(" новое")) {
+            chapter.name = urlText.dropLast(6)
+        } else {
+            chapter.name = urlText
+        }
         chapter.date_upload = element.select("td:eq(1)").first()?.text()?.let {
             SimpleDateFormat("dd/MM/yy", Locale.US).parse(it).time
         } ?: 0
@@ -137,11 +144,19 @@ class Mintmanga : ParsedHttpSource() {
 
     override fun imageUrlParse(document: Document) = ""
 
+    override fun imageRequest(page: Page): Request {
+        val imgHeader = Headers.Builder().apply {
+            add("User-Agent", "Mozilla/5.0 (Windows NT 6.3; WOW64)")
+            add("Referer", baseUrl)
+        }.build()
+        return GET(page.imageUrl!!, imgHeader)
+    }
+
     private class Genre(name: String, val id: String) : Filter.TriState(name)
 
-    /* [...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 `Genre("${el.textContent.trim()}", "${id}")` }).join(',\n')
+    /*  [...document.querySelectorAll("tr.advanced_option:nth-child(1) > td:nth-child(3) span.js-link")]
+    *  .map(el => `Genre("${el.textContent.trim()}", $"{el.getAttribute('onclick')
+    *  .substr(31,el.getAttribute('onclick').length-33)"})`).join(',\n')
     *  on http://mintmanga.com/search/advanced
     */
     override fun getFilterList() = FilterList(

app/src/main/java/eu/kanade/tachiyomi/source/online/russian/Readmanga.kt

@@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.source.online.russian
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.source.model.*
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
+import okhttp3.Headers
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -23,9 +24,9 @@ class Readmanga : ParsedHttpSource() {
 
     override val supportsLatest = true
 
-    override fun popularMangaSelector() = "div.desc"
+    override fun popularMangaSelector() = "div.tile"
 
-    override fun latestUpdatesSelector() = "div.desc"
+    override fun latestUpdatesSelector() = "div.tile"
 
     override fun popularMangaRequest(page: Int): Request =
             GET("$baseUrl/list?sortType=rate&offset=${70 * (page - 1)}&max=70", headers)
@@ -35,6 +36,7 @@ class Readmanga : ParsedHttpSource() {
 
     override fun popularMangaFromElement(element: Element): SManga {
         val manga = SManga.create()
+        manga.thumbnail_url = element.select("img.lazy").first().attr("data-original")
         element.select("h3 > a").first().let {
             manga.setUrlWithoutDomain(it.attr("href"))
             manga.title = it.attr("title")
@@ -84,10 +86,15 @@ class Readmanga : ParsedHttpSource() {
 
     override fun chapterFromElement(element: Element): SChapter {
         val urlElement = element.select("a").first()
+        val urlText = urlElement.text()
 
         val chapter = SChapter.create()
-        chapter.setUrlWithoutDomain(urlElement.attr("href") + "?mature=1")
-        chapter.name = urlElement.text().replace(" новое", "")
+        chapter.setUrlWithoutDomain(urlElement.attr("href") + "?mtr=1")
+        if (urlText.endsWith(" новое")) {
+            chapter.name = urlText.dropLast(6)
+        } else {
+            chapter.name = urlText
+        }
         chapter.date_upload = element.select("td:eq(1)").first()?.text()?.let {
             SimpleDateFormat("dd/MM/yy", Locale.US).parse(it).time
         } ?: 0
@@ -137,11 +144,19 @@ class Readmanga : ParsedHttpSource() {
 
     override fun imageUrlParse(document: Document) = ""
 
+    override fun imageRequest(page: Page): Request {
+        val imgHeader = Headers.Builder().apply {
+            add("User-Agent", "Mozilla/5.0 (Windows NT 6.3; WOW64)")
+            add("Referer", baseUrl)
+        }.build()
+        return GET(page.imageUrl!!, imgHeader)
+    }
+
     private class Genre(name: String, val id: String) : Filter.TriState(name)
 
-    /* [...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 `Genre("${el.textContent.trim()}", "${id}")` }).join(',\n')
+    /* [...document.querySelectorAll("tr.advanced_option:nth-child(1) > td:nth-child(3) span.js-link")]
+    *  .map(el => `Genre("${el.textContent.trim()}", $"{el.getAttribute('onclick')
+    *  .substr(31,el.getAttribute('onclick').length-33)"})`).join(',\n')
     *  on http://readmanga.me/search/advanced
     */
     override fun getFilterList() = FilterList(

app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt

@@ -12,6 +12,7 @@ import com.bluelinelabs.conductor.ControllerChangeType
 import com.bluelinelabs.conductor.RestoreViewOnCreateController
 import kotlinx.android.extensions.LayoutContainer
 import kotlinx.android.synthetic.*
+import timber.log.Timber
 
 abstract class BaseController(bundle: Bundle? = null) : RestoreViewOnCreateController(bundle),
         LayoutContainer {
@@ -21,6 +22,22 @@ abstract class BaseController(bundle: Bundle? = null) : RestoreViewOnCreateContr
             override fun postCreateView(controller: Controller, view: View) {
                 onViewCreated(view)
             }
+
+            override fun preCreateView(controller: Controller) {
+                Timber.d("Create view for ${controller.instance()}")
+            }
+
+            override fun preAttach(controller: Controller, view: View) {
+                Timber.d("Attach view for ${controller.instance()}")
+            }
+
+            override fun preDetach(controller: Controller, view: View) {
+                Timber.d("Detach view for ${controller.instance()}")
+            }
+
+            override fun preDestroyView(controller: Controller, view: View) {
+                Timber.d("Destroy view for ${controller.instance()}")
+            }
         })
     }
 
@@ -63,6 +80,10 @@ abstract class BaseController(bundle: Bundle? = null) : RestoreViewOnCreateContr
         (activity as? AppCompatActivity)?.supportActionBar?.title = getTitle()
     }
 
+    private fun Controller.instance(): String {
+        return "${javaClass.simpleName}@${Integer.toHexString(hashCode())}"
+    }
+
     /**
      * Workaround for disappearing menu items when collapsing an expandable item like a SearchView.
      * This method should be removed when fixed upstream.
@@ -81,4 +102,4 @@ abstract class BaseController(bundle: Bundle? = null) : RestoreViewOnCreateContr
         })
     }
 
-}
+}

app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/RouterPagerAdapter.java

@@ -1,186 +0,0 @@
-package eu.kanade.tachiyomi.ui.base.controller;
-
-import android.os.Bundle;
-import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.PagerAdapter;
-import android.util.SparseArray;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.bluelinelabs.conductor.Controller;
-import com.bluelinelabs.conductor.Router;
-import com.bluelinelabs.conductor.RouterTransaction;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * An adapter for ViewPagers that uses Routers as pages
- */
-public abstract class RouterPagerAdapter extends PagerAdapter {
-
-    private static final String KEY_SAVED_PAGES = "RouterPagerAdapter.savedStates";
-    private static final String KEY_MAX_PAGES_TO_STATE_SAVE = "RouterPagerAdapter.maxPagesToStateSave";
-    private static final String KEY_SAVE_PAGE_HISTORY = "RouterPagerAdapter.savedPageHistory";
-
-    private final Controller host;
-    private int maxPagesToStateSave = Integer.MAX_VALUE;
-    private SparseArray<Bundle> savedPages = new SparseArray<>();
-    private SparseArray<Router> visibleRouters = new SparseArray<>();
-    private ArrayList<Integer> savedPageHistory = new ArrayList<>();
-    private Router primaryRouter;
-
-    /**
-     * Creates a new RouterPagerAdapter using the passed host.
-     */
-    public RouterPagerAdapter(@NonNull Controller host) {
-        this.host = host;
-    }
-
-    /**
-     * Called when a router is instantiated. Here the router's root should be set if needed.
-     *
-     * @param router   The router used for the page
-     * @param position The page position to be instantiated.
-     */
-    public abstract void configureRouter(@NonNull Router router, int position);
-
-    /**
-     * Sets the maximum number of pages that will have their states saved. When this number is exceeded,
-     * the page that was state saved least recently will have its state removed from the save data.
-     */
-    public void setMaxPagesToStateSave(int maxPagesToStateSave) {
-        if (maxPagesToStateSave < 0) {
-            throw new IllegalArgumentException("Only positive integers may be passed for maxPagesToStateSave.");
-        }
-
-        this.maxPagesToStateSave = maxPagesToStateSave;
-
-        ensurePagesSaved();
-    }
-
-    @Override
-    public Object instantiateItem(ViewGroup container, int position) {
-        final String name = makeRouterName(container.getId(), getItemId(position));
-
-        Router router = host.getChildRouter(container, name);
-        if (!router.hasRootController()) {
-            Bundle routerSavedState = savedPages.get(position);
-
-            if (routerSavedState != null) {
-                router.restoreInstanceState(routerSavedState);
-                savedPages.remove(position);
-            }
-        }
-
-        router.rebindIfNeeded();
-        configureRouter(router, position);
-
-        if (router != primaryRouter) {
-            for (RouterTransaction transaction : router.getBackstack()) {
-                transaction.controller().setOptionsMenuHidden(true);
-            }
-        }
-
-        visibleRouters.put(position, router);
-        return router;
-    }
-
-    @Override
-    public void destroyItem(ViewGroup container, int position, Object object) {
-        Router router = (Router)object;
-
-        Bundle savedState = new Bundle();
-        router.saveInstanceState(savedState);
-        savedPages.put(position, savedState);
-
-        savedPageHistory.remove((Integer)position);
-        savedPageHistory.add(position);
-
-        ensurePagesSaved();
-
-        host.removeChildRouter(router);
-
-        visibleRouters.remove(position);
-    }
-
-    @Override
-    public void setPrimaryItem(ViewGroup container, int position, Object object) {
-        Router router = (Router)object;
-        if (router != primaryRouter) {
-            if (primaryRouter != null) {
-                for (RouterTransaction transaction : primaryRouter.getBackstack()) {
-                    transaction.controller().setOptionsMenuHidden(true);
-                }
-            }
-            if (router != null) {
-                for (RouterTransaction transaction : router.getBackstack()) {
-                    transaction.controller().setOptionsMenuHidden(false);
-                }
-            }
-            primaryRouter = router;
-        }
-    }
-
-    @Override
-    public boolean isViewFromObject(View view, Object object) {
-        Router router = (Router)object;
-        final List<RouterTransaction> backstack = router.getBackstack();
-        for (RouterTransaction transaction : backstack) {
-            if (transaction.controller().getView() == view) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public Parcelable saveState() {
-        Bundle bundle = new Bundle();
-        bundle.putSparseParcelableArray(KEY_SAVED_PAGES, savedPages);
-        bundle.putInt(KEY_MAX_PAGES_TO_STATE_SAVE, maxPagesToStateSave);
-        bundle.putIntegerArrayList(KEY_SAVE_PAGE_HISTORY, savedPageHistory);
-        return bundle;
-    }
-
-    @Override
-    public void restoreState(Parcelable state, ClassLoader loader) {
-        Bundle bundle = (Bundle)state;
-        if (state != null) {
-            savedPages = bundle.getSparseParcelableArray(KEY_SAVED_PAGES);
-            maxPagesToStateSave = bundle.getInt(KEY_MAX_PAGES_TO_STATE_SAVE);
-            savedPageHistory = bundle.getIntegerArrayList(KEY_SAVE_PAGE_HISTORY);
-        }
-    }
-
-    /**
-     * Returns the already instantiated Router in the specified position or {@code null} if there
-     * is no router associated with this position.
-     */
-    @Nullable
-    public Router getRouter(int position) {
-        return visibleRouters.get(position);
-    }
-
-    public long getItemId(int position) {
-        return position;
-    }
-
-    SparseArray<Bundle> getSavedPages() {
-        return savedPages;
-    }
-
-    private void ensurePagesSaved() {
-        while (savedPages.size() > maxPagesToStateSave) {
-            int positionToRemove = savedPageHistory.remove(0);
-            savedPages.remove(positionToRemove);
-        }
-    }
-
-    private static String makeRouterName(int viewId, long id) {
-        return viewId + ":" + id;
-    }
-
-}

app/src/main/java/eu/kanade/tachiyomi/ui/base/holder/SlicedHolder.kt

@@ -0,0 +1,71 @@
+package eu.kanade.tachiyomi.ui.base.holder
+
+import android.os.Build
+import android.view.View
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.flexibleadapter.items.ISectionable
+import eu.kanade.tachiyomi.util.dpToPx
+import io.github.mthli.slice.Slice
+
+interface SlicedHolder {
+
+    val slice: Slice
+
+    val adapter: FlexibleAdapter<IFlexible<*>>
+
+    val viewToSlice: View
+
+    fun setCardEdges(item: ISectionable<*, *>) {
+        // Position of this item in its header. Defaults to 0 when header is null.
+        var position = 0
+
+        // Number of items in the header of this item. Defaults to 1 when header is null.
+        var count = 1
+
+        if (item.header != null) {
+            val sectionItems = adapter.getSectionItems(item.header)
+            position = sectionItems.indexOf(item)
+            count = sectionItems.size
+        }
+
+        when {
+            // Only one item in the card
+            count == 1 -> applySlice(2f, false, false, true, true)
+            // First item of the card
+            position == 0 -> applySlice(2f, false, true, true, false)
+            // Last item of the card
+            position == count - 1 -> applySlice(2f, true, false, false, true)
+            // Middle item
+            else -> applySlice(0f, false, false, false, false)
+        }
+    }
+
+    private fun applySlice(radius: Float, topRect: Boolean, bottomRect: Boolean,
+                           topShadow: Boolean, bottomShadow: Boolean) {
+        val margin = margin
+
+        slice.setRadius(radius)
+        slice.showLeftTopRect(topRect)
+        slice.showRightTopRect(topRect)
+        slice.showLeftBottomRect(bottomRect)
+        slice.showRightBottomRect(bottomRect)
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            slice.showTopEdgeShadow(topShadow)
+            slice.showBottomEdgeShadow(bottomShadow)
+        }
+        setMargins(margin, if (topShadow) margin else 0, margin, if (bottomShadow) margin else 0)
+    }
+
+    private fun setMargins(left: Int, top: Int, right: Int, bottom: Int) {
+        if (viewToSlice.layoutParams is ViewGroup.MarginLayoutParams) {
+            val p = viewToSlice.layoutParams as ViewGroup.MarginLayoutParams
+            p.setMargins(left, top, right, bottom)
+        }
+    }
+
+    val margin
+        get() = 8.dpToPx
+
+}

app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/BasePresenter.kt

@@ -1,11 +1,21 @@
 package eu.kanade.tachiyomi.ui.base.presenter
 
+import android.os.Bundle
 import nucleus.presenter.RxPresenter
 import nucleus.presenter.delivery.Delivery
 import rx.Observable
 
 open class BasePresenter<V> : RxPresenter<V>() {
 
+    override fun onCreate(savedState: Bundle?) {
+        try {
+            super.onCreate(savedState)
+        } catch (e: NullPointerException) {
+            // Swallow this error. This should be fixed in the library but since it's not critical
+            // (only used by restartables) it should be enough. It saves me a fork.
+        }
+    }
+
     /**
      * Subscribes an observable with [deliverFirst] and adds it to the presenter's lifecycle
      * subscription list.

app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/NucleusConductorDelegate.java

@@ -28,7 +28,7 @@ public class NucleusConductorDelegate<P extends Presenter> {
 
     Bundle onSaveInstanceState() {
         Bundle bundle = new Bundle();
-        getPresenter();
+//        getPresenter(); // Workaround a crash related to saving instance state with child routers
         if (presenter != null) {
             presenter.save(bundle);
         }

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueController.kt

@@ -1,5 +1,6 @@
 package eu.kanade.tachiyomi.ui.catalogue
 
+import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.SearchView
 import android.view.*
@@ -15,6 +16,7 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.online.LoginSource
 import eu.kanade.tachiyomi.ui.base.controller.NucleusController
+import eu.kanade.tachiyomi.ui.base.controller.requestPermissionsSafe
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.catalogue.browse.BrowseCatalogueController
 import eu.kanade.tachiyomi.ui.catalogue.global_search.CatalogueSearchController
@@ -99,6 +101,8 @@ class CatalogueController : NucleusController<CataloguePresenter>(),
         recycler.layoutManager = LinearLayoutManager(view.context)
         recycler.adapter = adapter
         recycler.addItemDecoration(SourceDividerItemDecoration(view.context))
+
+        requestPermissionsSafe(arrayOf(WRITE_EXTERNAL_STORAGE), 301)
     }
 
     override fun onDestroyView(view: View) {
@@ -185,10 +189,11 @@ class CatalogueController : NucleusController<CataloguePresenter>(),
         // Create query listener which opens the global search view.
         searchView.queryTextChangeEvents()
                 .filter { it.isSubmitted }
-                .subscribeUntilDestroy {
-                    val query = it.queryText().toString()
-                    router.pushController(CatalogueSearchController(query).withFadeTransaction())
-                }
+                .subscribeUntilDestroy { performGlobalSearch(it.queryText().toString()) }
+    }
+
+    fun performGlobalSearch(query: String){
+        router.pushController(CatalogueSearchController(query).withFadeTransaction())
     }
 
     /**

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/LangHolder.kt

@@ -2,21 +2,14 @@ package eu.kanade.tachiyomi.ui.catalogue
 
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
+import eu.kanade.tachiyomi.util.LocaleHelper
 import kotlinx.android.synthetic.main.catalogue_main_controller_card.*
-import java.util.*
 
 class LangHolder(view: View, adapter: FlexibleAdapter<*>) :
-        BaseFlexibleViewHolder(view, adapter, true) {
+        BaseFlexibleViewHolder(view, adapter) {
 
     fun bind(item: LangItem) {
-        title.text = when {
-            item.code == "" -> itemView.context.getString(R.string.other_source)
-            else -> {
-                val locale = Locale(item.code)
-                locale.getDisplayName(locale).capitalize()
-            }
-        }
+        title.text = LocaleHelper.getDisplayName(item.code, itemView.context)
     }
-}
+}

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/SourceDividerItemDecoration.kt

@@ -18,17 +18,17 @@ class SourceDividerItemDecoration(context: Context) : RecyclerView.ItemDecoratio
     }
 
     override fun onDraw(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
-        val left = parent.paddingLeft + SourceHolder.margin
-        val right = parent.width - parent.paddingRight - SourceHolder.margin
-
         val childCount = parent.childCount
         for (i in 0 until childCount - 1) {
             val child = parent.getChildAt(i)
-            if (parent.getChildViewHolder(child) is SourceHolder &&
+            val holder = parent.getChildViewHolder(child)
+            if (holder is SourceHolder &&
                     parent.getChildViewHolder(parent.getChildAt(i + 1)) is SourceHolder) {
                 val params = child.layoutParams as RecyclerView.LayoutParams
                 val top = child.bottom + params.bottomMargin
                 val bottom = top + divider.intrinsicHeight
+                val left = parent.paddingLeft + holder.margin
+                val right = parent.width - parent.paddingRight - holder.margin
 
                 divider.setBounds(left, top, right, bottom)
                 divider.draw(c)
@@ -41,4 +41,4 @@ class SourceDividerItemDecoration(context: Context) : RecyclerView.ItemDecoratio
         outRect.set(0, 0, 0, divider.intrinsicHeight)
     }
 
-}
+}

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/SourceHolder.kt

@@ -1,24 +1,27 @@
 package eu.kanade.tachiyomi.ui.catalogue
 
-import android.os.Build
 import android.view.View
-import android.view.ViewGroup
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.source.online.LoginSource
 import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
-import eu.kanade.tachiyomi.util.dpToPx
+import eu.kanade.tachiyomi.ui.base.holder.SlicedHolder
 import eu.kanade.tachiyomi.util.getRound
 import eu.kanade.tachiyomi.util.gone
 import eu.kanade.tachiyomi.util.visible
 import io.github.mthli.slice.Slice
 import kotlinx.android.synthetic.main.catalogue_main_controller_card_item.*
 
-class SourceHolder(view: View, adapter: CatalogueAdapter) : BaseFlexibleViewHolder(view, adapter) {
+class SourceHolder(view: View, override val adapter: CatalogueAdapter) :
+        BaseFlexibleViewHolder(view, adapter),
+        SlicedHolder {
 
-    private val slice = Slice(card).apply {
+    override val slice = Slice(card).apply {
         setColor(adapter.cardBackground)
     }
 
+    override val viewToSlice: View
+        get() = card
+
     init {
         source_browse.setOnClickListener {
             adapter.browseClickListener.onBrowseClick(adapterPosition)
@@ -38,7 +41,7 @@ class SourceHolder(view: View, adapter: CatalogueAdapter) : BaseFlexibleViewHold
 
         // Set circle letter image.
         itemView.post {
-            image.setImageDrawable(image.getRound(source.name.take(1).toUpperCase(),false))
+            image.setImageDrawable(image.getRound(source.name.take(1).toUpperCase(), false))
         }
 
         // If source is login, show only login option
@@ -47,59 +50,11 @@ class SourceHolder(view: View, adapter: CatalogueAdapter) : BaseFlexibleViewHold
             source_latest.gone()
         } else {
             source_browse.setText(R.string.browse)
-            source_latest.visible()
+            if (source.supportsLatest) {
+                source_latest.visible()
+            } else {
+                source_latest.gone()
+            }
         }
     }
-
-    private fun setCardEdges(item: SourceItem) {
-        // Position of this item in its header. Defaults to 0 when header is null.
-        var position = 0
-
-        // Number of items in the header of this item. Defaults to 1 when header is null.
-        var count = 1
-
-        if (item.header != null) {
-            val sectionItems = mAdapter.getSectionItems(item.header)
-            position = sectionItems.indexOf(item)
-            count = sectionItems.size
-        }
-
-        when {
-            // Only one item in the card
-            count == 1 -> applySlice(2f, false, false, true, true)
-            // First item of the card
-            position == 0 -> applySlice(2f, false, true, true, false)
-            // Last item of the card
-            position == count - 1 -> applySlice(2f, true, false, false, true)
-            // Middle item
-            else -> applySlice(0f, false, false, false, false)
-        }
-    }
-
-    private fun applySlice(radius: Float, topRect: Boolean, bottomRect: Boolean,
-                           topShadow: Boolean, bottomShadow: Boolean) {
-
-        slice.setRadius(radius)
-        slice.showLeftTopRect(topRect)
-        slice.showRightTopRect(topRect)
-        slice.showLeftBottomRect(bottomRect)
-        slice.showRightBottomRect(bottomRect)
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            slice.showTopEdgeShadow(topShadow)
-            slice.showBottomEdgeShadow(bottomShadow)
-        }
-        setMargins(margin, if (topShadow) margin else 0, margin, if (bottomShadow) margin else 0)
-    }
-
-    private fun setMargins(left: Int, top: Int, right: Int, bottom: Int) {
-        val v = card
-        if (v.layoutParams is ViewGroup.MarginLayoutParams) {
-            val p = v.layoutParams as ViewGroup.MarginLayoutParams
-            p.setMargins(left, top, right, bottom)
-        }
-    }
-
-    companion object {
-        val margin = 8.dpToPx
-    }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt

@@ -24,7 +24,6 @@ import eu.kanade.tachiyomi.ui.library.ChangeMangaCategoriesDialog
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.util.*
 import eu.kanade.tachiyomi.widget.AutofitRecyclerView
-import eu.kanade.tachiyomi.widget.DrawerSwipeCloseListener
 import kotlinx.android.synthetic.main.catalogue_controller.*
 import kotlinx.android.synthetic.main.main_activity.*
 import rx.Observable
@@ -75,11 +74,6 @@ open class BrowseCatalogueController(bundle: Bundle) :
      */
     private var recycler: RecyclerView? = null
 
-    /**
-     * Drawer listener to allow swipe only for closing the drawer.
-     */
-    private var drawerListener: DrawerLayout.DrawerListener? = null
-
     /**
      * Subscription for the search view.
      */
@@ -138,17 +132,15 @@ open class BrowseCatalogueController(bundle: Bundle) :
         // Inflate and prepare drawer
         val navView = drawer.inflate(R.layout.catalogue_drawer) as CatalogueNavigationView
         this.navView = navView
-        drawerListener = DrawerSwipeCloseListener(drawer, navView).also {
-            drawer.addDrawerListener(it)
-        }
         navView.setFilters(presenter.filterItems)
 
-        drawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, Gravity.END)
+        drawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED, Gravity.END)
 
         navView.onSearchClicked = {
             val allDefault = presenter.sourceFilters == presenter.source.getFilterList()
             showProgressBar()
             adapter?.clear()
+            drawer.closeDrawer(Gravity.END)
             presenter.setSourceFilter(if (allDefault) FilterList() else presenter.sourceFilters)
         }
 
@@ -162,8 +154,6 @@ open class BrowseCatalogueController(bundle: Bundle) :
     }
 
     override fun cleanupSecondaryDrawer(drawer: DrawerLayout) {
-        drawerListener?.let { drawer.removeDrawerListener(it) }
-        drawerListener = null
         navView = null
     }
 

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/CatalogueNavigationView.kt

@@ -28,7 +28,7 @@ class CatalogueNavigationView @JvmOverloads constructor(context: Context, attrs:
         val view = inflate(R.layout.catalogue_drawer_content)
         ((view as ViewGroup).getChildAt(1) as ViewGroup).addView(recycler)
         addView(view)
-
+        title.text = context?.getString(R.string.source_search_options)
         search_btn.setOnClickListener { onSearchClicked() }
         reset_btn.setOnClickListener { onResetClicked() }
     }

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/GroupItem.kt

@@ -13,6 +13,10 @@ import eu.kanade.tachiyomi.util.setVectorCompat
 
 class GroupItem(val filter: Filter.Group<*>) : AbstractExpandableHeaderItem<GroupItem.Holder, ISectionable<*, *>>() {
 
+    init {
+        isExpanded = false
+    }
+
     override fun getLayoutRes(): Int {
         return R.layout.navigation_view_group
     }
@@ -32,6 +36,9 @@ class GroupItem(val filter: Filter.Group<*>) : AbstractExpandableHeaderItem<Grou
             R.drawable.ic_expand_more_white_24dp
         else
             R.drawable.ic_chevron_right_white_24dp)
+
+        holder.itemView.setOnClickListener(holder)
+
     }
 
     override fun equals(other: Any?): Boolean {
@@ -44,6 +51,7 @@ class GroupItem(val filter: Filter.Group<*>) : AbstractExpandableHeaderItem<Grou
         return filter.hashCode()
     }
 
+
     open class Holder(view: View, adapter: FlexibleAdapter<*>) : ExpandableViewHolder(view, adapter, true) {
 
         val title: TextView = itemView.findViewById(R.id.title)
@@ -52,5 +60,6 @@ class GroupItem(val filter: Filter.Group<*>) : AbstractExpandableHeaderItem<Grou
         override fun shouldNotifyParentOnClick(): Boolean {
             return true
         }
+
     }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/SortGroup.kt

@@ -10,6 +10,10 @@ import eu.kanade.tachiyomi.util.setVectorCompat
 
 class SortGroup(val filter: Filter.Sort) : AbstractExpandableHeaderItem<SortGroup.Holder, ISectionable<*, *>>() {
 
+    init {
+        isExpanded = false
+    }
+
     override fun getLayoutRes(): Int {
         return R.layout.navigation_view_group
     }
@@ -29,6 +33,9 @@ class SortGroup(val filter: Filter.Sort) : AbstractExpandableHeaderItem<SortGrou
             R.drawable.ic_expand_more_white_24dp
         else
             R.drawable.ic_chevron_right_white_24dp)
+
+        holder.itemView.setOnClickListener(holder)
+
     }
 
     override fun equals(other: Any?): Boolean {

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/SortItem.kt

@@ -33,9 +33,9 @@ class SortItem(val name: String, val group: SortGroup) : AbstractSectionableItem
         val i = filter.values.indexOf(name)
 
         fun getIcon() = when (filter.state) {
-            Filter.Sort.Selection(i, false) -> VectorDrawableCompat.create(view.resources, R.drawable.ic_keyboard_arrow_down_black_32dp, null)
+            Filter.Sort.Selection(i, false) -> VectorDrawableCompat.create(view.resources, R.drawable.ic_arrow_down_white_32dp, null)
                     ?.apply { setTint(view.context.getResourceColor(R.attr.colorAccent)) }
-            Filter.Sort.Selection(i, true) -> VectorDrawableCompat.create(view.resources, R.drawable.ic_keyboard_arrow_up_black_32dp, null)
+            Filter.Sort.Selection(i, true) -> VectorDrawableCompat.create(view.resources, R.drawable.ic_arrow_up_white_32dp, null)
                     ?.apply { setTint(view.context.getResourceColor(R.attr.colorAccent)) }
             else -> ContextCompat.getDrawable(view.context, R.drawable.empty_drawable_32dp)
         }

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchCardAdapter.kt

@@ -22,6 +22,7 @@ class CatalogueSearchCardAdapter(controller: CatalogueSearchController) :
      */
     interface OnMangaClickListener {
         fun onMangaClick(manga: Manga)
+        fun onMangaLongClick(manga: Manga)
     }
 
 }

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchCardHolder.kt

@@ -19,10 +19,19 @@ class CatalogueSearchCardHolder(view: View, adapter: CatalogueSearchCardAdapter)
                 adapter.mangaClickListener.onMangaClick(item.manga)
             }
         }
+        itemView.setOnLongClickListener {
+            val item = adapter.getItem(adapterPosition)
+            if (item != null) {
+                adapter.mangaClickListener.onMangaLongClick(item.manga)
+            }
+            true
+        }
     }
 
     fun bind(manga: Manga) {
         tvTitle.text = manga.title
+        // Set alpha of thumbnail.
+        itemImage.alpha = if (manga.favorite) 0.3f else 1.0f
 
         setImage(manga)
     }

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchController.kt

@@ -18,14 +18,14 @@ import kotlinx.android.synthetic.main.catalogue_global_search_controller.*
  * This controller should only handle UI actions, IO actions should be done by [CatalogueSearchPresenter]
  * [CatalogueSearchCardAdapter.OnMangaClickListener] called when manga is clicked in global search
  */
-class CatalogueSearchController(private val initialQuery: String? = null) :
+open class CatalogueSearchController(protected val initialQuery: String? = null) :
         NucleusController<CatalogueSearchPresenter>(),
         CatalogueSearchCardAdapter.OnMangaClickListener {
 
     /**
      * Adapter containing search results grouped by lang.
      */
-    private var adapter: CatalogueSearchAdapter? = null
+    protected var adapter: CatalogueSearchAdapter? = null
 
     /**
      * Called when controller is initialized.
@@ -73,6 +73,16 @@ class CatalogueSearchController(private val initialQuery: String? = null) :
         router.pushController(MangaController(manga, true).withFadeTransaction())
     }
 
+    /**
+     * Called when manga in global search is long clicked.
+     *
+     * @param manga clicked item containing manga information.
+     */
+    override fun onMangaLongClick(manga: Manga) {
+        // Delegate to single click by default.
+        onMangaClick(manga)
+    }
+
     /**
      * Adds items to the options menu.
      *

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchPresenter.kt

@@ -30,7 +30,7 @@ import uy.kohesive.injekt.api.get
  * @param db manages the database calls.
  * @param preferencesHelper manages the preference calls.
  */
-class CatalogueSearchPresenter(
+open class CatalogueSearchPresenter(
         val initialQuery: String? = "",
         val sourceManager: SourceManager = Injekt.get(),
         val db: DatabaseHelper = Injekt.get(),
@@ -86,7 +86,7 @@ class CatalogueSearchPresenter(
      *
      * @return list containing enabled sources.
      */
-    private fun getEnabledSources(): List<CatalogueSource> {
+    protected open fun getEnabledSources(): List<CatalogueSource> {
         val languages = preferencesHelper.enabledLanguages().getOrDefault()
         val hiddenCatalogues = preferencesHelper.hiddenCatalogues().getOrDefault()
 

app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryController.kt

@@ -26,7 +26,7 @@ class CategoryController : NucleusController<CategoryPresenter>(),
         CategoryAdapter.OnItemReleaseListener,
         CategoryCreateDialog.Listener,
         CategoryRenameDialog.Listener,
-        UndoHelper.OnUndoListener {
+        UndoHelper.OnActionListener {
 
     /**
      * Object used to show ActionMode toolbar.
@@ -168,7 +168,7 @@ class CategoryController : NucleusController<CategoryPresenter>(),
             R.id.action_delete -> {
                 undoHelper = UndoHelper(adapter, this)
                 undoHelper?.start(adapter.selectedPositions, view!!,
-                                R.string.snack_categories_deleted, R.string.action_undo, 3000)
+                        R.string.snack_categories_deleted, R.string.action_undo, 3000)
 
                 mode.finish()
             }
@@ -268,7 +268,7 @@ class CategoryController : NucleusController<CategoryPresenter>(),
      *
      * @param action The action performed.
      */
-    override fun onActionCanceled(action: Int) {
+    override fun onActionCanceled(action: Int, positions: MutableList<Int>?) {
         adapter?.restoreDeletedItems()
         undoHelper = null
     }