Release 0.8.5

(cherry picked from commit 48d9ad00e1)

.gitattributes

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

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,24 @@
+---
+name: "🐞 Bug report"
+about: Report a bug
+title: "[Bug] Write short description here"
+labels: "bug"
+
+---
+
+### Device information
+* Tachiyomi version: ?
+* Android version: ?
+
+## Steps to reproduce
+1. First step
+2. Second step
+
+### Expected behavior
+This should happen.
+
+### Actual behavior
+This happened instead.
+
+### Other details
+Additional details and attachments.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,12 @@
+---
+name: "🌟 Feature request"
+about: Suggest a feature to improve Tachiyomi
+title: "[Feature Request] Write short description here"
+labels: "feature"
+
+---
+### Why/User Benefit/User Problem
+(explain why this feature should be added)
+
+### What/Requirements
+(explain how this feature would behave)

.travis.yml

@@ -1,8 +1,9 @@
+dist: trusty
 language: android
 android:
   components:
-  - build-tools-28.0.3
-  - android-27
+  - build-tools-29.0.2
+  - android-28
   - extra-android-m2repository
   - extra-google-m2repository
   - extra-android-support
@@ -10,7 +11,7 @@ android:
   licenses:
   - android-sdk-license-.+
 before_install:
-- yes | sdkmanager "platforms;android-27" # workaround for accepting the license
+- yes | sdkmanager "platforms;android-28" # 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;

README.md

@@ -1,6 +1,6 @@
-| Build | Stable | Dev | Contribute | Contact |
+| Build | Stable | Dev | Contribute | Support Server |
 |-------|----------|---------|------------|---------|
-| [![Travis](https://img.shields.io/travis/inorichi/tachiyomi.svg)](https://travis-ci.org/inorichi/tachiyomi) | [![stable release](https://img.shields.io/github/release/inorichi/tachiyomi.svg?maxAge=3600&label=download%20(autoupdate%20included))](https://github.com/inorichi/tachiyomi/releases) | [![latest dev build](https://img.shields.io/badge/download-latest%20build-blue.svg)](http://tachiyomi.kanade.eu/latest) | [![Translation status](https://hosted.weblate.org/widgets/tachiyomi/-/svg-badge.svg)](https://hosted.weblate.org/engage/tachiyomi/?utm_source=widget) | [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/tachiyomi) |
+| [![Travis](https://img.shields.io/travis/inorichi/tachiyomi.svg)](https://travis-ci.org/inorichi/tachiyomi) | [![stable release](https://img.shields.io/github/release/inorichi/tachiyomi.svg?maxAge=3600&label=download)](https://github.com/inorichi/tachiyomi/releases) | [![latest dev build](https://img.shields.io/badge/download-latest%20build-blue.svg)](http://tachiyomi.kanade.eu/latest) | [![Translation status](https://hosted.weblate.org/widgets/tachiyomi/-/svg-badge.svg)](https://hosted.weblate.org/engage/tachiyomi/?utm_source=widget) | [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/tachiyomi) |
 
 
 # ![app icon](./.github/readme-images/app-icon.png)Tachiyomi
@@ -11,10 +11,10 @@ Tachiyomi is a free and open source manga reader for Android.
 ## Features
 
 Features include:
-* Online reading from sources such as KissManga, MangaFox, [and more](https://github.com/inorichi/tachiyomi-extensions)
+* Online reading from sources such as KissManga, MangaDex, [and more](https://github.com/inorichi/tachiyomi-extensions)
 * Local reading of downloaded manga
-* Configurable reader with multiple viewers, reading directions and other settings
-* [MyAnimeList](https://myanimelist.net/), [AniList](https://anilist.co/), and [Kitsu](https://kitsu.io/explore/anime) support
+* A configurable reader with multiple viewers, reading directions and other settings.
+* [MyAnimeList](https://myanimelist.net/), [AniList](https://anilist.co/), [Kitsu](https://kitsu.io/explore/anime), and [Shikimori](https://shikimori.one) support
 * Categories to organize your library
 * Light and dark themes
 * Schedule updating your library for new chapters
@@ -23,7 +23,7 @@ Features include:
 ## Download
 Get the app from our [releases page](https://github.com/inorichi/tachiyomi/releases).
 
-If you want to try new features before they get to the stable release, you can download the dev version [here](http://tachiyomi.kanade.eu/latest). (auto-updates not included)
+If you want to try new features before they get to the stable release, you can download the dev version [here](http://tachiyomi.kanade.eu/latest).
 
 ## Issues, Feature Requests and Contributing
 
@@ -63,7 +63,7 @@ Catalogue requests should be created at https://github.com/inorichi/tachiyomi-ex
 
 ## FAQ
 
-[See our wiki.](https://github.com/inorichi/tachiyomi/wiki/FAQ)
+[See our website.](https://tachiyomi.org/)
 You can also reach out to us on [Discord](https://discord.gg/tachiyomi).
 
 ## License

app/build.gradle

@@ -29,17 +29,17 @@ ext {
 }
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '29.0.2'
     publishNonDefault true
 
     defaultConfig {
         applicationId "eu.kanade.tachiyomi"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        versionCode 41
-        versionName "0.8.4"
+        versionCode 42
+        versionName "0.8.5"
 
         buildConfigField "String", "COMMIT_COUNT", "\"${getCommitCount()}\""
         buildConfigField "String", "COMMIT_SHA", "\"${getGitSha()}\""
@@ -73,7 +73,6 @@ android {
             dimension "default"
         }
         dev {
-            minSdkVersion 21
             resConfigs "en", "xxhdpi"
             dimension "default"
         }
@@ -92,6 +91,14 @@ android {
         checkReleaseBuilds false
     }
 
+    compileOptions {
+        sourceCompatibility = 1.8
+        targetCompatibility = 1.8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }
 
 dependencies {
@@ -101,7 +108,7 @@ dependencies {
     implementation 'com.github.inorichi:junrar-android:634c1f5'
 
     // Android support library
-    final support_library_version = '27.0.2'
+    final support_library_version = '28.0.0'
     implementation "com.android.support:support-v4:$support_library_version"
     implementation "com.android.support:appcompat-v7:$support_library_version"
     implementation "com.android.support:cardview-v7:$support_library_version"
@@ -111,7 +118,7 @@ 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.1.2'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 
     implementation 'com.android.support:multidex:1.0.3'
 
@@ -119,10 +126,10 @@ dependencies {
 
     // ReactiveX
     implementation 'io.reactivex:rxandroid:1.2.1'
-    implementation 'io.reactivex:rxjava:1.3.6'
+    implementation 'io.reactivex:rxjava:1.3.8'
     implementation 'com.jakewharton.rxrelay:rxrelay:1.2.0'
     implementation 'com.f2prateek.rx.preferences:rx-preferences:1.0.2'
-    implementation 'com.github.pwittchen:reactivenetwork:0.7.0'
+    implementation 'com.github.pwittchen:reactivenetwork:0.13.0'
 
     // Network client
     implementation "com.squareup.okhttp3:okhttp:3.10.0"
@@ -146,7 +153,7 @@ dependencies {
     implementation 'com.github.inorichi:unifile:e9ee588'
 
     // HTML parser
-    implementation 'org.jsoup:jsoup:1.10.2'
+    implementation 'org.jsoup:jsoup:1.12.1'
 
     // Job scheduling
     implementation 'com.evernote:android-job:1.2.5'
@@ -156,7 +163,7 @@ dependencies {
     implementation 'com.github.gabrielemariotti.changeloglib:changelog:2.1.0'
 
     // Database
-    implementation 'android.arch.persistence:db:1.0.0'
+    implementation 'android.arch.persistence:db:1.1.1'
     implementation 'com.github.inorichi.storio:storio-common:8be19de@aar'
     implementation 'com.github.inorichi.storio:storio-sqlite:8be19de@aar'
     implementation 'io.requery:sqlite-android:3.25.2'
@@ -179,14 +186,11 @@ dependencies {
     implementation 'jp.wasabeef:glide-transformations:3.1.1'
 
     // Logging
-    implementation 'com.jakewharton.timber:timber:4.6.1'
+    implementation 'com.jakewharton.timber:timber:4.7.1'
 
     // Crash reports
     implementation 'ch.acra:acra:4.9.2'
 
-    // Sort
-    implementation 'com.github.gpanther:java-nat-sort:natural-comparator-1.1'
-
     // UI
     implementation 'com.dmitrymalkovich.android:material-design-dimens:1.4'
     implementation 'com.github.dmytrodanylyk.android-process-button:library:1.0.4'
@@ -228,13 +232,12 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-    final coroutines_version = '0.22.2'
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
+    final coroutines_version = '1.3.3'
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
 }
 
 buildscript {
-    ext.kotlin_version = '1.2.71'
+    ext.kotlin_version = '1.3.61'
     repositories {
         mavenCentral()
     }
@@ -247,10 +250,9 @@ repositories {
     mavenCentral()
 }
 
-kotlin {
-    experimental {
-        coroutines 'enable'
-    }
+// See https://kotlinlang.org/docs/reference/experimental.html#experimental-status-of-experimental-api-markers
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile).all {
+    kotlinOptions.freeCompilerArgs += ["-Xuse-experimental=kotlin.Experimental"]
 }
 
 androidExtensions {

app/src/main/AndroidManifest.xml

@@ -9,6 +9,8 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 
     <application
@@ -16,6 +18,7 @@
         android:allowBackup="true"
         android:fullBackupContent="@xml/backup_rules"
         android:hardwareAccelerated="true"
+        android:usesCleartextTraffic="true"
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
@@ -62,8 +65,8 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".ui.setting.ShikomoriLoginActivity"
-            android:label="Shikomori">
+            android:name=".ui.setting.ShikimoriLoginActivity"
+            android:label="Shikimori">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -75,6 +78,20 @@
                     android:scheme="tachiyomi" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".ui.setting.BangumiLoginActivity"
+            android:label="Bangumi">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="bangumi-auth"
+                    android:scheme="tachiyomi" />
+            </intent-filter>
+        </activity>
 
         <activity
             android:name=".extension.util.ExtensionInstallActivity"

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

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

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

@@ -60,7 +60,7 @@ class CoverCache(private val context: Context) {
             return false
 
         // Remove file.
-        val file = getCoverFile(thumbnailUrl!!)
+        val file = getCoverFile(thumbnailUrl)
         return file.exists() && file.delete()
     }
 

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

@@ -82,6 +82,11 @@ interface MangaQueries : DbProvider {
             .withPutResolver(MangaViewerPutResolver())
             .prepare()
 
+    fun updateMangaTitle(manga: Manga) = db.put()
+            .`object`(manga)
+            .withPutResolver(MangaTitlePutResolver())
+            .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/queries/TrackQueries.kt

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

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

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

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

@@ -20,10 +20,10 @@ class MangaViewerPutResolver : PutResolver<Manga>() {
     }
 
     fun mapToUpdateQuery(manga: Manga) = UpdateQuery.builder()
-        .table(MangaTable.TABLE)
-        .where("${MangaTable.COL_ID} = ?")
-        .whereArgs(manga.id)
-        .build()
+            .table(MangaTable.TABLE)
+            .where("${MangaTable.COL_ID} = ?")
+            .whereArgs(manga.id)
+            .build()
 
     fun mapToContentValues(manga: Manga) = ContentValues(1).apply {
         put(MangaTable.COL_VIEWER, manga.viewer)

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

@@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.data.download
 import android.content.Context
 import android.net.Uri
 import com.hippo.unifile.UniFile
+import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
@@ -28,7 +29,9 @@ class DownloadProvider(private val context: Context) {
      * The root directory for downloads.
      */
     private var downloadsDir = preferences.downloadsDirectory().getOrDefault().let {
-        UniFile.fromUri(context, Uri.parse(it))
+        val dir = UniFile.fromUri(context, Uri.parse(it))
+        DiskUtil.createNoMediaFile(dir, context)
+        dir
     }
 
     init {
@@ -44,9 +47,13 @@ class DownloadProvider(private val context: Context) {
      * @param source the source of the manga.
      */
     internal fun getMangaDir(manga: Manga, source: Source): UniFile {
-        return downloadsDir
-                .createDirectory(getSourceDirName(source))
-                .createDirectory(getMangaDirName(manga))
+        try {
+            return downloadsDir
+                    .createDirectory(getSourceDirName(source))
+                    .createDirectory(getMangaDirName(manga))
+        } catch (e: NullPointerException) {
+            throw Exception(context.getString(R.string.invalid_download_dir))
+        }
     }
 
     /**

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

@@ -132,7 +132,7 @@ class DownloadService : Service() {
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe({ state -> onNetworkStateChanged(state)
-                }, { _ ->
+                }, {
                     toast(R.string.download_queue_error)
                     stopSelf()
                 })

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

@@ -14,7 +14,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.source.online.fetchAllImageUrlsFromPageList
 import eu.kanade.tachiyomi.util.*
-import kotlinx.coroutines.experimental.async
+import kotlinx.coroutines.async
 import okhttp3.Response
 import rx.Observable
 import rx.android.schedulers.AndroidSchedulers
@@ -102,7 +102,7 @@ class Downloader(
         pending.forEach { if (it.status != Download.QUEUE) it.status = Download.QUEUE }
 
         downloadsRelay.call(pending)
-        return !pending.isEmpty()
+        return pending.isNotEmpty()
     }
 
     /**
@@ -199,7 +199,7 @@ class Downloader(
      */
     fun queueChapters(manga: Manga, chapters: List<Chapter>, autoStart: Boolean) = launchUI {
         val source = sourceManager.get(manga.source) as? HttpSource ?: return@launchUI
-
+        val wasEmpty = queue.isEmpty()
         // Called in background thread, the operation can be slow with SAF.
         val chaptersWithoutDir = async {
             val mangaDir = provider.findMangaDir(manga, source)
@@ -232,7 +232,7 @@ class Downloader(
             }
 
             // Start downloader if needed
-            if (autoStart) {
+            if (autoStart && wasEmpty) {
                 DownloadService.start(this@Downloader.context)
             }
         }
@@ -407,6 +407,8 @@ class Downloader(
         if (download.status == Download.DOWNLOADED) {
             tmpDir.renameTo(dirname)
             cache.addChapter(dirname, mangaDir, download.manga)
+
+            DiskUtil.createNoMediaFile(tmpDir, context)
         }
     }
 

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

@@ -0,0 +1,43 @@
+package eu.kanade.tachiyomi.data.library
+
+import eu.kanade.tachiyomi.data.database.models.Manga
+
+/**
+ * This class will provide various functions to Rank mangas to efficiently schedule mangas to update.
+ */
+object LibraryUpdateRanker {
+
+    val rankingScheme = listOf(
+            (this::lexicographicRanking)(),
+            (this::latestFirstRanking)())
+
+    /**
+     * Provides a total ordering over all the Mangas.
+     *
+     * Assumption: An active [Manga] mActive is expected to have been last updated after an
+     * inactive [Manga] mInactive.
+     *
+     * Using this insight, function returns a Comparator for which mActive appears before mInactive.
+     * @return a Comparator that ranks manga based on relevance.
+     */
+    fun latestFirstRanking(): Comparator<Manga> {
+        return Comparator { mangaFirst: Manga,
+                            mangaSecond: Manga ->
+            compareValues(mangaSecond.last_update, mangaFirst.last_update)
+        }
+    }
+
+    /**
+     * Provides a total ordering over all the Mangas.
+     *
+     * Order the manga lexicographically.
+     * @return a Comparator that ranks manga lexicographically based on the title.
+     */
+    fun lexicographicRanking(): Comparator<Manga> {
+        return Comparator { mangaFirst: Manga,
+                                   mangaSecond: Manga ->
+            compareValues(mangaFirst.title, mangaSecond.title)
+        }
+    }
+
+}

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

@@ -18,6 +18,7 @@ import eu.kanade.tachiyomi.data.database.models.LibraryManga
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.download.DownloadManager
 import eu.kanade.tachiyomi.data.download.DownloadService
+import eu.kanade.tachiyomi.data.library.LibraryUpdateRanker.rankingScheme
 import eu.kanade.tachiyomi.data.library.LibraryUpdateService.Companion.start
 import eu.kanade.tachiyomi.data.notification.NotificationReceiver
 import eu.kanade.tachiyomi.data.notification.Notifications
@@ -204,7 +205,9 @@ class LibraryUpdateService(
         // Update favorite manga. Destroy service when completed or in case of an error.
         subscription = Observable
                 .defer {
+                    val selectedScheme = preferences.libraryUpdatePrioritization().getOrDefault()
                     val mangaList = getMangaToUpdate(intent, target)
+                            .sortedWith(rankingScheme[selectedScheme])
 
                     // Update either chapter list or manga details.
                     when (target) {
@@ -246,7 +249,6 @@ class LibraryUpdateService(
             else
                 db.getLibraryMangas().executeAsBlocking().distinctBy { it.id }
         }
-
         if (target == Target.CHAPTERS && preferences.updateOnlyNonCompleted()) {
             listToUpdate = listToUpdate.filter { it.status != SManga.COMPLETED }
         }

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

@@ -1,128 +1,132 @@
-package eu.kanade.tachiyomi.data.preference
-
-/**
- * This class stores the keys for the preferences in the application.
- */
-object PreferenceKeys {
-
-    const val theme = "pref_theme_key"
-
-    const val rotation = "pref_rotation_type_key"
-
-    const val enableTransitions = "pref_enable_transitions_key"
-
-    const val doubleTapAnimationSpeed = "pref_double_tap_anim_speed"
-
-    const val showPageNumber = "pref_show_page_number_key"
-
-    const val trueColor = "pref_true_color_key"
-
-    const val fullscreen = "fullscreen"
-
-    const val keepScreenOn = "pref_keep_screen_on_key"
-
-    const val customBrightness = "pref_custom_brightness_key"
-
-    const val customBrightnessValue = "custom_brightness_value"
-
-    const val colorFilter = "pref_color_filter_key"
-
-    const val colorFilterValue = "color_filter_value"
-
-    const val defaultViewer = "pref_default_viewer_key"
-
-    const val imageScaleType = "pref_image_scale_type_key"
-
-    const val zoomStart = "pref_zoom_start_key"
-
-    const val readerTheme = "pref_reader_theme_key"
-
-    const val cropBorders = "crop_borders"
-
-    const val cropBordersWebtoon = "crop_borders_webtoon"
-
-    const val readWithTapping = "reader_tap"
-
-    const val readWithLongTap = "reader_long_tap"
-
-    const val readWithVolumeKeys = "reader_volume_keys"
-
-    const val readWithVolumeKeysInverted = "reader_volume_keys_inverted"
-
-    const val portraitColumns = "pref_library_columns_portrait_key"
-
-    const val landscapeColumns = "pref_library_columns_landscape_key"
-
-    const val updateOnlyNonCompleted = "pref_update_only_non_completed_key"
-
-    const val autoUpdateTrack = "pref_auto_update_manga_sync_key"
-
-    const val lastUsedCatalogueSource = "last_catalogue_source"
-
-    const val lastUsedCategory = "last_used_category"
-
-    const val catalogueAsList = "pref_display_catalogue_as_list"
-
-    const val enabledLanguages = "source_languages"
-
-    const val backupDirectory = "backup_directory"
-
-    const val downloadsDirectory = "download_directory"
-
-    const val downloadOnlyOverWifi = "pref_download_only_over_wifi_key"
-
-    const val numberOfBackups = "backup_slots"
-
-    const val backupInterval = "backup_interval"
-
-    const val removeAfterReadSlots = "remove_after_read_slots"
-
-    const val removeAfterMarkedAsRead = "pref_remove_after_marked_as_read_key"
-
-    const val libraryUpdateInterval = "pref_library_update_interval_key"
-
-    const val libraryUpdateRestriction = "library_update_restriction"
-
-    const val libraryUpdateCategories = "library_update_categories"
-
-    const val filterDownloaded = "pref_filter_downloaded_key"
-
-    const val filterUnread = "pref_filter_unread_key"
-
-    const val filterCompleted = "pref_filter_completed_key"
-
-    const val librarySortingMode = "library_sorting_mode"
-
-    const val automaticUpdates = "automatic_updates"
-
-    const val startScreen = "start_screen"
-
-    const val downloadNew = "download_new"
-
-    const val downloadNewCategories = "download_new_categories"
-
-    const val libraryAsList = "pref_display_library_as_list"
-
-    const val lang = "app_language"
-
-    const val defaultCategory = "default_category"
-
-    const val skipRead = "skip_read"
-
-    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"
-
-    fun trackToken(syncId: Int) = "track_token_$syncId"
-
-}
+package eu.kanade.tachiyomi.data.preference
+
+/**
+ * This class stores the keys for the preferences in the application.
+ */
+object PreferenceKeys {
+
+    const val theme = "pref_theme_key"
+
+    const val rotation = "pref_rotation_type_key"
+
+    const val enableTransitions = "pref_enable_transitions_key"
+
+    const val doubleTapAnimationSpeed = "pref_double_tap_anim_speed"
+
+    const val showPageNumber = "pref_show_page_number_key"
+
+    const val trueColor = "pref_true_color_key"
+
+    const val fullscreen = "fullscreen"
+
+    const val keepScreenOn = "pref_keep_screen_on_key"
+
+    const val customBrightness = "pref_custom_brightness_key"
+
+    const val customBrightnessValue = "custom_brightness_value"
+
+    const val colorFilter = "pref_color_filter_key"
+
+    const val colorFilterValue = "color_filter_value"
+
+    const val colorFilterMode = "color_filter_mode"
+
+    const val defaultViewer = "pref_default_viewer_key"
+
+    const val imageScaleType = "pref_image_scale_type_key"
+
+    const val zoomStart = "pref_zoom_start_key"
+
+    const val readerTheme = "pref_reader_theme_key"
+
+    const val cropBorders = "crop_borders"
+
+    const val cropBordersWebtoon = "crop_borders_webtoon"
+
+    const val readWithTapping = "reader_tap"
+
+    const val readWithLongTap = "reader_long_tap"
+
+    const val readWithVolumeKeys = "reader_volume_keys"
+
+    const val readWithVolumeKeysInverted = "reader_volume_keys_inverted"
+
+    const val portraitColumns = "pref_library_columns_portrait_key"
+
+    const val landscapeColumns = "pref_library_columns_landscape_key"
+
+    const val updateOnlyNonCompleted = "pref_update_only_non_completed_key"
+
+    const val autoUpdateTrack = "pref_auto_update_manga_sync_key"
+
+    const val lastUsedCatalogueSource = "last_catalogue_source"
+
+    const val lastUsedCategory = "last_used_category"
+
+    const val catalogueAsList = "pref_display_catalogue_as_list"
+
+    const val enabledLanguages = "source_languages"
+
+    const val backupDirectory = "backup_directory"
+
+    const val downloadsDirectory = "download_directory"
+
+    const val downloadOnlyOverWifi = "pref_download_only_over_wifi_key"
+
+    const val numberOfBackups = "backup_slots"
+
+    const val backupInterval = "backup_interval"
+
+    const val removeAfterReadSlots = "remove_after_read_slots"
+
+    const val removeAfterMarkedAsRead = "pref_remove_after_marked_as_read_key"
+
+    const val libraryUpdateInterval = "pref_library_update_interval_key"
+
+    const val libraryUpdateRestriction = "library_update_restriction"
+
+    const val libraryUpdateCategories = "library_update_categories"
+
+    const val libraryUpdatePrioritization = "library_update_prioritization"
+
+    const val filterDownloaded = "pref_filter_downloaded_key"
+
+    const val filterUnread = "pref_filter_unread_key"
+
+    const val filterCompleted = "pref_filter_completed_key"
+
+    const val librarySortingMode = "library_sorting_mode"
+
+    const val automaticUpdates = "automatic_updates"
+
+    const val startScreen = "start_screen"
+
+    const val downloadNew = "download_new"
+
+    const val downloadNewCategories = "download_new_categories"
+
+    const val libraryAsList = "pref_display_library_as_list"
+
+    const val lang = "app_language"
+
+    const val defaultCategory = "default_category"
+
+    const val skipRead = "skip_read"
+
+    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"
+
+    fun trackToken(syncId: Int) = "track_token_$syncId"
+
+}

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

@@ -57,6 +57,8 @@ class PreferencesHelper(val context: Context) {
 
     fun colorFilterValue() = rxPrefs.getInteger(Keys.colorFilterValue, 0)
 
+    fun colorFilterMode() = rxPrefs.getInteger(Keys.colorFilterMode, 0)
+
     fun defaultViewer() = prefs.getInt(Keys.defaultViewer, 1)
 
     fun imageScaleType() = rxPrefs.getInteger(Keys.imageScaleType, 1)
@@ -141,6 +143,8 @@ class PreferencesHelper(val context: Context) {
 
     fun libraryUpdateCategories() = rxPrefs.getStringSet(Keys.libraryUpdateCategories, emptySet())
 
+    fun libraryUpdatePrioritization() = rxPrefs.getInteger(Keys.libraryUpdatePrioritization, 0)
+
     fun libraryAsList() = rxPrefs.getBoolean(Keys.libraryAsList, false)
 
     fun downloadBadge() = rxPrefs.getBoolean(Keys.downloadBadge, false)

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

@@ -45,11 +45,11 @@ class SharedPreferencesDataStore(private val prefs: SharedPreferences) : Prefere
         prefs.edit().putString(key, value).apply()
     }
 
-    override fun getStringSet(key: String?, defValues: MutableSet<String>?): MutableSet<String> {
+    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/TrackManager.kt

@@ -1,32 +1,36 @@
-package eu.kanade.tachiyomi.data.track
-
-import android.content.Context
-import eu.kanade.tachiyomi.data.track.anilist.Anilist
-import eu.kanade.tachiyomi.data.track.kitsu.Kitsu
-import eu.kanade.tachiyomi.data.track.myanimelist.Myanimelist
-import eu.kanade.tachiyomi.data.track.shikomori.Shikomori
-
-class TrackManager(private val context: Context) {
-
-    companion object {
-        const val MYANIMELIST = 1
-        const val ANILIST = 2
-        const val KITSU = 3
-        const val SHIKOMORI = 4
-    }
-
-    val myAnimeList = Myanimelist(context, MYANIMELIST)
-
-    val aniList = Anilist(context, ANILIST)
-
-    val kitsu = Kitsu(context, KITSU)
-
-    val shikomori = Shikomori(context, SHIKOMORI)
-
-    val services = listOf(myAnimeList, aniList, kitsu, shikomori)
-
-    fun getService(id: Int) = services.find { it.id == id }
-
-    fun hasLoggedServices() = services.any { it.isLogged }
-
-}
+package eu.kanade.tachiyomi.data.track
+
+import android.content.Context
+import eu.kanade.tachiyomi.data.track.anilist.Anilist
+import eu.kanade.tachiyomi.data.track.kitsu.Kitsu
+import eu.kanade.tachiyomi.data.track.myanimelist.Myanimelist
+import eu.kanade.tachiyomi.data.track.shikimori.Shikimori
+import eu.kanade.tachiyomi.data.track.bangumi.Bangumi
+
+class TrackManager(private val context: Context) {
+
+    companion object {
+        const val MYANIMELIST = 1
+        const val ANILIST = 2
+        const val KITSU = 3
+        const val SHIKIMORI = 4
+        const val BANGUMI = 5
+    }
+
+    val myAnimeList = Myanimelist(context, MYANIMELIST)
+
+    val aniList = Anilist(context, ANILIST)
+
+    val kitsu = Kitsu(context, KITSU)
+
+    val shikimori = Shikimori(context, SHIKIMORI)
+
+    val bangumi = Bangumi(context, BANGUMI)
+
+    val services = listOf(myAnimeList, aniList, kitsu, shikimori, bangumi)
+
+    fun getService(id: Int) = services.find { it.id == id }
+
+    fun hasLoggedServices() = services.any { it.isLogged }
+
+}

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

@@ -1,70 +1,70 @@
-package eu.kanade.tachiyomi.data.track
-
-import android.support.annotation.CallSuper
-import android.support.annotation.DrawableRes
-import eu.kanade.tachiyomi.data.database.models.Track
-import eu.kanade.tachiyomi.data.track.model.TrackSearch
-import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.network.NetworkHelper
-import okhttp3.OkHttpClient
-import rx.Completable
-import rx.Observable
-import uy.kohesive.injekt.injectLazy
-
-abstract class TrackService(val id: Int) {
-
-    val preferences: PreferencesHelper by injectLazy()
-    val networkService: NetworkHelper by injectLazy()
-
-    open val client: OkHttpClient
-        get() = networkService.client
-
-    // Name of the manga sync service to display
-    abstract val name: String
-
-    @DrawableRes
-    abstract fun getLogo(): Int
-
-    abstract fun getLogoColor(): Int
-
-    abstract fun getStatusList(): List<Int>
-
-    abstract fun getStatus(status: Int): String
-
-    abstract fun getScoreList(): List<String>
-
-    open fun indexToScore(index: Int): Float {
-        return index.toFloat()
-    }
-
-    abstract fun displayScore(track: Track): String
-
-    abstract fun add(track: Track): Observable<Track>
-
-    abstract fun update(track: Track): Observable<Track>
-
-    abstract fun bind(track: Track): Observable<Track>
-
-    abstract fun search(query: String): Observable<List<TrackSearch>>
-
-    abstract fun refresh(track: Track): Observable<Track>
-
-    abstract fun login(username: String, password: String): Completable
-
-    @CallSuper
-    open fun logout() {
-        preferences.setTrackCredentials(this, "", "")
-    }
-
-    open val isLogged: Boolean
-        get() = !getUsername().isEmpty() &&
-                !getPassword().isEmpty()
-
-    fun getUsername() = preferences.trackUsername(this)!!
-
-    fun getPassword() = preferences.trackPassword(this)!!
-
-    fun saveCredentials(username: String, password: String) {
-        preferences.setTrackCredentials(this, username, password)
-    }
-}
+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
+import rx.Completable
+import rx.Observable
+import uy.kohesive.injekt.injectLazy
+
+abstract class TrackService(val id: Int) {
+
+    val preferences: PreferencesHelper by injectLazy()
+    val networkService: NetworkHelper by injectLazy()
+
+    open val client: OkHttpClient
+        get() = networkService.client
+
+    // Name of the manga sync service to display
+    abstract val name: String
+
+    @DrawableRes
+    abstract fun getLogo(): Int
+
+    abstract fun getLogoColor(): Int
+
+    abstract fun getStatusList(): List<Int>
+
+    abstract fun getStatus(status: Int): String
+
+    abstract fun getScoreList(): List<String>
+
+    open fun indexToScore(index: Int): Float {
+        return index.toFloat()
+    }
+
+    abstract fun displayScore(track: Track): String
+
+    abstract fun add(track: Track): Observable<Track>
+
+    abstract fun update(track: Track): Observable<Track>
+
+    abstract fun bind(track: Track): Observable<Track>
+
+    abstract fun search(query: String): Observable<List<TrackSearch>>
+
+    abstract fun refresh(track: Track): Observable<Track>
+
+    abstract fun login(username: String, password: String): Completable
+
+    @CallSuper
+    open fun logout() {
+        preferences.setTrackCredentials(this, "", "")
+    }
+
+    open val isLogged: Boolean
+        get() = !getUsername().isEmpty() &&
+                !getPassword().isEmpty()
+
+    fun getUsername() = preferences.trackUsername(this)!!
+
+    fun getPassword() = preferences.trackPassword(this)!!
+
+    fun saveCredentials(username: String, password: String) {
+        preferences.setTrackCredentials(this, username, password)
+    }
+}

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

@@ -1,214 +1,214 @@
-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) {
-
-    companion object {
-        const val READING = 1
-        const val COMPLETED = 2
-        const val ON_HOLD = 3
-        const val DROPPED = 4
-        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 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, PLANNING, REPEATING)
-    }
-
-    override fun getStatus(status: Int): String = with(context) {
-        when (status) {
-            READING -> getString(R.string.reading)
-            COMPLETED -> getString(R.string.completed)
-            ON_HOLD -> getString(R.string.on_hold)
-            DROPPED -> getString(R.string.dropped)
-            PLANNING -> getString(R.string.plan_to_read)
-            REPEATING -> getString(R.string.repeating)
-            else -> ""
-        }
-    }
-
-    override fun getScoreList(): List<String> {
-        return when (scorePreference.getOrDefault()) {
-            // 10 point
-            POINT_10 -> IntRange(0, 10).map(Int::toString)
-            // 100 point
-            POINT_100 -> IntRange(0, 100).map(Int::toString)
-            // 5 stars
-            POINT_5 -> IntRange(0, 5).map { "$it ★" }
-            // Smiley
-            POINT_3 -> listOf("-", "😦", "😐", "😊")
-            // 10 point decimal
-            POINT_10_DECIMAL -> IntRange(0, 100).map { (it / 10f).toString() }
-            else -> throw Exception("Unknown score type")
-        }
-    }
-
-    override fun indexToScore(index: Int): Float {
-        return when (scorePreference.getOrDefault()) {
-            // 10 point
-            POINT_10 -> index * 10f
-            // 100 point
-            POINT_100 -> index.toFloat()
-            // 5 stars
-            POINT_5 -> when {
-                index == 0 -> 0f
-                else -> index * 20f - 10f
-            }
-            // Smiley
-            POINT_3 -> when {
-                index == 0 -> 0f
-                else -> index * 25f + 10f
-            }
-            // 10 point decimal
-            POINT_10_DECIMAL -> index.toFloat()
-            else -> throw Exception("Unknown score type")
-        }
-    }
-
-    override fun displayScore(track: Track): String {
-        val score = track.score
-
-        return when (scorePreference.getOrDefault()) {
-            POINT_5 -> when {
-                score == 0f -> "0 ★"
-                else -> "${((score + 10) / 20).toInt()} ★"
-            }
-            POINT_3 -> when {
-                score == 0f -> "0"
-                score <= 35 -> "😦"
-                score <= 60 -> "😐"
-                else -> "😊"
-            }
-            else -> track.toAnilistScore()
-        }
-    }
-
-    override fun add(track: Track): Observable<Track> {
-        return api.addLibManga(track)
-    }
-
-    override fun update(track: Track): Observable<Track> {
-        if (track.total_chapters != 0 && track.last_chapter_read == track.total_chapters) {
-            track.status = COMPLETED
-        }
-        // 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().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
-                        track.score = DEFAULT_SCORE.toFloat()
-                        track.status = DEFAULT_STATUS
-                        add(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().toInt())
-                .map { remoteTrack ->
-                    track.copyPersonalFrom(remoteTrack)
-                    track.total_chapters = remoteTrack.total_chapters
-                    track
-                }
-    }
-
-    override fun login(username: String, password: String) = login(password)
-
-    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
-        }
-    }
-
-}
-
+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) {
+
+    companion object {
+        const val READING = 1
+        const val COMPLETED = 2
+        const val ON_HOLD = 3
+        const val DROPPED = 4
+        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 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, PLANNING, REPEATING)
+    }
+
+    override fun getStatus(status: Int): String = with(context) {
+        when (status) {
+            READING -> getString(R.string.reading)
+            COMPLETED -> getString(R.string.completed)
+            ON_HOLD -> getString(R.string.on_hold)
+            DROPPED -> getString(R.string.dropped)
+            PLANNING -> getString(R.string.plan_to_read)
+            REPEATING -> getString(R.string.repeating)
+            else -> ""
+        }
+    }
+
+    override fun getScoreList(): List<String> {
+        return when (scorePreference.getOrDefault()) {
+            // 10 point
+            POINT_10 -> IntRange(0, 10).map(Int::toString)
+            // 100 point
+            POINT_100 -> IntRange(0, 100).map(Int::toString)
+            // 5 stars
+            POINT_5 -> IntRange(0, 5).map { "$it ★" }
+            // Smiley
+            POINT_3 -> listOf("-", "😦", "😐", "😊")
+            // 10 point decimal
+            POINT_10_DECIMAL -> IntRange(0, 100).map { (it / 10f).toString() }
+            else -> throw Exception("Unknown score type")
+        }
+    }
+
+    override fun indexToScore(index: Int): Float {
+        return when (scorePreference.getOrDefault()) {
+            // 10 point
+            POINT_10 -> index * 10f
+            // 100 point
+            POINT_100 -> index.toFloat()
+            // 5 stars
+            POINT_5 -> when {
+                index == 0 -> 0f
+                else -> index * 20f - 10f
+            }
+            // Smiley
+            POINT_3 -> when {
+                index == 0 -> 0f
+                else -> index * 25f + 10f
+            }
+            // 10 point decimal
+            POINT_10_DECIMAL -> index.toFloat()
+            else -> throw Exception("Unknown score type")
+        }
+    }
+
+    override fun displayScore(track: Track): String {
+        val score = track.score
+
+        return when (scorePreference.getOrDefault()) {
+            POINT_5 -> when {
+                score == 0f -> "0 ★"
+                else -> "${((score + 10) / 20).toInt()} ★"
+            }
+            POINT_3 -> when {
+                score == 0f -> "0"
+                score <= 35 -> "😦"
+                score <= 60 -> "😐"
+                else -> "😊"
+            }
+            else -> track.toAnilistScore()
+        }
+    }
+
+    override fun add(track: Track): Observable<Track> {
+        return api.addLibManga(track)
+    }
+
+    override fun update(track: Track): Observable<Track> {
+        if (track.total_chapters != 0 && track.last_chapter_read == track.total_chapters) {
+            track.status = COMPLETED
+        }
+        // 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().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
+                        track.score = DEFAULT_SCORE.toFloat()
+                        track.status = DEFAULT_STATUS
+                        add(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().toInt())
+                .map { remoteTrack ->
+                    track.copyPersonalFrom(remoteTrack)
+                    track.total_chapters = remoteTrack.total_chapters
+                    track
+                }
+    }
+
+    override fun login(username: String, password: String) = login(password)
+
+    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,286 +1,286 @@
-package eu.kanade.tachiyomi.data.track.anilist
-
-import android.net.Uri
-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.data.track.model.TrackSearch
-import eu.kanade.tachiyomi.network.asObservableSuccess
-import okhttp3.MediaType
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.RequestBody
-import rx.Observable
-import java.util.Calendar
-
-
-class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
-
-    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> {
-        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> {
-        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(search: String): Observable<List<TrackSearch>> {
-        val query = """
-            query Search(${'$'}query: String) {
-                  Page (perPage: 50) {
-                    media(search: ${'$'}query, type: MANGA, format_not_in: [NOVEL]) {
-                      id
-                      title {
-                        romaji
-                      }
-                      coverImage {
-                        large
-                      }
-                      type
-                      status
-                      chapters
-                      description
-                      startDate {
-                        year
-                        month
-                        day
-                      }
-                    }
-                  }
-                }
-            """
-        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, 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
-                      description
-                      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, userid: Int): Observable<Track> {
-        return findLibManga(track, userid)
-                .map { it ?: throw Exception("Could not find manga") }
-    }
-
-    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()
-        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 jsonToALManga(struct: JsonObject): ALManga{
-        val date = try {
-            val date = Calendar.getInstance()
-            date.set(struct["startDate"]["year"].nullInt ?: 0, (struct["startDate"]["month"].nullInt ?: 0) - 1,
-                    struct["startDate"]["day"].nullInt ?: 0)
-            date.timeInMillis
-        } catch (_: Exception) {
-            0L
-        }
-
-        return ALManga(struct["id"].asInt, struct["title"]["romaji"].asString, struct["coverImage"]["large"].asString,
-                struct["description"].nullString.orEmpty(), struct["type"].asString, struct["status"].asString,
-                date, struct["chapters"].nullInt ?: 0)
-    }
-
-    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 = "385"
-        private const val clientUrl = "tachiyomi://anilist-auth"
-        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 mangaUrl(mediaId: Int): String {
-            return baseMangaUrl + mediaId
-        }
-
-        fun authUrl() = Uri.parse("${baseUrl}oauth/authorize").buildUpon()
-                .appendQueryParameter("client_id", clientId)
-                .appendQueryParameter("response_type", "token")
-                .build()
-    }
-
-}
+package eu.kanade.tachiyomi.data.track.anilist
+
+import android.net.Uri
+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.data.track.model.TrackSearch
+import eu.kanade.tachiyomi.network.asObservableSuccess
+import okhttp3.MediaType
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody
+import rx.Observable
+import java.util.Calendar
+
+
+class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
+
+    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> {
+        val query = """
+            |mutation AddManga(${'$'}mangaId: Int, ${'$'}progress: Int, ${'$'}status: MediaListStatus) {
+                |SaveMediaListEntry (mediaId: ${'$'}mangaId, progress: ${'$'}progress, status: ${'$'}status) { 
+                |   id 
+                |   status 
+                |} 
+            |}
+            |""".trimMargin()
+        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> {
+        val query = """
+            |mutation UpdateManga(${'$'}listId: Int, ${'$'}progress: Int, ${'$'}status: MediaListStatus, ${'$'}score: Int) {
+                |SaveMediaListEntry (id: ${'$'}listId, progress: ${'$'}progress, status: ${'$'}status, scoreRaw: ${'$'}score) {
+                    |id
+                    |status
+                    |progress
+                |}
+            |}
+            |""".trimMargin()
+        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(search: String): Observable<List<TrackSearch>> {
+        val query = """
+            |query Search(${'$'}query: String) {
+                |Page (perPage: 50) {
+                    |media(search: ${'$'}query, type: MANGA, format_not_in: [NOVEL]) {
+                        |id
+                        |title {
+                            |romaji
+                        |}
+                        |coverImage {
+                            |large
+                        |}
+                        |type
+                        |status
+                        |chapters
+                        |description
+                        |startDate {
+                            |year
+                            |month
+                            |day
+                        |}
+                    |}
+                |}
+            |}
+            |""".trimMargin()
+        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, 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
+                            |description
+                            |startDate {
+                                |year
+                                |month
+                                |day
+                            |}
+                        |}
+                    |}
+                |}
+            |}
+            |""".trimMargin()
+        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, userid: Int): Observable<Track> {
+        return findLibManga(track, userid)
+                .map { it ?: throw Exception("Could not find manga") }
+    }
+
+    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
+                    |}
+                |}
+            |}
+            |""".trimMargin()
+        val payload = jsonObject(
+                "query" to query
+        )
+        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 viewer = data["Viewer"].obj
+                    Pair(viewer["id"].asInt, viewer["mediaListOptions"]["scoreFormat"].asString)
+                }
+    }
+
+    private fun jsonToALManga(struct: JsonObject): ALManga {
+        val date = try {
+            val date = Calendar.getInstance()
+            date.set(struct["startDate"]["year"].nullInt ?: 0, (struct["startDate"]["month"].nullInt ?: 0) - 1,
+                    struct["startDate"]["day"].nullInt ?: 0)
+            date.timeInMillis
+        } catch (_: Exception) {
+            0L
+        }
+
+        return ALManga(struct["id"].asInt, struct["title"]["romaji"].asString, struct["coverImage"]["large"].asString,
+                struct["description"].nullString.orEmpty(), struct["type"].asString, struct["status"].asString,
+                date, struct["chapters"].nullInt ?: 0)
+    }
+
+    private 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 = "385"
+        private const val clientUrl = "tachiyomi://anilist-auth"
+        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 mangaUrl(mediaId: Int): String {
+            return baseMangaUrl + mediaId
+        }
+
+        fun authUrl() = Uri.parse("${baseUrl}oauth/authorize").buildUpon()
+                .appendQueryParameter("client_id", clientId)
+                .appendQueryParameter("response_type", "token")
+                .build()
+    }
+
+}

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

@@ -1,58 +1,58 @@
-package eu.kanade.tachiyomi.data.track.anilist
-
-import okhttp3.Interceptor
-import okhttp3.Response
-
-
-class AnilistInterceptor(val anilist: Anilist, private var token: String?) : Interceptor {
-
-    /**
-     * OAuth object used for authenticated requests.
-     *
-     * Anilist returns the date without milliseconds. We fix that and make the token expire 1 minute
-     * before its original expiration date.
-     */
-    private var oauth: OAuth? = null
-        set(value) {
-            field = value?.copy(expires = value.expires * 1000 - 60 * 1000)
-        }
-
-    override fun intercept(chain: Interceptor.Chain): Response {
-        val originalRequest = chain.request()
-
-        if (token.isNullOrEmpty()) {
-            throw Exception("Not authenticated with Anilist")
-        }
-        if (oauth == null){
-            oauth = anilist.loadOAuth()
-        }
-        // Refresh access token if null or expired.
-        if (oauth!!.isExpired()) {
-            anilist.logout()
-            throw Exception("Token expired")
-        }
-
-        // Throw on null auth.
-        if (oauth == null) {
-            throw Exception("No authentication token")
-        }
-
-        // Add the authorization header to the original request.
-        val authRequest = originalRequest.newBuilder()
-                .addHeader("Authorization", "Bearer ${oauth!!.access_token}")
-                .build()
-
-        return chain.proceed(authRequest)
-    }
-
-    /**
-     * Called when the user authenticates with Anilist for the first time. Sets the refresh token
-     * and the oauth object.
-     */
-    fun setAuth(oauth: OAuth?) {
-        token = oauth?.access_token
-        this.oauth = oauth
-        anilist.saveOAuth(oauth)
-    }
-
+package eu.kanade.tachiyomi.data.track.anilist
+
+import okhttp3.Interceptor
+import okhttp3.Response
+
+
+class AnilistInterceptor(val anilist: Anilist, private var token: String?) : Interceptor {
+
+    /**
+     * OAuth object used for authenticated requests.
+     *
+     * Anilist returns the date without milliseconds. We fix that and make the token expire 1 minute
+     * before its original expiration date.
+     */
+    private var oauth: OAuth? = null
+        set(value) {
+            field = value?.copy(expires = value.expires * 1000 - 60 * 1000)
+        }
+
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val originalRequest = chain.request()
+
+        if (token.isNullOrEmpty()) {
+            throw Exception("Not authenticated with Anilist")
+        }
+        if (oauth == null){
+            oauth = anilist.loadOAuth()
+        }
+        // Refresh access token if null or expired.
+        if (oauth!!.isExpired()) {
+            anilist.logout()
+            throw Exception("Token expired")
+        }
+
+        // Throw on null auth.
+        if (oauth == null) {
+            throw Exception("No authentication token")
+        }
+
+        // Add the authorization header to the original request.
+        val authRequest = originalRequest.newBuilder()
+                .addHeader("Authorization", "Bearer ${oauth!!.access_token}")
+                .build()
+
+        return chain.proceed(authRequest)
+    }
+
+    /**
+     * Called when the user authenticates with Anilist for the first time. Sets the refresh token
+     * and the oauth object.
+     */
+    fun setAuth(oauth: OAuth?) {
+        token = oauth?.access_token
+        this.oauth = oauth
+        anilist.saveOAuth(oauth)
+    }
+
 }

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

@@ -1,10 +1,10 @@
-package eu.kanade.tachiyomi.data.track.anilist
-
-data class OAuth(
-        val access_token: String,
-        val token_type: String,
-        val expires: Long,
-        val expires_in: Long) {
-
-    fun isExpired() = System.currentTimeMillis() > expires
+package eu.kanade.tachiyomi.data.track.anilist
+
+data class OAuth(
+        val access_token: String,
+        val token_type: String,
+        val expires: Long,
+        val expires_in: Long) {
+
+    fun isExpired() = System.currentTimeMillis() > expires
 }

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

@@ -0,0 +1,7 @@
+package eu.kanade.tachiyomi.data.track.bangumi
+
+data class Avatar(
+  val large: String? = "",
+  val medium: String? = "",
+  val small: String? = ""
+)

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

@@ -0,0 +1,144 @@
+package eu.kanade.tachiyomi.data.track.bangumi
+
+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.track.TrackService
+import eu.kanade.tachiyomi.data.track.model.TrackSearch
+import rx.Completable
+import rx.Observable
+import uy.kohesive.injekt.injectLazy
+
+class Bangumi(private val context: Context, id: Int) : TrackService(id) {
+
+  override fun getScoreList(): List<String> {
+    return IntRange(0, 10).map(Int::toString)
+  }
+
+  override fun displayScore(track: Track): String {
+    return track.score.toInt().toString()
+  }
+
+  override fun add(track: Track): Observable<Track> {
+    return api.addLibManga(track)
+  }
+
+  override fun update(track: Track): Observable<Track> {
+    if (track.total_chapters != 0 && track.last_chapter_read == track.total_chapters) {
+      track.status = COMPLETED
+    }
+    return api.updateLibManga(track)
+  }
+
+  override fun bind(track: Track): Observable<Track> {
+    return api.statusLibManga(track)
+      .flatMap {
+        api.findLibManga(track).flatMap { remoteTrack ->
+          if (remoteTrack != null && it != null) {
+            track.copyPersonalFrom(remoteTrack)
+            track.library_id = remoteTrack.library_id
+            track.status = remoteTrack.status
+            track.last_chapter_read = remoteTrack.last_chapter_read
+            refresh(track)
+          } else {
+            // Set default fields if it's not found in the list
+            track.score = DEFAULT_SCORE.toFloat()
+            track.status = DEFAULT_STATUS
+            add(track)
+            update(track)
+          }
+        }
+      }
+  }
+
+  override fun search(query: String): Observable<List<TrackSearch>> {
+    return api.search(query)
+  }
+
+  override fun refresh(track: Track): Observable<Track> {
+    return api.statusLibManga(track)
+      .flatMap {
+        track.copyPersonalFrom(it!!)
+        api.findLibManga(track)
+          .map { remoteTrack ->
+            if (remoteTrack != null) {
+              track.total_chapters = remoteTrack.total_chapters
+              track.status = remoteTrack.status
+            }
+            track
+          }
+      }
+  }
+
+  companion object {
+    const val READING = 3
+    const val COMPLETED = 2
+    const val ON_HOLD = 4
+    const val DROPPED = 5
+    const val PLANNING = 1
+
+    const val DEFAULT_STATUS = READING
+    const val DEFAULT_SCORE = 0
+  }
+
+  override val name = "Bangumi"
+
+  private val gson: Gson by injectLazy()
+
+  private val interceptor by lazy { BangumiInterceptor(this, gson) }
+
+  private val api by lazy { BangumiApi(client, interceptor) }
+
+  override fun getLogo() = R.drawable.bangumi
+
+  override fun getLogoColor() = Color.rgb(0xF0, 0x91, 0x99)
+
+  override fun getStatusList(): List<Int> {
+    return listOf(READING, COMPLETED, ON_HOLD, DROPPED, PLANNING)
+  }
+
+  override fun getStatus(status: Int): String = with(context) {
+    when (status) {
+      READING -> getString(R.string.reading)
+      COMPLETED -> getString(R.string.completed)
+      ON_HOLD -> getString(R.string.on_hold)
+      DROPPED -> getString(R.string.dropped)
+      PLANNING -> getString(R.string.plan_to_read)
+      else -> ""
+    }
+  }
+
+  override fun login(username: String, password: String) = login(password)
+
+  fun login(code: String): Completable {
+    return api.accessToken(code).map { oauth: OAuth? ->
+      interceptor.newAuth(oauth)
+      if (oauth != null) {
+        saveCredentials(oauth.user_id.toString(), oauth.access_token)
+      }
+    }.doOnError {
+      logout()
+    }.toCompletable()
+  }
+
+  fun saveToken(oauth: OAuth?) {
+    val json = gson.toJson(oauth)
+    preferences.trackToken(this).set(json)
+  }
+
+  fun restoreToken(): OAuth? {
+    return try {
+      gson.fromJson(preferences.trackToken(this).get(), OAuth::class.java)
+    } catch (e: Exception) {
+      null
+    }
+  }
+
+  override fun logout() {
+    super.logout()
+    preferences.trackToken(this).set(null)
+    interceptor.newAuth(null)
+  }
+}

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

@@ -0,0 +1,211 @@
+package eu.kanade.tachiyomi.data.track.bangumi
+
+import android.net.Uri
+import com.github.salomonbrys.kotson.array
+import com.github.salomonbrys.kotson.obj
+import com.google.gson.Gson
+import com.google.gson.JsonObject
+import com.google.gson.JsonParser
+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.POST
+import eu.kanade.tachiyomi.network.asObservableSuccess
+import okhttp3.CacheControl
+import okhttp3.FormBody
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import rx.Observable
+import uy.kohesive.injekt.injectLazy
+import java.net.URLEncoder
+
+class BangumiApi(private val client: OkHttpClient, interceptor: BangumiInterceptor) {
+
+  private val gson: Gson by injectLazy()
+  private val parser = JsonParser()
+  private val authClient = client.newBuilder().addInterceptor(interceptor).build()
+
+  fun addLibManga(track: Track): Observable<Track> {
+    val body = FormBody.Builder()
+      .add("rating", track.score.toInt().toString())
+      .add("status", track.toBangumiStatus())
+      .build()
+    val request = Request.Builder()
+      .url("$apiUrl/collection/${track.media_id}/update")
+      .post(body)
+      .build()
+    return authClient.newCall(request)
+      .asObservableSuccess()
+      .map {
+        track
+      }
+  }
+
+  fun updateLibManga(track: Track): Observable<Track> {
+    // chapter update
+    val body = FormBody.Builder()
+      .add("watched_eps", track.last_chapter_read.toString())
+      .build()
+    val request = Request.Builder()
+      .url("$apiUrl/subject/${track.media_id}/update/watched_eps")
+      .post(body)
+      .build()
+
+    // read status update
+    val sbody = FormBody.Builder()
+      .add("status", track.toBangumiStatus())
+      .build()
+    val srequest = Request.Builder()
+      .url("$apiUrl/collection/${track.media_id}/update")
+      .post(sbody)
+      .build()
+    return authClient.newCall(srequest)
+      .asObservableSuccess()
+      .map {
+        track
+      }.flatMap {
+        authClient.newCall(request)
+          .asObservableSuccess()
+          .map {
+            track
+          }
+      }
+  }
+
+  fun search(search: String): Observable<List<TrackSearch>> {
+    val url = Uri.parse(
+      "$apiUrl/search/subject/${URLEncoder.encode(search, Charsets.UTF_8.name())}").buildUpon()
+      .appendQueryParameter("max_results", "20")
+      .build()
+    val request = Request.Builder()
+      .url(url.toString())
+      .get()
+      .build()
+    return authClient.newCall(request)
+      .asObservableSuccess()
+      .map { netResponse ->
+        var responseBody = netResponse.body()?.string().orEmpty()
+        if (responseBody.isEmpty()) {
+          throw Exception("Null Response")
+        }
+        if(responseBody.contains("\"code\":404")){
+          responseBody = "{\"results\":0,\"list\":[]}"
+        }
+        val response = parser.parse(responseBody).obj["list"]?.array
+        response?.filter { it.obj["type"].asInt == 1 }?.map { jsonToSearch(it.obj) }
+      }
+
+  }
+
+  private fun jsonToSearch(obj: JsonObject): TrackSearch {
+    return TrackSearch.create(TrackManager.BANGUMI).apply {
+      media_id = obj["id"].asInt
+      title = obj["name_cn"].asString
+      cover_url = obj["images"].obj["common"].asString
+      summary = obj["name"].asString
+      tracking_url = obj["url"].asString
+    }
+  }
+
+  private fun jsonToTrack(mangas: JsonObject): Track {
+    return Track.create(TrackManager.BANGUMI).apply {
+      title = mangas["name"].asString
+      media_id = mangas["id"].asInt
+      score = if (mangas["rating"] != null)
+        (if (mangas["rating"].isJsonObject) mangas["rating"].obj["score"].asFloat else 0f)
+      else 0f
+      status = Bangumi.DEFAULT_STATUS
+      tracking_url = mangas["url"].asString
+    }
+  }
+
+  fun findLibManga(track: Track): Observable<Track?> {
+    val urlMangas = "$apiUrl/subject/${track.media_id}"
+    val requestMangas = Request.Builder()
+      .url(urlMangas)
+      .get()
+      .build()
+
+    return authClient.newCall(requestMangas)
+      .asObservableSuccess()
+      .map { netResponse ->
+        // get comic info
+        val responseBody = netResponse.body()?.string().orEmpty()
+        jsonToTrack(parser.parse(responseBody).obj)
+      }
+  }
+
+  fun statusLibManga(track: Track): Observable<Track?> {
+    val urlUserRead = "$apiUrl/collection/${track.media_id}"
+    val requestUserRead = Request.Builder()
+      .url(urlUserRead)
+      .cacheControl(CacheControl.FORCE_NETWORK)
+      .get()
+      .build()
+
+    // todo get user readed chapter here
+    return authClient.newCall(requestUserRead)
+      .asObservableSuccess()
+      .map { netResponse ->
+        val resp = netResponse.body()?.string()
+        val coll = gson.fromJson(resp, Collection::class.java)
+        track.status = coll.status?.id!!
+        track.last_chapter_read = coll.ep_status!!
+        track
+      }
+  }
+
+  fun accessToken(code: String): Observable<OAuth> {
+    return client.newCall(accessTokenRequest(code)).asObservableSuccess().map { netResponse ->
+      val responseBody = netResponse.body()?.string().orEmpty()
+      if (responseBody.isEmpty()) {
+        throw Exception("Null Response")
+      }
+      gson.fromJson(responseBody, OAuth::class.java)
+    }
+  }
+
+  private fun accessTokenRequest(code: String) = POST(oauthUrl,
+    body = FormBody.Builder()
+      .add("grant_type", "authorization_code")
+      .add("client_id", clientId)
+      .add("client_secret", clientSecret)
+      .add("code", code)
+      .add("redirect_uri", redirectUrl)
+      .build()
+  )
+
+  companion object {
+    private const val clientId = "bgm10555cda0762e80ca"
+    private const val clientSecret = "8fff394a8627b4c388cbf349ec865775"
+
+    private const val baseUrl = "https://bangumi.org"
+    private const val apiUrl = "https://api.bgm.tv"
+    private const val oauthUrl = "https://bgm.tv/oauth/access_token"
+    private const val loginUrl = "https://bgm.tv/oauth/authorize"
+
+    private const val redirectUrl = "tachiyomi://bangumi-auth"
+    private const val baseMangaUrl = "$apiUrl/mangas"
+
+    fun mangaUrl(remoteId: Int): String {
+      return "$baseMangaUrl/$remoteId"
+    }
+
+    fun authUrl() =
+      Uri.parse(loginUrl).buildUpon()
+        .appendQueryParameter("client_id", clientId)
+        .appendQueryParameter("response_type", "code")
+        .appendQueryParameter("redirect_uri", redirectUrl)
+        .build()
+
+    fun refreshTokenRequest(token: String) = POST(oauthUrl,
+      body = FormBody.Builder()
+        .add("grant_type", "refresh_token")
+        .add("client_id", clientId)
+        .add("client_secret", clientSecret)
+        .add("refresh_token", token)
+        .add("redirect_uri", redirectUrl)
+        .build())
+  }
+
+}

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

@@ -0,0 +1,61 @@
+package eu.kanade.tachiyomi.data.track.bangumi
+
+import com.google.gson.Gson
+import okhttp3.FormBody
+import okhttp3.Interceptor
+import okhttp3.Response
+
+class BangumiInterceptor(val bangumi: Bangumi, val gson: Gson) : Interceptor {
+
+  /**
+   * OAuth object used for authenticated requests.
+   */
+  private var oauth: OAuth? = bangumi.restoreToken()
+
+  fun addTocken(tocken: String, oidFormBody: FormBody): FormBody {
+    val newFormBody = FormBody.Builder()
+    for (i in 0 until oidFormBody.size()) {
+      newFormBody.add(oidFormBody.name(i), oidFormBody.value(i))
+    }
+    newFormBody.add("access_token", tocken)
+    return newFormBody.build()
+  }
+
+  override fun intercept(chain: Interceptor.Chain): Response {
+    val originalRequest = chain.request()
+
+    val currAuth = oauth ?: throw Exception("Not authenticated with Bangumi")
+
+    if (currAuth.isExpired()) {
+      val response = chain.proceed(BangumiApi.refreshTokenRequest(currAuth.refresh_token!!))
+      if (response.isSuccessful) {
+        newAuth(gson.fromJson(response.body()!!.string(), OAuth::class.java))
+      } else {
+        response.close()
+      }
+    }
+
+    var authRequest = if (originalRequest.method() == "GET") originalRequest.newBuilder()
+      .header("User-Agent", "Tachiyomi")
+      .url(originalRequest.url().newBuilder()
+        .addQueryParameter("access_token", currAuth.access_token).build())
+      .build() else originalRequest.newBuilder()
+      .post(addTocken(currAuth.access_token, originalRequest.body() as FormBody))
+      .header("User-Agent", "Tachiyomi")
+      .build()
+
+    return chain.proceed(authRequest)
+  }
+
+  fun newAuth(oauth: OAuth?) {
+    this.oauth = if (oauth == null) null else OAuth(
+      oauth.access_token,
+      oauth.token_type,
+      System.currentTimeMillis() / 1000,
+      oauth.expires_in,
+      oauth.refresh_token,
+      this.oauth?.user_id)
+
+    bangumi.saveToken(oauth)
+  }
+}

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

@@ -0,0 +1,22 @@
+package eu.kanade.tachiyomi.data.track.bangumi
+
+import eu.kanade.tachiyomi.data.database.models.Track
+
+fun Track.toBangumiStatus() = when (status) {
+  Bangumi.READING -> "do"
+  Bangumi.COMPLETED -> "collect"
+  Bangumi.ON_HOLD -> "on_hold"
+  Bangumi.DROPPED -> "dropped"
+  Bangumi.PLANNING -> "wish"
+  else -> throw NotImplementedError("Unknown status")
+}
+
+fun toTrackStatus(status: String) = when (status) {
+  "do" -> Bangumi.READING
+  "collect" -> Bangumi.COMPLETED
+  "on_hold" -> Bangumi.ON_HOLD
+  "dropped" -> Bangumi.DROPPED
+  "wish" -> Bangumi.PLANNING
+
+  else -> throw Exception("Unknown status")
+}

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

@@ -0,0 +1,13 @@
+package eu.kanade.tachiyomi.data.track.bangumi
+
+data class Collection(
+  val `private`: Int? = 0,
+  val comment: String? = "",
+  val ep_status: Int? = 0,
+  val lasttouch: Int? = 0,
+  val rating: Int? = 0,
+  val status: Status? = Status(),
+  val tag: List<String?>? = listOf(),
+  val user: User? = User(),
+  val vol_status: Int? = 0
+)

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

@@ -0,0 +1,16 @@
+package eu.kanade.tachiyomi.data.track.bangumi
+
+data class OAuth(
+  val access_token: String,
+  val token_type: String,
+  val created_at: Long,
+  val expires_in: Long,
+  val refresh_token: String?,
+  val user_id: Long?
+) {
+
+  // Access token refersh before expired
+  fun isExpired() = (System.currentTimeMillis() / 1000) > (created_at + expires_in - 3600)
+
+}
+

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

@@ -0,0 +1,7 @@
+package eu.kanade.tachiyomi.data.track.bangumi
+
+data class Status(
+  val id: Int? = 0,
+  val name: String? = "",
+  val type: String? = ""
+)

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

@@ -0,0 +1,11 @@
+package eu.kanade.tachiyomi.data.track.bangumi
+
+data class User(
+  val avatar: Avatar? = Avatar(),
+  val id: Int? = 0,
+  val nickname: String? = "",
+  val sign: String? = "",
+  val url: String? = "",
+  val usergroup: Int? = 0,
+  val username: String? = ""
+)

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

@@ -1,144 +1,144 @@
-package eu.kanade.tachiyomi.data.track.kitsu
-
-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.track.TrackService
-import eu.kanade.tachiyomi.data.track.model.TrackSearch
-import rx.Completable
-import rx.Observable
-import uy.kohesive.injekt.injectLazy
-import java.text.DecimalFormat
-
-class Kitsu(private val context: Context, id: Int) : TrackService(id) {
-
-    companion object {
-        const val READING = 1
-        const val COMPLETED = 2
-        const val ON_HOLD = 3
-        const val DROPPED = 4
-        const val PLAN_TO_READ = 5
-
-        const val DEFAULT_STATUS = READING
-        const val DEFAULT_SCORE = 0f
-    }
-
-    override val name = "Kitsu"
-
-    private val gson: Gson by injectLazy()
-
-    private val interceptor by lazy { KitsuInterceptor(this, gson) }
-
-    private val api by lazy { KitsuApi(client, interceptor) }
-
-    override fun getLogo(): Int {
-        return R.drawable.kitsu
-    }
-
-    override fun getLogoColor(): Int {
-        return Color.rgb(51, 37, 50)
-    }
-
-    override fun getStatusList(): List<Int> {
-        return listOf(READING, COMPLETED, ON_HOLD, DROPPED, PLAN_TO_READ)
-    }
-
-    override fun getStatus(status: Int): String = with(context) {
-        when (status) {
-            READING -> getString(R.string.reading)
-            COMPLETED -> getString(R.string.completed)
-            ON_HOLD -> getString(R.string.on_hold)
-            DROPPED -> getString(R.string.dropped)
-            PLAN_TO_READ -> getString(R.string.plan_to_read)
-            else -> ""
-        }
-    }
-
-    override fun getScoreList(): List<String> {
-        val df = DecimalFormat("0.#")
-        return listOf("0") + IntRange(2, 20).map { df.format(it / 2f) }
-    }
-
-    override fun indexToScore(index: Int): Float {
-        return if (index > 0) (index + 1) / 2f else 0f
-    }
-
-    override fun displayScore(track: Track): String {
-        val df = DecimalFormat("0.#")
-        return df.format(track.score)
-    }
-
-    override fun add(track: Track): Observable<Track> {
-        return api.addLibManga(track, getUserId())
-    }
-
-    override fun update(track: Track): Observable<Track> {
-        if (track.total_chapters != 0 && track.last_chapter_read == track.total_chapters) {
-            track.status = COMPLETED
-        }
-
-        return api.updateLibManga(track)
-    }
-
-    override fun bind(track: Track): Observable<Track> {
-        return api.findLibManga(track, getUserId())
-                .flatMap { remoteTrack ->
-                    if (remoteTrack != null) {
-                        track.copyPersonalFrom(remoteTrack)
-                        track.media_id = remoteTrack.media_id
-                        update(track)
-                    } else {
-                        track.score = DEFAULT_SCORE
-                        track.status = DEFAULT_STATUS
-                        add(track)
-                    }
-                }
-    }
-
-    override fun search(query: String): Observable<List<TrackSearch>> {
-        return api.search(query)
-    }
-
-    override fun refresh(track: Track): Observable<Track> {
-        return api.getLibManga(track)
-                .map { remoteTrack ->
-                    track.copyPersonalFrom(remoteTrack)
-                    track.total_chapters = remoteTrack.total_chapters
-                    track
-                }
-    }
-
-    override fun login(username: String, password: String): Completable {
-        return api.login(username, password)
-                .doOnNext { interceptor.newAuth(it) }
-                .flatMap { api.getCurrentUser() }
-                .doOnNext { userId -> saveCredentials(username, userId) }
-                .doOnError { logout() }
-                .toCompletable()
-    }
-
-    override fun logout() {
-        super.logout()
-        interceptor.newAuth(null)
-    }
-
-    private fun getUserId(): String {
-        return getPassword()
-    }
-
-    fun saveToken(oauth: OAuth?) {
-        val json = gson.toJson(oauth)
-        preferences.trackToken(this).set(json)
-    }
-
-    fun restoreToken(): OAuth? {
-        return try {
-            gson.fromJson(preferences.trackToken(this).get(), OAuth::class.java)
-        } catch (e: Exception) {
-            null
-        }
-    }
-
-}
+package eu.kanade.tachiyomi.data.track.kitsu
+
+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.track.TrackService
+import eu.kanade.tachiyomi.data.track.model.TrackSearch
+import rx.Completable
+import rx.Observable
+import uy.kohesive.injekt.injectLazy
+import java.text.DecimalFormat
+
+class Kitsu(private val context: Context, id: Int) : TrackService(id) {
+
+    companion object {
+        const val READING = 1
+        const val COMPLETED = 2
+        const val ON_HOLD = 3
+        const val DROPPED = 4
+        const val PLAN_TO_READ = 5
+
+        const val DEFAULT_STATUS = READING
+        const val DEFAULT_SCORE = 0f
+    }
+
+    override val name = "Kitsu"
+
+    private val gson: Gson by injectLazy()
+
+    private val interceptor by lazy { KitsuInterceptor(this, gson) }
+
+    private val api by lazy { KitsuApi(client, interceptor) }
+
+    override fun getLogo(): Int {
+        return R.drawable.kitsu
+    }
+
+    override fun getLogoColor(): Int {
+        return Color.rgb(51, 37, 50)
+    }
+
+    override fun getStatusList(): List<Int> {
+        return listOf(READING, COMPLETED, ON_HOLD, DROPPED, PLAN_TO_READ)
+    }
+
+    override fun getStatus(status: Int): String = with(context) {
+        when (status) {
+            READING -> getString(R.string.reading)
+            COMPLETED -> getString(R.string.completed)
+            ON_HOLD -> getString(R.string.on_hold)
+            DROPPED -> getString(R.string.dropped)
+            PLAN_TO_READ -> getString(R.string.plan_to_read)
+            else -> ""
+        }
+    }
+
+    override fun getScoreList(): List<String> {
+        val df = DecimalFormat("0.#")
+        return listOf("0") + IntRange(2, 20).map { df.format(it / 2f) }
+    }
+
+    override fun indexToScore(index: Int): Float {
+        return if (index > 0) (index + 1) / 2f else 0f
+    }
+
+    override fun displayScore(track: Track): String {
+        val df = DecimalFormat("0.#")
+        return df.format(track.score)
+    }
+
+    override fun add(track: Track): Observable<Track> {
+        return api.addLibManga(track, getUserId())
+    }
+
+    override fun update(track: Track): Observable<Track> {
+        if (track.total_chapters != 0 && track.last_chapter_read == track.total_chapters) {
+            track.status = COMPLETED
+        }
+
+        return api.updateLibManga(track)
+    }
+
+    override fun bind(track: Track): Observable<Track> {
+        return api.findLibManga(track, getUserId())
+                .flatMap { remoteTrack ->
+                    if (remoteTrack != null) {
+                        track.copyPersonalFrom(remoteTrack)
+                        track.media_id = remoteTrack.media_id
+                        update(track)
+                    } else {
+                        track.score = DEFAULT_SCORE
+                        track.status = DEFAULT_STATUS
+                        add(track)
+                    }
+                }
+    }
+
+    override fun search(query: String): Observable<List<TrackSearch>> {
+        return api.search(query)
+    }
+
+    override fun refresh(track: Track): Observable<Track> {
+        return api.getLibManga(track)
+                .map { remoteTrack ->
+                    track.copyPersonalFrom(remoteTrack)
+                    track.total_chapters = remoteTrack.total_chapters
+                    track
+                }
+    }
+
+    override fun login(username: String, password: String): Completable {
+        return api.login(username, password)
+                .doOnNext { interceptor.newAuth(it) }
+                .flatMap { api.getCurrentUser() }
+                .doOnNext { userId -> saveCredentials(username, userId) }
+                .doOnError { logout() }
+                .toCompletable()
+    }
+
+    override fun logout() {
+        super.logout()
+        interceptor.newAuth(null)
+    }
+
+    private fun getUserId(): String {
+        return getPassword()
+    }
+
+    fun saveToken(oauth: OAuth?) {
+        val json = gson.toJson(oauth)
+        preferences.trackToken(this).set(json)
+    }
+
+    fun restoreToken(): 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/kitsu/KitsuModels.kt

@@ -18,13 +18,12 @@ class KitsuSearchManga(obj: JsonObject) {
     private val synopsis by obj.byString
     private var startDate = obj.get("startDate").nullString?.let {
         val outputDf = SimpleDateFormat("yyyy-MM-dd", Locale.US)
-        outputDf.format(Date(it!!.toLong() * 1000))
+        outputDf.format(Date(it.toLong() * 1000))
     }
     private val endDate = obj.get("endDate").nullString
 
-
     @CallSuper
-    open fun toTrack() = TrackSearch.create(TrackManager.KITSU).apply {
+    fun toTrack() = TrackSearch.create(TrackManager.KITSU).apply {
         media_id = this@KitsuSearchManga.id
         title = canonicalTitle
         total_chapters = chapterCount ?: 0
@@ -55,7 +54,7 @@ class KitsuLibManga(obj: JsonObject, manga: JsonObject) {
     private val ratingTwenty = obj["attributes"].obj.get("ratingTwenty").nullString
     val progress by obj["attributes"].byInt
 
-    open fun toTrack() = TrackSearch.create(TrackManager.KITSU).apply {
+    fun toTrack() = TrackSearch.create(TrackManager.KITSU).apply {
         media_id = libraryId
         title = canonicalTitle
         total_chapters = chapterCount ?: 0

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

@@ -1,11 +1,11 @@
-package eu.kanade.tachiyomi.data.track.kitsu
-
-data class OAuth(
-        val access_token: String,
-        val token_type: String,
-        val created_at: Long,
-        val expires_in: Long,
-        val refresh_token: String?) {
-
-    fun isExpired() = (System.currentTimeMillis() / 1000) > (created_at + expires_in - 3600)
+package eu.kanade.tachiyomi.data.track.kitsu
+
+data class OAuth(
+        val access_token: String,
+        val token_type: String,
+        val created_at: Long,
+        val expires_in: Long,
+        val refresh_token: String?) {
+
+    fun isExpired() = (System.currentTimeMillis() / 1000) > (created_at + expires_in - 3600)
 }

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

@@ -1,141 +1,164 @@
-package eu.kanade.tachiyomi.data.track.myanimelist
-
-import android.content.Context
-import android.graphics.Color
-import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.data.database.models.Track
-import eu.kanade.tachiyomi.data.preference.getOrDefault
-import eu.kanade.tachiyomi.data.track.TrackService
-import eu.kanade.tachiyomi.data.track.model.TrackSearch
-import okhttp3.HttpUrl
-import rx.Completable
-import rx.Observable
-
-class Myanimelist(private val context: Context, id: Int) : TrackService(id) {
-
-    companion object {
-
-        const val READING = 1
-        const val COMPLETED = 2
-        const val ON_HOLD = 3
-        const val DROPPED = 4
-        const val PLAN_TO_READ = 6
-
-        const val DEFAULT_STATUS = READING
-        const val DEFAULT_SCORE = 0
-
-        const val BASE_URL = "https://myanimelist.net"
-        const val USER_SESSION_COOKIE = "MALSESSIONID"
-        const val LOGGED_IN_COOKIE = "is_logged_in"
-    }
-
-    private val api by lazy { MyanimelistApi(client) }
-
-    override val name: String
-        get() = "MyAnimeList"
-
-    override fun getLogo() = R.drawable.mal
-
-    override fun getLogoColor() = Color.rgb(46, 81, 162)
-
-    override fun getStatus(status: Int): String = with(context) {
-        when (status) {
-            READING -> getString(R.string.reading)
-            COMPLETED -> getString(R.string.completed)
-            ON_HOLD -> getString(R.string.on_hold)
-            DROPPED -> getString(R.string.dropped)
-            PLAN_TO_READ -> getString(R.string.plan_to_read)
-            else -> ""
-        }
-    }
-
-    override fun getStatusList(): List<Int> {
-        return listOf(READING, COMPLETED, ON_HOLD, DROPPED, PLAN_TO_READ)
-    }
-
-    override fun getScoreList(): List<String> {
-        return IntRange(0, 10).map(Int::toString)
-    }
-
-    override fun displayScore(track: Track): String {
-        return track.score.toInt().toString()
-    }
-
-    override fun add(track: Track): Observable<Track> {
-        return api.addLibManga(track, getCSRF())
-    }
-
-    override fun update(track: Track): Observable<Track> {
-        if (track.total_chapters != 0 && track.last_chapter_read == track.total_chapters) {
-            track.status = COMPLETED
-        }
-
-        return api.updateLibManga(track, getCSRF())
-    }
-
-    override fun bind(track: Track): Observable<Track> {
-        return api.findLibManga(track, getCSRF())
-                .flatMap { remoteTrack ->
-                    if (remoteTrack != null) {
-                        track.copyPersonalFrom(remoteTrack)
-                        update(track)
-                    } else {
-                        // Set default fields if it's not found in the list
-                        track.score = DEFAULT_SCORE.toFloat()
-                        track.status = DEFAULT_STATUS
-                        add(track)
-                    }
-                }
-    }
-
-    override fun search(query: String): Observable<List<TrackSearch>> {
-        return api.search(query)
-    }
-
-    override fun refresh(track: Track): Observable<Track> {
-        return api.getLibManga(track, getCSRF())
-                .map { remoteTrack ->
-                    track.copyPersonalFrom(remoteTrack)
-                    track.total_chapters = remoteTrack.total_chapters
-                    track
-                }
-    }
-
-    override fun login(username: String, password: String): Completable {
-        logout()
-
-        return api.login(username, password)
-                .doOnNext { csrf -> saveCSRF(csrf) }
-                .doOnNext { saveCredentials(username, password) }
-                .doOnError { logout() }
-                .toCompletable()
-    }
-
-    override fun logout() {
-        super.logout()
-        preferences.trackToken(this).delete()
-        networkService.cookieManager.remove(HttpUrl.parse(BASE_URL)!!)
-    }
-
-    override val isLogged: Boolean
-        get() = !getUsername().isEmpty() &&
-                !getPassword().isEmpty() &&
-                checkCookies() &&
-                !getCSRF().isEmpty()
-
-    private fun getCSRF(): String = preferences.trackToken(this).getOrDefault()
-
-    private fun saveCSRF(csrf: String) = preferences.trackToken(this).set(csrf)
-
-    private fun checkCookies(): Boolean {
-        var ckCount = 0
-        val url = HttpUrl.parse(BASE_URL)!!
-        for (ck in networkService.cookieManager.get(url)) {
-            if (ck.name() == USER_SESSION_COOKIE || ck.name() == LOGGED_IN_COOKIE)
-                ckCount++
-        }
-
-        return ckCount == 2
-    }
-
-}
+package eu.kanade.tachiyomi.data.track.myanimelist
+
+import android.content.Context
+import android.graphics.Color
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.database.models.Track
+import eu.kanade.tachiyomi.data.preference.getOrDefault
+import eu.kanade.tachiyomi.data.track.TrackService
+import eu.kanade.tachiyomi.data.track.model.TrackSearch
+import okhttp3.HttpUrl
+import rx.Completable
+import rx.Observable
+import java.lang.Exception
+
+class Myanimelist(private val context: Context, id: Int) : TrackService(id) {
+
+    companion object {
+        const val READING = 1
+        const val COMPLETED = 2
+        const val ON_HOLD = 3
+        const val DROPPED = 4
+        const val PLAN_TO_READ = 6
+
+        const val DEFAULT_STATUS = READING
+        const val DEFAULT_SCORE = 0
+
+        const val BASE_URL = "https://myanimelist.net"
+        const val USER_SESSION_COOKIE = "MALSESSIONID"
+        const val LOGGED_IN_COOKIE = "is_logged_in"
+    }
+
+    private val interceptor by lazy { MyAnimeListInterceptor(this) }
+    private val api by lazy { MyanimelistApi(client, interceptor) }
+
+    override val name: String
+        get() = "MyAnimeList"
+
+    override fun getLogo() = R.drawable.mal
+
+    override fun getLogoColor() = Color.rgb(46, 81, 162)
+
+    override fun getStatus(status: Int): String = with(context) {
+        when (status) {
+            READING -> getString(R.string.reading)
+            COMPLETED -> getString(R.string.completed)
+            ON_HOLD -> getString(R.string.on_hold)
+            DROPPED -> getString(R.string.dropped)
+            PLAN_TO_READ -> getString(R.string.plan_to_read)
+            else -> ""
+        }
+    }
+
+    override fun getStatusList(): List<Int> {
+        return listOf(READING, COMPLETED, ON_HOLD, DROPPED, PLAN_TO_READ)
+    }
+
+    override fun getScoreList(): List<String> {
+        return IntRange(0, 10).map(Int::toString)
+    }
+
+    override fun displayScore(track: Track): String {
+        return track.score.toInt().toString()
+    }
+
+    override fun add(track: Track): Observable<Track> {
+        return api.addLibManga(track)
+    }
+
+    override fun update(track: Track): Observable<Track> {
+        if (track.total_chapters != 0 && track.last_chapter_read == track.total_chapters) {
+            track.status = COMPLETED
+        }
+
+        return api.updateLibManga(track)
+    }
+
+    override fun bind(track: Track): Observable<Track> {
+        return api.findLibManga(track)
+                .flatMap { remoteTrack ->
+                    if (remoteTrack != null) {
+                        track.copyPersonalFrom(remoteTrack)
+                        update(track)
+                    } else {
+                        // Set default fields if it's not found in the list
+                        track.score = DEFAULT_SCORE.toFloat()
+                        track.status = DEFAULT_STATUS
+                        add(track)
+                    }
+                }
+    }
+
+    override fun search(query: String): Observable<List<TrackSearch>> {
+        return api.search(query)
+    }
+
+    override fun refresh(track: Track): Observable<Track> {
+        return api.getLibManga(track)
+                .map { remoteTrack ->
+                    track.copyPersonalFrom(remoteTrack)
+                    track.total_chapters = remoteTrack.total_chapters
+                    track
+                }
+    }
+
+    override fun login(username: String, password: String): Completable {
+        logout()
+
+        return Observable.fromCallable { api.login(username, password) }
+                .doOnNext { csrf -> saveCSRF(csrf) }
+                .doOnNext { saveCredentials(username, password) }
+                .doOnError { logout() }
+                .toCompletable()
+    }
+
+    fun refreshLogin() {
+        val username = getUsername()
+        val password = getPassword()
+        logout()
+
+        try {
+            val csrf = api.login(username, password)
+            saveCSRF(csrf)
+            saveCredentials(username, password)
+        } catch (e: Exception) {
+            logout()
+            throw e
+        }
+    }
+
+    // Attempt to login again if cookies have been cleared but credentials are still filled
+    fun ensureLoggedIn() {
+        if (isAuthorized) return
+        if (!isLogged) throw Exception("MAL Login Credentials not found")
+
+        refreshLogin()
+    }
+
+    override fun logout() {
+        super.logout()
+        preferences.trackToken(this).delete()
+        networkService.cookieManager.remove(HttpUrl.parse(BASE_URL)!!)
+    }
+
+    val isAuthorized: Boolean
+        get() = super.isLogged &&
+                getCSRF().isNotEmpty() &&
+                checkCookies()
+
+    fun getCSRF(): String = preferences.trackToken(this).getOrDefault()
+
+    private fun saveCSRF(csrf: String) = preferences.trackToken(this).set(csrf)
+
+    private fun checkCookies(): Boolean {
+        var ckCount = 0
+        val url = HttpUrl.parse(BASE_URL)!!
+        for (ck in networkService.cookieManager.get(url)) {
+            if (ck.name() == USER_SESSION_COOKIE || ck.name() == LOGGED_IN_COOKIE)
+                ckCount++
+        }
+
+        return ckCount == 2
+    }
+
+}

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

@@ -0,0 +1,59 @@
+package eu.kanade.tachiyomi.data.track.myanimelist
+
+import okhttp3.Interceptor
+import okhttp3.Request
+import okhttp3.RequestBody
+import okhttp3.Response
+import okio.Buffer
+import org.json.JSONObject
+
+class MyAnimeListInterceptor(private val myanimelist: Myanimelist): Interceptor {
+
+    override fun intercept(chain: Interceptor.Chain): Response {
+        myanimelist.ensureLoggedIn()
+
+        val request = chain.request()
+        var response = chain.proceed(updateRequest(request))
+
+        if (response.code() == 400){
+            myanimelist.refreshLogin()
+            response = chain.proceed(updateRequest(request))
+        }
+
+        return response
+    }
+
+    private fun updateRequest(request: Request): Request {
+        return request.body()?.let {
+            val contentType = it.contentType().toString()
+            val updatedBody = when {
+                contentType.contains("x-www-form-urlencoded") -> updateFormBody(it)
+                contentType.contains("json") -> updateJsonBody(it)
+                else -> it
+            }
+            request.newBuilder().post(updatedBody).build()
+        } ?: request
+    }
+
+    private fun bodyToString(requestBody: RequestBody): String {
+        Buffer().use {
+            requestBody.writeTo(it)
+            return it.readUtf8()
+        }
+    }
+
+    private fun updateFormBody(requestBody: RequestBody): RequestBody {
+        val formString = bodyToString(requestBody)
+
+        return RequestBody.create(requestBody.contentType(),
+                "$formString${if (formString.isNotEmpty()) "&" else ""}${MyanimelistApi.CSRF}=${myanimelist.getCSRF()}")
+    }
+
+    private fun updateJsonBody(requestBody: RequestBody): RequestBody {
+        val jsonString = bodyToString(requestBody)
+        val newBody = JSONObject(jsonString)
+                .put(MyanimelistApi.CSRF, myanimelist.getCSRF())
+
+        return RequestBody.create(requestBody.contentType(), newBody.toString())
+    }
+}

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

@@ -22,61 +22,122 @@ import java.io.InputStreamReader
 import java.util.zip.GZIPInputStream
 
 
-class MyanimelistApi(private val client: OkHttpClient) {
+class MyanimelistApi(private val client: OkHttpClient, interceptor: MyAnimeListInterceptor) {
 
-    fun addLibManga(track: Track, csrf: String): Observable<Track> {
-        return Observable.defer {
-            client.newCall(POST(url = getAddUrl(), body = getMangaPostPayload(track, csrf)))
-                    .asObservableSuccess()
-                    .map { track }
-        }
-    }
-
-    fun updateLibManga(track: Track, csrf: String): Observable<Track> {
-        return Observable.defer {
-            client.newCall(POST(url = getUpdateUrl(), body = getMangaPostPayload(track, csrf)))
-                    .asObservableSuccess()
-                    .map { track }
-        }
-    }
+    private val authClient = client.newBuilder().addInterceptor(interceptor).build()
 
     fun search(query: String): Observable<List<TrackSearch>> {
-        return client.newCall(GET(getSearchUrl(query)))
-                .asObservable()
-                .flatMap { response ->
-                    Observable.from(Jsoup.parse(response.consumeBody())
-                            .select("div.js-categories-seasonal.js-block-list.list")
-                            .select("table").select("tbody")
-                            .select("tr").drop(1))
-                }
-                .filter { row ->
-                    row.select(TD)[2].text() != "Novel"
-                }
-                .map { row ->
-                    TrackSearch.create(TrackManager.MYANIMELIST).apply {
-                        title = row.searchTitle()
-                        media_id = row.searchMediaId()
-                        total_chapters = row.searchTotalChapters()
-                        summary = row.searchSummary()
-                        cover_url = row.searchCoverUrl()
-                        tracking_url = mangaUrl(media_id)
-                        publishing_status = row.searchPublishingStatus()
-                        publishing_type = row.searchPublishingType()
-                        start_date = row.searchStartDate()
+        return if (query.startsWith(PREFIX_MY)) {
+            val realQuery = query.removePrefix(PREFIX_MY)
+            getList()
+                    .flatMap { Observable.from(it) }
+                    .filter { it.title.contains(realQuery, true) }
+                    .toList()
+        }
+        else {
+            client.newCall(GET(searchUrl(query)))
+                    .asObservable()
+                    .flatMap { response ->
+                        Observable.from(Jsoup.parse(response.consumeBody())
+                                .select("div.js-categories-seasonal.js-block-list.list")
+                                .select("table").select("tbody")
+                                .select("tr").drop(1))
                     }
-                }
-                .toList()
+                    .filter { row ->
+                        row.select(TD)[2].text() != "Novel"
+                    }
+                    .map { row ->
+                        TrackSearch.create(TrackManager.MYANIMELIST).apply {
+                            title = row.searchTitle()
+                            media_id = row.searchMediaId()
+                            total_chapters = row.searchTotalChapters()
+                            summary = row.searchSummary()
+                            cover_url = row.searchCoverUrl()
+                            tracking_url = mangaUrl(media_id)
+                            publishing_status = row.searchPublishingStatus()
+                            publishing_type = row.searchPublishingType()
+                            start_date = row.searchStartDate()
+                        }
+                    }
+                    .toList()
+        }
     }
 
-    private fun getList(csrf: String): Observable<List<TrackSearch>> {
-        return getListUrl(csrf)
+    fun addLibManga(track: Track): Observable<Track> {
+        return Observable.defer {
+            authClient.newCall(POST(url = addUrl(), body = mangaPostPayload(track)))
+                    .asObservableSuccess()
+                    .map { track }
+        }
+    }
+
+    fun updateLibManga(track: Track): Observable<Track> {
+        return Observable.defer {
+            authClient.newCall(POST(url = updateUrl(), body = mangaPostPayload(track)))
+                    .asObservableSuccess()
+                    .map { track }
+        }
+    }
+
+    fun findLibManga(track: Track): Observable<Track?> {
+        return authClient.newCall(GET(url = listEntryUrl(track.media_id)))
+                .asObservable()
+                .map {response ->
+                    var libTrack: Track? = null
+                    response.use {
+                        if (it.priorResponse()?.isRedirect != true) {
+                            val trackForm = Jsoup.parse(it.consumeBody())
+
+                            libTrack = Track.create(TrackManager.MYANIMELIST).apply {
+                                last_chapter_read = trackForm.select("#add_manga_num_read_chapters").`val`().toInt()
+                                total_chapters = trackForm.select("#totalChap").text().toInt()
+                                status = trackForm.select("#add_manga_status > option[selected]").`val`().toInt()
+                                score = trackForm.select("#add_manga_score > option[selected]").`val`().toFloatOrNull() ?: 0f
+                            }
+                        }
+                    }
+                    libTrack
+                }
+    }
+
+    fun getLibManga(track: Track): Observable<Track> {
+        return findLibManga(track)
+                .map { it ?: throw Exception("Could not find manga") }
+    }
+
+    fun login(username: String, password: String): String {
+        val csrf = getSessionInfo()
+
+        login(username, password, csrf)
+
+        return csrf
+    }
+
+    private fun getSessionInfo(): String {
+        val response = client.newCall(GET(loginUrl())).execute()
+
+        return Jsoup.parse(response.consumeBody())
+                .select("meta[name=csrf_token]")
+                .attr("content")
+    }
+
+    private fun login(username: String, password: String, csrf: String) {
+        val response = client.newCall(POST(url = loginUrl(), body = loginPostBody(username, password, csrf))).execute()
+
+        response.use {
+            if (response.priorResponse()?.code() != 302) throw Exception("Authentication error")
+        }
+    }
+
+    private fun getList(): Observable<List<TrackSearch>> {
+        return getListUrl()
                 .flatMap { url ->
                     getListXml(url)
                 }
                 .flatMap { doc ->
                     Observable.from(doc.select("manga"))
                 }
-                .map { it ->
+                .map {
                     TrackSearch.create(TrackManager.MYANIMELIST).apply {
                         title = it.selectText("manga_title")!!
                         media_id = it.selectInt("manga_mangadb_id")
@@ -90,107 +151,8 @@ class MyanimelistApi(private val client: OkHttpClient) {
                 .toList()
     }
 
-    private fun getListXml(url: String): Observable<Document> {
-        return client.newCall(GET(url))
-                .asObservable()
-                .map { response ->
-                    Jsoup.parse(response.consumeXmlBody(), "", Parser.xmlParser())
-                }
-    }
-
-    fun findLibManga(track: Track, csrf: String): Observable<Track?> {
-        return getList(csrf)
-                .map { list -> list.find { it.media_id == track.media_id } }
-    }
-
-    fun getLibManga(track: Track, csrf: String): Observable<Track> {
-        return findLibManga(track, csrf)
-                .map { it ?: throw Exception("Could not find manga") }
-    }
-
-    fun login(username: String, password: String): Observable<String> {
-        return getSessionInfo()
-                .flatMap { csrf ->
-                    login(username, password, csrf)
-                }
-    }
-
-    private fun getSessionInfo(): Observable<String> {
-        return client.newCall(GET(getLoginUrl()))
-                .asObservable()
-                .map { response ->
-                    Jsoup.parse(response.consumeBody())
-                            .select("meta[name=csrf_token]")
-                            .attr("content")
-                }
-    }
-
-    private fun login(username: String, password: String, csrf: String): Observable<String> {
-        return client.newCall(POST(url = getLoginUrl(), body = getLoginPostBody(username, password, csrf)))
-                .asObservable()
-                .map { response ->
-                    response.use {
-                        if (response.priorResponse()?.code() != 302) throw Exception("Authentication error")
-                    }
-                    csrf
-                }
-    }
-
-    private fun getLoginPostBody(username: String, password: String, csrf: String): RequestBody {
-        return FormBody.Builder()
-                .add("user_name", username)
-                .add("password", password)
-                .add("cookie", "1")
-                .add("sublogin", "Login")
-                .add("submit", "1")
-                .add(CSRF, csrf)
-                .build()
-    }
-
-    private fun getExportPostBody(csrf: String): RequestBody {
-        return FormBody.Builder()
-                .add("type", "2")
-                .add("subexport", "Export My List")
-                .add(CSRF, csrf)
-                .build()
-    }
-
-    private fun getMangaPostPayload(track: Track, csrf: String): RequestBody {
-        val body = JSONObject()
-                .put("manga_id", track.media_id)
-                .put("status", track.status)
-                .put("score", track.score)
-                .put("num_read_chapters", track.last_chapter_read)
-                .put(CSRF, csrf)
-
-        return RequestBody.create(MediaType.parse("application/json; charset=utf-8"), body.toString())
-    }
-
-    private fun getLoginUrl() = Uri.parse(baseUrl).buildUpon()
-            .appendPath("login.php")
-            .toString()
-
-    private fun getSearchUrl(query: String): String {
-        val col = "c[]"
-        return Uri.parse(baseUrl).buildUpon()
-                .appendPath("manga.php")
-                .appendQueryParameter("q", query)
-                .appendQueryParameter(col, "a")
-                .appendQueryParameter(col, "b")
-                .appendQueryParameter(col, "c")
-                .appendQueryParameter(col, "d")
-                .appendQueryParameter(col, "e")
-                .appendQueryParameter(col, "g")
-                .toString()
-    }
-
-    private fun getExportListUrl() = Uri.parse(baseUrl).buildUpon()
-            .appendPath("panel.php")
-            .appendQueryParameter("go", "export")
-            .toString()
-
-    private fun getListUrl(csrf: String): Observable<String> {
-        return client.newCall(POST(url = getExportListUrl(), body = getExportPostBody(csrf)))
+    private fun getListUrl(): Observable<String> {
+        return authClient.newCall(POST(url = exportListUrl(), body = exportPostBody()))
                 .asObservable()
                 .map {response ->
                     baseUrl + Jsoup.parse(response.consumeBody())
@@ -200,17 +162,17 @@ class MyanimelistApi(private val client: OkHttpClient) {
                 }
     }
 
-    private fun getUpdateUrl() = Uri.parse(baseModifyListUrl).buildUpon()
-            .appendPath("edit.json")
-            .toString()
+    private fun getListXml(url: String): Observable<Document> {
+        return authClient.newCall(GET(url))
+                .asObservable()
+                .map { response ->
+                    Jsoup.parse(response.consumeXmlBody(), "", Parser.xmlParser())
+                }
+    }
 
-    private fun getAddUrl() = Uri.parse(baseModifyListUrl).buildUpon()
-            .appendPath( "add.json")
-            .toString()
-    
     private fun Response.consumeBody(): String? {
         use {
-            if (it.code() != 200) throw Exception("Login error")
+            if (it.code() != 200) throw Exception("HTTP error ${it.code()}")
             return it.body()?.string()
         }
     }
@@ -229,37 +191,105 @@ class MyanimelistApi(private val client: OkHttpClient) {
     }
 
     companion object {
-        const val baseUrl = "https://myanimelist.net"
+        const val CSRF = "csrf_token"
+
+        private const val baseUrl = "https://myanimelist.net"
         private const val baseMangaUrl = "$baseUrl/manga/"
         private const val baseModifyListUrl = "$baseUrl/ownlist/manga"
+        private const val PREFIX_MY = "my:"
+        private const val TD = "td"
 
-        fun mangaUrl(remoteId: Int) = baseMangaUrl + remoteId
+        private fun mangaUrl(remoteId: Int) = baseMangaUrl + remoteId
 
-        fun Element.searchTitle() = select("strong").text()!!
+        private fun loginUrl() = Uri.parse(baseUrl).buildUpon()
+                .appendPath("login.php")
+                .toString()
 
-        fun Element.searchTotalChapters() = if (select(TD)[4].text() == "-") 0 else select(TD)[4].text().toInt()
+        private fun searchUrl(query: String): String {
+            val col = "c[]"
+            return Uri.parse(baseUrl).buildUpon()
+                    .appendPath("manga.php")
+                    .appendQueryParameter("q", query)
+                    .appendQueryParameter(col, "a")
+                    .appendQueryParameter(col, "b")
+                    .appendQueryParameter(col, "c")
+                    .appendQueryParameter(col, "d")
+                    .appendQueryParameter(col, "e")
+                    .appendQueryParameter(col, "g")
+                    .toString()
+        }
 
-        fun Element.searchCoverUrl() = select("img")
+        private fun exportListUrl() = Uri.parse(baseUrl).buildUpon()
+                .appendPath("panel.php")
+                .appendQueryParameter("go", "export")
+                .toString()
+
+        private fun updateUrl() = Uri.parse(baseModifyListUrl).buildUpon()
+                .appendPath("edit.json")
+                .toString()
+
+        private fun addUrl() = Uri.parse(baseModifyListUrl).buildUpon()
+                .appendPath( "add.json")
+                .toString()
+
+        private fun listEntryUrl(mediaId: Int) = Uri.parse(baseModifyListUrl).buildUpon()
+                .appendPath(mediaId.toString())
+                .appendPath("edit")
+                .toString()
+
+        private fun loginPostBody(username: String, password: String, csrf: String): RequestBody {
+            return FormBody.Builder()
+                    .add("user_name", username)
+                    .add("password", password)
+                    .add("cookie", "1")
+                    .add("sublogin", "Login")
+                    .add("submit", "1")
+                    .add(CSRF, csrf)
+                    .build()
+        }
+
+        private fun exportPostBody(): RequestBody {
+            return FormBody.Builder()
+                    .add("type", "2")
+                    .add("subexport", "Export My List")
+                    .build()
+        }
+
+        private fun mangaPostPayload(track: Track): RequestBody {
+            val body = JSONObject()
+                    .put("manga_id", track.media_id)
+                    .put("status", track.status)
+                    .put("score", track.score)
+                    .put("num_read_chapters", track.last_chapter_read)
+
+            return RequestBody.create(MediaType.parse("application/json; charset=utf-8"), body.toString())
+        }
+
+        private fun Element.searchTitle() = select("strong").text()!!
+
+        private fun Element.searchTotalChapters() = if (select(TD)[4].text() == "-") 0 else select(TD)[4].text().toInt()
+
+        private fun Element.searchCoverUrl() = select("img")
                 .attr("data-src")
                 .split("\\?")[0]
                 .replace("/r/50x70/", "/")
 
-        fun Element.searchMediaId() = select("div.picSurround")
+        private fun Element.searchMediaId() = select("div.picSurround")
                 .select("a").attr("id")
                 .replace("sarea", "")
                 .toInt()
 
-        fun Element.searchSummary() = select("div.pt4")
+        private fun Element.searchSummary() = select("div.pt4")
                 .first()
                 .ownText()!!
 
-        fun Element.searchPublishingStatus() = if (select(TD).last().text() == "-") PUBLISHING else FINISHED
+        private fun Element.searchPublishingStatus() = if (select(TD).last().text() == "-") "Publishing" else "Finished"
 
-        fun Element.searchPublishingType() = select(TD)[2].text()!!
+        private fun Element.searchPublishingType() = select(TD)[2].text()!!
 
-        fun Element.searchStartDate() = select(TD)[6].text()!!
+        private fun Element.searchStartDate() = select(TD)[6].text()!!
 
-        fun getStatus(status: String) = when (status) {
+        private fun getStatus(status: String) = when (status) {
             "Reading" -> 1
             "Completed" -> 2
             "On-Hold" -> 3
@@ -267,10 +297,5 @@ class MyanimelistApi(private val client: OkHttpClient) {
             "Plan to Read" -> 6
             else -> 1
             }
-
-        const val CSRF = "csrf_token"
-        const val TD = "td"
-        private const val FINISHED = "Finished"
-        private const val PUBLISHING = "Publishing"
     }
 }

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

@@ -1,13 +1,13 @@
-package eu.kanade.tachiyomi.data.track.shikomori
-
-data class OAuth(
-        val access_token: String,
-        val token_type: String,
-        val created_at: Long,
-        val expires_in: Long,
-        val refresh_token: String?) {
-
-    // Access token lives 1 day
-    fun isExpired() = (System.currentTimeMillis() / 1000) > (created_at + expires_in - 3600)
-}
-
+package eu.kanade.tachiyomi.data.track.shikimori
+
+data class OAuth(
+        val access_token: String,
+        val token_type: String,
+        val created_at: Long,
+        val expires_in: Long,
+        val refresh_token: String?) {
+
+    // Access token lives 1 day
+    fun isExpired() = (System.currentTimeMillis() / 1000) > (created_at + expires_in - 3600)
+}
+

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

@@ -1,138 +1,139 @@
-package eu.kanade.tachiyomi.data.track.shikomori
-
-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.track.TrackService
-import eu.kanade.tachiyomi.data.track.model.TrackSearch
-import rx.Completable
-import rx.Observable
-import uy.kohesive.injekt.injectLazy
-
-class Shikomori(private val context: Context, id: Int) : TrackService(id) {
-
-    override fun getScoreList(): List<String> {
-        return IntRange(0, 10).map(Int::toString)
-    }
-
-    override fun displayScore(track: Track): String {
-        return track.score.toInt().toString()
-    }
-
-    override fun add(track: Track): Observable<Track> {
-        return api.addLibManga(track, getUsername())
-    }
-
-    override fun update(track: Track): Observable<Track> {
-        if (track.total_chapters != 0 && track.last_chapter_read == track.total_chapters) {
-            track.status = COMPLETED
-        }
-        return api.updateLibManga(track, getUsername())
-    }
-
-    override fun bind(track: Track): Observable<Track> {
-        return api.findLibManga(track, getUsername())
-                .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
-                        track.score = DEFAULT_SCORE.toFloat()
-                        track.status = DEFAULT_STATUS
-                        add(track)
-                    }
-                }
-    }
-
-    override fun search(query: String): Observable<List<TrackSearch>> {
-        return api.search(query)
-    }
-
-    override fun refresh(track: Track): Observable<Track> {
-        return api.findLibManga(track, getUsername())
-                .map { remoteTrack ->
-                    if (remoteTrack != null) {
-                        track.copyPersonalFrom(remoteTrack)
-                        track.total_chapters = remoteTrack.total_chapters
-                    }
-                    track
-                }
-    }
-
-    companion object {
-        const val READING = 1
-        const val COMPLETED = 2
-        const val ON_HOLD = 3
-        const val DROPPED = 4
-        const val PLANNING = 5
-        const val REPEATING = 6
-
-        const val DEFAULT_STATUS = READING
-        const val DEFAULT_SCORE = 0
-    }
-
-    override val name = "Shikomori"
-
-    private val gson: Gson by injectLazy()
-
-    private val interceptor by lazy { ShikomoriInterceptor(this, gson) }
-
-    private val api by lazy { ShikomoriApi(client, interceptor) }
-
-    override fun getLogo() = R.drawable.shikomori
-
-    override fun getLogoColor() = Color.rgb(40, 40, 40)
-
-    override fun getStatusList(): List<Int> {
-        return listOf(READING, COMPLETED, ON_HOLD, DROPPED, PLANNING, REPEATING)
-    }
-
-    override fun getStatus(status: Int): String = with(context) {
-        when (status) {
-            READING -> getString(R.string.reading)
-            COMPLETED -> getString(R.string.completed)
-            ON_HOLD -> getString(R.string.on_hold)
-            DROPPED -> getString(R.string.dropped)
-            PLANNING -> getString(R.string.plan_to_read)
-            REPEATING -> getString(R.string.repeating)
-            else -> ""
-        }
-    }
-
-    override fun login(username: String, password: String) = login(password)
-
-    fun login(code: String): Completable {
-        return api.accessToken(code).map { oauth: OAuth? ->
-            interceptor.newAuth(oauth)
-            if (oauth != null) {
-                val user = api.getCurrentUser()
-                saveCredentials(user.toString(), oauth.access_token)
-            }
-        }.doOnError {
-            logout()
-        }.toCompletable()
-    }
-
-    fun saveToken(oauth: OAuth?) {
-        val json = gson.toJson(oauth)
-        preferences.trackToken(this).set(json)
-    }
-
-    fun restoreToken(): OAuth? {
-        return try {
-            gson.fromJson(preferences.trackToken(this).get(), OAuth::class.java)
-        } catch (e: Exception) {
-            null
-        }
-    }
-
-    override fun logout() {
-        super.logout()
-        preferences.trackToken(this).set(null)
-        interceptor.newAuth(null)
-    }
-}
+package eu.kanade.tachiyomi.data.track.shikimori
+
+import android.content.Context
+import android.graphics.Color
+import android.util.Log
+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
+
+class Shikimori(private val context: Context, id: Int) : TrackService(id) {
+
+    override fun getScoreList(): List<String> {
+        return IntRange(0, 10).map(Int::toString)
+    }
+
+    override fun displayScore(track: Track): String {
+        return track.score.toInt().toString()
+    }
+
+    override fun add(track: Track): Observable<Track> {
+        return api.addLibManga(track, getUsername())
+    }
+
+    override fun update(track: Track): Observable<Track> {
+        if (track.total_chapters != 0 && track.last_chapter_read == track.total_chapters) {
+            track.status = COMPLETED
+        }
+        return api.updateLibManga(track, getUsername())
+    }
+
+    override fun bind(track: Track): Observable<Track> {
+        return api.findLibManga(track, getUsername())
+                .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
+                        track.score = DEFAULT_SCORE.toFloat()
+                        track.status = DEFAULT_STATUS
+                        add(track)
+                    }
+                }
+    }
+
+    override fun search(query: String): Observable<List<TrackSearch>> {
+        return api.search(query)
+    }
+
+    override fun refresh(track: Track): Observable<Track> {
+        return api.findLibManga(track, getUsername())
+                .map { remoteTrack ->
+                    if (remoteTrack != null) {
+                        track.copyPersonalFrom(remoteTrack)
+                        track.total_chapters = remoteTrack.total_chapters
+                    }
+                    track
+                }
+    }
+
+    companion object {
+        const val READING = 1
+        const val COMPLETED = 2
+        const val ON_HOLD = 3
+        const val DROPPED = 4
+        const val PLANNING = 5
+        const val REPEATING = 6
+
+        const val DEFAULT_STATUS = READING
+        const val DEFAULT_SCORE = 0
+    }
+
+    override val name = "Shikimori"
+
+    private val gson: Gson by injectLazy()
+
+    private val interceptor by lazy { ShikimoriInterceptor(this, gson) }
+
+    private val api by lazy { ShikimoriApi(client, interceptor) }
+
+    override fun getLogo() = R.drawable.shikimori
+
+    override fun getLogoColor() = Color.rgb(40, 40, 40)
+
+    override fun getStatusList(): List<Int> {
+        return listOf(READING, COMPLETED, ON_HOLD, DROPPED, PLANNING, REPEATING)
+    }
+
+    override fun getStatus(status: Int): String = with(context) {
+        when (status) {
+            READING -> getString(R.string.reading)
+            COMPLETED -> getString(R.string.completed)
+            ON_HOLD -> getString(R.string.on_hold)
+            DROPPED -> getString(R.string.dropped)
+            PLANNING -> getString(R.string.plan_to_read)
+            REPEATING -> getString(R.string.repeating)
+            else -> ""
+        }
+    }
+
+    override fun login(username: String, password: String) = login(password)
+
+    fun login(code: String): Completable {
+        return api.accessToken(code).map { oauth: OAuth? ->
+            interceptor.newAuth(oauth)
+            if (oauth != null) {
+                val user = api.getCurrentUser()
+                saveCredentials(user.toString(), oauth.access_token)
+            }
+        }.doOnError {
+            logout()
+        }.toCompletable()
+    }
+
+    fun saveToken(oauth: OAuth?) {
+        val json = gson.toJson(oauth)
+        preferences.trackToken(this).set(json)
+    }
+
+    fun restoreToken(): OAuth? {
+        return try {
+            gson.fromJson(preferences.trackToken(this).get(), OAuth::class.java)
+        } catch (e: Exception) {
+            null
+        }
+    }
+
+    override fun logout() {
+        super.logout()
+        preferences.trackToken(this).set(null)
+        interceptor.newAuth(null)
+    }
+}

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

@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.data.track.shikomori
+package eu.kanade.tachiyomi.data.track.shikimori
 
 import android.net.Uri
 import com.github.salomonbrys.kotson.array
@@ -18,7 +18,7 @@ import okhttp3.*
 import rx.Observable
 import uy.kohesive.injekt.injectLazy
 
-class ShikomoriApi(private val client: OkHttpClient, interceptor: ShikomoriInterceptor) {
+class ShikimoriApi(private val client: OkHttpClient, interceptor: ShikimoriInterceptor) {
 
     private val gson: Gson by injectLazy()
     private val parser = JsonParser()
@@ -33,7 +33,7 @@ class ShikomoriApi(private val client: OkHttpClient, interceptor: ShikomoriInter
                         "target_type" to "Manga",
                         "chapters" to track.last_chapter_read,
                         "score" to track.score.toInt(),
-                        "status" to track.toShikomoriStatus()
+                        "status" to track.toShikimoriStatus()
                 )
         )
         val body = RequestBody.create(jsonime, payload.toString())
@@ -74,7 +74,7 @@ class ShikomoriApi(private val client: OkHttpClient, interceptor: ShikomoriInter
     }
 
     private fun jsonToSearch(obj: JsonObject): TrackSearch {
-        return TrackSearch.create(TrackManager.SHIKOMORI).apply {
+        return TrackSearch.create(TrackManager.SHIKIMORI).apply {
             media_id = obj["id"].asInt
             title = obj["name"].asString
             total_chapters = obj["chapters"].asInt
@@ -87,14 +87,15 @@ class ShikomoriApi(private val client: OkHttpClient, interceptor: ShikomoriInter
         }
     }
 
-    private fun jsonToTrack(obj: JsonObject): Track {
-        return Track.create(TrackManager.SHIKOMORI).apply {
+    private fun jsonToTrack(obj: JsonObject, mangas: JsonObject): Track {
+        return Track.create(TrackManager.SHIKIMORI).apply {
+            title = mangas["name"].asString
             media_id = obj["id"].asInt
-            title = ""
+            total_chapters = mangas["chapters"].asInt
             last_chapter_read = obj["chapters"].asInt
-            total_chapters = obj["chapters"].asInt
             score = (obj["score"].asInt).toFloat()
             status = toTrackStatus(obj["status"].asString)
+            tracking_url = baseUrl + mangas["url"].asString
         }
     }
 
@@ -108,21 +109,36 @@ class ShikomoriApi(private val client: OkHttpClient, interceptor: ShikomoriInter
                 .url(url.toString())
                 .get()
                 .build()
-        return authClient.newCall(request)
+
+        val urlMangas = Uri.parse("$apiUrl/mangas").buildUpon()
+                .appendPath(track.media_id.toString())
+                .build()
+        val requestMangas = Request.Builder()
+                .url(urlMangas.toString())
+                .get()
+                .build()
+        return authClient.newCall(requestMangas)
                 .asObservableSuccess()
                 .map { netResponse ->
                     val responseBody = netResponse.body()?.string().orEmpty()
-                    if (responseBody.isEmpty()) {
-                        throw Exception("Null Response")
-                    }
-                    val response = parser.parse(responseBody).array
-                    if (response.size() > 1) {
-                        throw Exception("Too much mangas in response")
-                    }
-                    val entry = response.map {
-                        jsonToTrack(it.obj)
-                    }
-                    entry.firstOrNull()
+                    parser.parse(responseBody).obj
+                }.flatMap { mangas ->
+                    authClient.newCall(request)
+                            .asObservableSuccess()
+                            .map { netResponse ->
+                                val responseBody = netResponse.body()?.string().orEmpty()
+                                if (responseBody.isEmpty()) {
+                                    throw Exception("Null Response")
+                                }
+                                val response = parser.parse(responseBody).array
+                                if (response.size() > 1) {
+                                    throw Exception("Too much mangas in response")
+                                }
+                                val entry = response.map {
+                                    jsonToTrack(it.obj, mangas)
+                                }
+                                entry.firstOrNull()
+                            }
                 }
     }
 
@@ -156,10 +172,10 @@ class ShikomoriApi(private val client: OkHttpClient, interceptor: ShikomoriInter
         private const val clientId = "1aaf4cf232372708e98b5abc813d795b539c5a916dbbfe9ac61bf02a360832cc"
         private const val clientSecret = "229942c742dd4cde803125d17d64501d91c0b12e14cb1e5120184d77d67024c0"
 
-        private const val baseUrl = "https://shikimori.org"
-        private const val apiUrl = "https://shikimori.org/api"
-        private const val oauthUrl = "https://shikimori.org/oauth/token"
-        private const val loginUrl = "https://shikimori.org/oauth/authorize"
+        private const val baseUrl = "https://shikimori.one"
+        private const val apiUrl = "https://shikimori.one/api"
+        private const val oauthUrl = "https://shikimori.one/oauth/token"
+        private const val loginUrl = "https://shikimori.one/oauth/authorize"
 
         private const val redirectUrl = "tachiyomi://shikimori-auth"
         private const val baseMangaUrl = "$apiUrl/mangas"

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

@@ -1,26 +1,26 @@
-package eu.kanade.tachiyomi.data.track.shikomori
+package eu.kanade.tachiyomi.data.track.shikimori
 
 import com.google.gson.Gson
 import okhttp3.Interceptor
 import okhttp3.Response
 
-class ShikomoriInterceptor(val shikomori: Shikomori, val gson: Gson) : Interceptor {
+class ShikimoriInterceptor(val shikimori: Shikimori, val gson: Gson) : Interceptor {
 
     /**
      * OAuth object used for authenticated requests.
      */
-    private var oauth: OAuth? = shikomori.restoreToken()
+    private var oauth: OAuth? = shikimori.restoreToken()
 
     override fun intercept(chain: Interceptor.Chain): Response {
         val originalRequest = chain.request()
 
-        val currAuth = oauth ?: throw Exception("Not authenticated with Shikomori")
+        val currAuth = oauth ?: throw Exception("Not authenticated with Shikimori")
 
         val refreshToken = currAuth.refresh_token!!
 
         // Refresh access token if expired.
         if (currAuth.isExpired()) {
-            val response = chain.proceed(ShikomoriApi.refreshTokenRequest(refreshToken))
+            val response = chain.proceed(ShikimoriApi.refreshTokenRequest(refreshToken))
             if (response.isSuccessful) {
                 newAuth(gson.fromJson(response.body()!!.string(), OAuth::class.java))
             } else {
@@ -38,6 +38,6 @@ class ShikomoriInterceptor(val shikomori: Shikomori, val gson: Gson) : Intercept
 
     fun newAuth(oauth: OAuth?) {
         this.oauth = oauth
-        shikomori.saveToken(oauth)
+        shikimori.saveToken(oauth)
     }
 }

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

@@ -0,0 +1,24 @@
+package eu.kanade.tachiyomi.data.track.shikimori
+
+import eu.kanade.tachiyomi.data.database.models.Track
+
+fun Track.toShikimoriStatus() = when (status) {
+    Shikimori.READING -> "watching"
+    Shikimori.COMPLETED -> "completed"
+    Shikimori.ON_HOLD -> "on_hold"
+    Shikimori.DROPPED -> "dropped"
+    Shikimori.PLANNING -> "planned"
+    Shikimori.REPEATING -> "rewatching"
+    else -> throw NotImplementedError("Unknown status")
+}
+
+fun toTrackStatus(status: String) = when (status) {
+    "watching" -> Shikimori.READING
+    "completed" -> Shikimori.COMPLETED
+    "on_hold" -> Shikimori.ON_HOLD
+    "dropped" -> Shikimori.DROPPED
+    "planned" -> Shikimori.PLANNING
+    "rewatching" -> Shikimori.REPEATING
+
+    else -> throw Exception("Unknown status")
+}

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

@@ -1,24 +0,0 @@
-package eu.kanade.tachiyomi.data.track.shikomori
-
-import eu.kanade.tachiyomi.data.database.models.Track
-
-fun Track.toShikomoriStatus() = when (status) {
-    Shikomori.READING -> "watching"
-    Shikomori.COMPLETED -> "completed"
-    Shikomori.ON_HOLD -> "on_hold"
-    Shikomori.DROPPED -> "dropped"
-    Shikomori.PLANNING -> "planned"
-    Shikomori.REPEATING -> "rewatching"
-    else -> throw NotImplementedError("Unknown status")
-}
-
-fun toTrackStatus(status: String) = when (status) {
-    "watching" -> Shikomori.READING
-    "completed" -> Shikomori.COMPLETED
-    "on_hold" -> Shikomori.ON_HOLD
-    "dropped" -> Shikomori.DROPPED
-    "planned" -> Shikomori.PLANNING
-    "rewatching" -> Shikomori.REPEATING
-
-    else -> throw Exception("Unknown status")
-}

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

@@ -1,7 +0,0 @@
-package eu.kanade.tachiyomi.data.updater
-
-sealed class GithubUpdateResult {
-
-    class NewUpdate(val release: GithubRelease): GithubUpdateResult()
-    class NoNewUpdate : GithubUpdateResult()
-}

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

@@ -0,0 +1,13 @@
+package eu.kanade.tachiyomi.data.updater
+
+interface Release {
+
+    val info: String
+
+    /**
+     * Get download link of latest release.
+     * @return download link of latest release.
+     */
+    val downloadLink: String
+
+}

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

@@ -0,0 +1,25 @@
+package eu.kanade.tachiyomi.data.updater
+
+import eu.kanade.tachiyomi.BuildConfig
+import eu.kanade.tachiyomi.data.updater.devrepo.DevRepoUpdateChecker
+import eu.kanade.tachiyomi.data.updater.github.GithubUpdateChecker
+import rx.Observable
+
+abstract class UpdateChecker {
+
+    companion object {
+        fun getUpdateChecker(): UpdateChecker {
+            return if (BuildConfig.DEBUG) {
+                DevRepoUpdateChecker()
+            } else {
+                GithubUpdateChecker()
+            }
+        }
+    }
+
+    /**
+     * Returns observable containing release information
+     */
+    abstract fun checkForUpdate(): Observable<UpdateResult>
+
+}

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

@@ -0,0 +1,8 @@
+package eu.kanade.tachiyomi.data.updater
+
+abstract class UpdateResult {
+
+    open class NewUpdate<T : Release>(val release: T): UpdateResult()
+    open class NoNewUpdate: UpdateResult()
+
+}

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

@@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.data.updater
 
 import android.app.PendingIntent
 import android.content.Intent
+import android.os.Build
 import android.support.v4.app.NotificationCompat
 import com.evernote.android.job.Job
 import com.evernote.android.job.JobManager
@@ -13,10 +14,15 @@ import eu.kanade.tachiyomi.util.notificationManager
 class UpdaterJob : Job() {
 
     override fun onRunJob(params: Params): Result {
-        return GithubUpdateChecker()
+        // Android 4.x is no longer supported
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            return Result.SUCCESS
+        }
+
+        return UpdateChecker.getUpdateChecker()
                 .checkForUpdate()
                 .map { result ->
-                    if (result is GithubUpdateResult.NewUpdate) {
+                    if (result is UpdateResult.NewUpdate<*>) {
                         val url = result.release.downloadLink
 
                         val intent = Intent(context, UpdaterService::class.java).apply {
@@ -33,9 +39,9 @@ class UpdaterJob : Job() {
                                     PendingIntent.getService(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT))
                         }
                     }
-                    Job.Result.SUCCESS
+                    Result.SUCCESS
                 }
-                .onErrorReturn { Job.Result.FAILURE }
+                .onErrorReturn { Result.FAILURE }
                 // Sadly, the task needs to be synchronous.
                 .toBlocking()
                 .single()
@@ -64,4 +70,4 @@ class UpdaterJob : Job() {
         }
     }
 
-}
+}

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

@@ -0,0 +1,14 @@
+package eu.kanade.tachiyomi.data.updater.devrepo
+
+import eu.kanade.tachiyomi.data.updater.Release
+
+class DevRepoRelease(override val info: String) : Release {
+
+    override val downloadLink: String
+        get() = LATEST_URL
+
+    companion object {
+        const val LATEST_URL = "https://tachiyomi.kanade.eu/latest"
+    }
+
+}

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

@@ -0,0 +1,40 @@
+package eu.kanade.tachiyomi.data.updater.devrepo
+
+import eu.kanade.tachiyomi.BuildConfig
+import eu.kanade.tachiyomi.data.updater.UpdateChecker
+import eu.kanade.tachiyomi.data.updater.UpdateResult
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.NetworkHelper
+import eu.kanade.tachiyomi.network.asObservable
+import okhttp3.OkHttpClient
+import rx.Observable
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+class DevRepoUpdateChecker : UpdateChecker() {
+
+    private val client: OkHttpClient by lazy {
+        Injekt.get<NetworkHelper>().client.newBuilder()
+                .followRedirects(false)
+                .build()
+    }
+
+    private val versionRegex: Regex by lazy {
+        Regex("tachiyomi-r(\\d+).apk")
+    }
+
+    override fun checkForUpdate(): Observable<UpdateResult> {
+        return client.newCall(GET(DevRepoRelease.LATEST_URL)).asObservable()
+                .map { response ->
+                    // Get latest repo version number from header in format "Location: tachiyomi-r1512.apk"
+                    val latestVersionNumber: String = versionRegex.find(response.header("Location")!!)!!.groupValues[1]
+
+                    if (latestVersionNumber.toInt() > BuildConfig.COMMIT_COUNT.toInt()) {
+                        DevRepoUpdateResult.NewUpdate(DevRepoRelease("v$latestVersionNumber"))
+                    } else {
+                        DevRepoUpdateResult.NoNewUpdate()
+                    }
+                }
+    }
+
+}

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

@@ -0,0 +1,10 @@
+package eu.kanade.tachiyomi.data.updater.devrepo
+
+import eu.kanade.tachiyomi.data.updater.UpdateResult
+
+sealed class DevRepoUpdateResult : UpdateResult() {
+
+    class NewUpdate(release: DevRepoRelease): UpdateResult.NewUpdate<DevRepoRelease>(release)
+    class NoNewUpdate: UpdateResult.NoNewUpdate()
+
+}

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

@@ -1,24 +1,25 @@
-package eu.kanade.tachiyomi.data.updater
+package eu.kanade.tachiyomi.data.updater.github
 
 import com.google.gson.annotations.SerializedName
+import eu.kanade.tachiyomi.data.updater.Release
 
 /**
  * Release object.
  * Contains information about the latest release from Github.
  *
  * @param version version of latest release.
- * @param changeLog log of latest release.
+ * @param info log of latest release.
  * @param assets assets of latest release.
  */
 class GithubRelease(@SerializedName("tag_name") val version: String,
-                    @SerializedName("body") val changeLog: String,
-                    @SerializedName("assets") private val assets: List<Assets>) {
+                    @SerializedName("body") override val info: String,
+                    @SerializedName("assets") private val assets: List<Assets>): Release {
 
     /**
      * Get download link of latest release from the assets.
      * @return download link of latest release.
      */
-    val downloadLink: String
+    override val downloadLink: String
         get() = assets[0].downloadLink
 
     /**

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

@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.data.updater
+package eu.kanade.tachiyomi.data.updater.github
 
 import eu.kanade.tachiyomi.network.NetworkHelper
 import retrofit2.Retrofit
@@ -30,4 +30,4 @@ interface GithubService {
     @GET("/repos/inorichi/tachiyomi/releases/latest")
     fun getLatestVersion(): Observable<GithubRelease>
 
-}
+}

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

@@ -1,16 +1,15 @@
-package eu.kanade.tachiyomi.data.updater
+package eu.kanade.tachiyomi.data.updater.github
 
 import eu.kanade.tachiyomi.BuildConfig
+import eu.kanade.tachiyomi.data.updater.UpdateChecker
+import eu.kanade.tachiyomi.data.updater.UpdateResult
 import rx.Observable
 
-class GithubUpdateChecker {
+class GithubUpdateChecker : UpdateChecker() {
 
     private val service: GithubService = GithubService.create()
 
-    /**
-     * Returns observable containing release information
-     */
-    fun checkForUpdate(): Observable<GithubUpdateResult> {
+    override fun checkForUpdate(): Observable<UpdateResult> {
         return service.getLatestVersion().map { release ->
             val newVersion = release.version.replace("[^\\d.]".toRegex(), "")
 
@@ -22,4 +21,5 @@ class GithubUpdateChecker {
             }
         }
     }
-}
+
+}

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

@@ -0,0 +1,10 @@
+package eu.kanade.tachiyomi.data.updater.github
+
+import eu.kanade.tachiyomi.data.updater.UpdateResult
+
+sealed class GithubUpdateResult : UpdateResult() {
+
+    class NewUpdate(release: GithubRelease): UpdateResult.NewUpdate<GithubRelease>(release)
+    class NoNewUpdate : UpdateResult.NoNewUpdate()
+
+}

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

@@ -13,7 +13,7 @@ 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 kotlinx.coroutines.async
 import rx.Observable
 import rx.android.schedulers.AndroidSchedulers
 import rx.schedulers.Schedulers

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

@@ -7,6 +7,7 @@ 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.extension.util.ExtensionLoader
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.network.asObservableSuccess
@@ -36,17 +37,23 @@ internal class ExtensionGithubApi {
 
         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")}"
+        return json
+                .filter { element ->
+                    val versionName = element["version"].string
+                    val libVersion = versionName.substringBeforeLast('.').toDouble()
+                    libVersion >= ExtensionLoader.LIB_VERSION_MIN && libVersion <= ExtensionLoader.LIB_VERSION_MAX
+                }
+                .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)
-        }
+                    Extension.Available(name, pkgName, versionName, versionCode, lang, apkName, icon)
+                }
     }
 
     fun getApkUrl(extension: Extension.Available): String {

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

@@ -39,7 +39,7 @@ class ExtensionInstallActivity : Activity() {
     }
 
     private fun checkInstallationResult(resultCode: Int) {
-        val downloadId = intent.extras.getLong(ExtensionInstaller.EXTRA_DOWNLOAD_ID)
+        val downloadId = intent.extras!!.getLong(ExtensionInstaller.EXTRA_DOWNLOAD_ID)
         val success = resultCode == RESULT_OK
 
         val extensionManager = Injekt.get<ExtensionManager>()

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

@@ -7,7 +7,10 @@ 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
+import kotlinx.coroutines.CoroutineStart
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.async
 
 /**
  * Broadcast receiver that listens for the system's packages installed, updated or removed, and only
@@ -91,7 +94,7 @@ internal class ExtensionInstallReceiver(private val listener: Listener) :
     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()
+        return GlobalScope.async(Dispatchers.Default, CoroutineStart.DEFAULT, { ExtensionLoader.loadExtensionFromPkgName(context, pkgName) }).await()
     }
 
     /**

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

@@ -13,8 +13,8 @@ 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 kotlinx.coroutines.async
+import kotlinx.coroutines.runBlocking
 import timber.log.Timber
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
@@ -27,8 +27,8 @@ 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
+    const val LIB_VERSION_MIN = 1.0
+    const val LIB_VERSION_MAX = 1.2
 
     private const val PACKAGE_FLAGS = PackageManager.GET_CONFIGURATIONS or PackageManager.GET_SIGNATURES
 
@@ -100,10 +100,16 @@ internal object ExtensionLoader {
         val versionName = pkgInfo.versionName
         val versionCode = pkgInfo.versionCode
 
+        if (versionName.isNullOrEmpty()) {
+            val exception = Exception("Missing versionName for extension $extName")
+            Timber.w(exception)
+            return LoadResult.Error(exception)
+        }
+
         // 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 " +
+        val libVersion = versionName.substringBeforeLast('.').toDouble()
+        if (libVersion < LIB_VERSION_MIN || libVersion > LIB_VERSION_MAX) {
+            val exception = Exception("Lib version is $libVersion, while only versions " +
                     "$LIB_VERSION_MIN to $LIB_VERSION_MAX are allowed")
             Timber.w(exception)
             return LoadResult.Error(exception)
@@ -121,7 +127,7 @@ internal object ExtensionLoader {
 
         val classLoader = PathClassLoader(appInfo.sourceDir, null, context.classLoader)
 
-        val sources = appInfo.metaData.getString(METADATA_SOURCE_CLASS)
+        val sources = appInfo.metaData.getString(METADATA_SOURCE_CLASS)!!
                 .split(";")
                 .map {
                     val sourceClass = it.trim()

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

@@ -46,12 +46,22 @@ class AndroidCookieJar(context: Context) : CookieJar {
         }
     }
 
-    fun remove(url: HttpUrl) {
-        val cookies = manager.getCookie(url.toString()) ?: return
-        val domain = ".${url.host()}"
+    fun remove(url: HttpUrl, cookieNames: List<String>? = null, maxAge: Int = -1) {
+        val urlString = url.toString()
+        val cookies = manager.getCookie(urlString) ?: return
+
+        fun List<String>.filterNames(): List<String> {
+            return if (cookieNames != null) {
+                this.filter { it in cookieNames }
+            } else {
+                this
+            }
+        }
+
         cookies.split(";")
             .map { it.substringBefore("=") }
-            .onEach { manager.setCookie(domain, "$it=;Max-Age=-1") }
+            .filterNames()
+            .onEach { manager.setCookie(urlString, "$it=;Max-Age=$maxAge") }
 
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
             syncManager.sync()
@@ -66,5 +76,4 @@ class AndroidCookieJar(context: Context) : CookieJar {
             syncManager.sync()
         }
     }
-
 }

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

@@ -1,154 +1,140 @@
-package eu.kanade.tachiyomi.network
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.os.Build
-import android.os.Handler
-import android.os.Looper
-import android.webkit.WebResourceResponse
-import android.webkit.WebSettings
-import android.webkit.WebView
-import eu.kanade.tachiyomi.util.WebViewClientCompat
-import okhttp3.Interceptor
-import okhttp3.Request
-import okhttp3.Response
-import java.io.IOException
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
-
-class CloudflareInterceptor(private val context: Context) : Interceptor {
-
-    private val serverCheck = arrayOf("cloudflare-nginx", "cloudflare")
-
-    private val handler = Handler(Looper.getMainLooper())
-
-    /**
-     * When this is called, it initializes the WebView if it wasn't already. We use this to avoid
-     * blocking the main thread too much. If used too often we could consider moving it to the
-     * Application class.
-     */
-    private val initWebView by lazy {
-        if (Build.VERSION.SDK_INT >= 17) {
-            WebSettings.getDefaultUserAgent(context)
-        } else {
-            null
-        }
-    }
-
-    @Synchronized
-    override fun intercept(chain: Interceptor.Chain): Response {
-        initWebView
-
-        val response = chain.proceed(chain.request())
-
-        // Check if Cloudflare anti-bot is on
-        if (response.code() == 503 && response.header("Server") in serverCheck) {
-            try {
-                response.close()
-                val solutionRequest = resolveWithWebView(chain.request())
-                return chain.proceed(solutionRequest)
-            } catch (e: Exception) {
-                // Because OkHttp's enqueue only handles IOExceptions, wrap the exception so that
-                // we don't crash the entire app
-                throw IOException(e)
-            }
-        }
-
-        return response
-    }
-
-    private fun isChallengeSolutionUrl(url: String): Boolean {
-        return "chk_jschl" in url
-    }
-
-    @SuppressLint("SetJavaScriptEnabled")
-    private fun resolveWithWebView(request: Request): Request {
-        // We need to lock this thread until the WebView finds the challenge solution url, because
-        // OkHttp doesn't support asynchronous interceptors.
-        val latch = CountDownLatch(1)
-
-        var webView: WebView? = null
-        var solutionUrl: String? = null
-        var challengeFound = false
-
-        val origRequestUrl = request.url().toString()
-        val headers = request.headers().toMultimap().mapValues { it.value.getOrNull(0) ?: "" }
-
-        handler.post {
-            val view = WebView(context)
-            webView = view
-            view.settings.javaScriptEnabled = true
-            view.settings.userAgentString = request.header("User-Agent")
-            view.webViewClient = object : WebViewClientCompat() {
-
-                override fun shouldOverrideUrlCompat(view: WebView, url: String): Boolean {
-                    if (isChallengeSolutionUrl(url)) {
-                        solutionUrl = url
-                        latch.countDown()
-                    }
-                    return solutionUrl != null
-                }
-
-                override fun shouldInterceptRequestCompat(
-                        view: WebView,
-                        url: String
-                ): WebResourceResponse? {
-                    if (solutionUrl != null) {
-                        // Intercept any request when we have the solution.
-                        return WebResourceResponse("text/plain", "UTF-8", null)
-                    }
-                    return null
-                }
-
-                override fun onPageFinished(view: WebView, url: String) {
-                    // Http error codes are only received since M
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
-                        url == origRequestUrl && !challengeFound
-                    ) {
-                        // The first request didn't return the challenge, abort.
-                        latch.countDown()
-                    }
-                }
-
-                override fun onReceivedErrorCompat(
-                        view: WebView,
-                        errorCode: Int,
-                        description: String?,
-                        failingUrl: String,
-                        isMainFrame: Boolean
-                ) {
-                    if (isMainFrame) {
-                        if (errorCode == 503) {
-                            // Found the cloudflare challenge page.
-                            challengeFound = true
-                        } else {
-                            // Unlock thread, the challenge wasn't found.
-                            latch.countDown()
-                        }
-                    }
-                }
-            }
-            webView?.loadUrl(origRequestUrl, headers)
-        }
-
-        // Wait a reasonable amount of time to retrieve the solution. The minimum should be
-        // around 4 seconds but it can take more due to slow networks or server issues.
-        latch.await(12, TimeUnit.SECONDS)
-
-        handler.post {
-            webView?.stopLoading()
-            webView?.destroy()
-        }
-
-        val solution = solutionUrl ?: throw Exception("Challenge not found")
-
-        return Request.Builder().get()
-            .url(solution)
-            .headers(request.headers())
-            .addHeader("Referer", origRequestUrl)
-            .addHeader("Accept", "text/html,application/xhtml+xml,application/xml")
-            .addHeader("Accept-Language", "en")
-            .build()
-    }
-
-}
+package eu.kanade.tachiyomi.network
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.os.Build
+import android.os.Handler
+import android.os.Looper
+import android.webkit.WebSettings
+import android.webkit.WebView
+import eu.kanade.tachiyomi.util.WebViewClientCompat
+import okhttp3.*
+import uy.kohesive.injekt.injectLazy
+import java.io.IOException
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+class CloudflareInterceptor(private val context: Context) : Interceptor {
+
+    private val serverCheck = arrayOf("cloudflare-nginx", "cloudflare")
+
+    private val handler = Handler(Looper.getMainLooper())
+
+    private val networkHelper: NetworkHelper by injectLazy()
+
+    /**
+     * When this is called, it initializes the WebView if it wasn't already. We use this to avoid
+     * blocking the main thread too much. If used too often we could consider moving it to the
+     * Application class.
+     */
+    private val initWebView by lazy {
+        if (Build.VERSION.SDK_INT >= 17) {
+            WebSettings.getDefaultUserAgent(context)
+        } else {
+            null
+        }
+    }
+
+    @Synchronized
+    override fun intercept(chain: Interceptor.Chain): Response {
+        initWebView
+
+        val originalRequest = chain.request()
+        val response = chain.proceed(originalRequest)
+
+        // Check if Cloudflare anti-bot is on
+        if (response.code() == 503 && response.header("Server") in serverCheck) {
+            try {
+                response.close()
+                networkHelper.cookieManager.remove(originalRequest.url(), listOf("__cfduid", "cf_clearance"), 0)
+                val oldCookie = networkHelper.cookieManager.get(originalRequest.url())
+                        .firstOrNull { it.name() == "cf_clearance" }
+                return if (resolveWithWebView(originalRequest, oldCookie)) {
+                    chain.proceed(originalRequest)
+                } else {
+                    throw IOException("Failed to bypass Cloudflare!")
+                }
+            } catch (e: Exception) {
+                // Because OkHttp's enqueue only handles IOExceptions, wrap the exception so that
+                // we don't crash the entire app
+                throw IOException(e)
+            }
+        }
+
+        return response
+    }
+
+    @SuppressLint("SetJavaScriptEnabled")
+    private fun resolveWithWebView(request: Request, oldCookie: Cookie?): Boolean {
+        // We need to lock this thread until the WebView finds the challenge solution url, because
+        // OkHttp doesn't support asynchronous interceptors.
+        val latch = CountDownLatch(1)
+
+        var webView: WebView? = null
+        var challengeFound = false
+        var cloudflareBypassed = false
+
+        val origRequestUrl = request.url().toString()
+        val headers = request.headers().toMultimap().mapValues { it.value.getOrNull(0) ?: "" }
+
+        handler.post {
+            val view = WebView(context)
+            webView = view
+            view.settings.javaScriptEnabled = true
+            view.settings.userAgentString = request.header("User-Agent")
+            view.webViewClient = object : WebViewClientCompat() {
+
+                override fun onPageFinished(view: WebView, url: String) {
+                    fun isCloudFlareBypassed(): Boolean {
+                        return networkHelper.cookieManager.get(HttpUrl.parse(origRequestUrl)!!)
+                                .firstOrNull { it.name() == "cf_clearance" }
+                                .let { it != null && it != oldCookie }
+                    }
+
+                    if (isCloudFlareBypassed()) {
+                        cloudflareBypassed = true
+                        latch.countDown()
+                    }
+                    // Http error codes are only received since M
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
+                        url == origRequestUrl && !challengeFound
+                    ) {
+                        // The first request didn't return the challenge, abort.
+                        latch.countDown()
+                    }
+                }
+
+                override fun onReceivedErrorCompat(
+                        view: WebView,
+                        errorCode: Int,
+                        description: String?,
+                        failingUrl: String,
+                        isMainFrame: Boolean
+                ) {
+                    if (isMainFrame) {
+                        if (errorCode == 503) {
+                            // Found the cloudflare challenge page.
+                            challengeFound = true
+                        } else {
+                            // Unlock thread, the challenge wasn't found.
+                            latch.countDown()
+                        }
+                    }
+                }
+            }
+            webView?.loadUrl(origRequestUrl, headers)
+        }
+
+        // Wait a reasonable amount of time to retrieve the solution. The minimum should be
+        // around 4 seconds but it can take more due to slow networks or server issues.
+        latch.await(12, TimeUnit.SECONDS)
+
+        handler.post {
+            webView?.stopLoading()
+            webView?.destroy()
+        }
+
+        return cloudflareBypassed
+    }
+
+}

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

@@ -1,117 +1,117 @@
-package eu.kanade.tachiyomi.network
-
-import android.content.Context
-import android.os.Build
-import okhttp3.*
-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.*
-
-class NetworkHelper(context: Context) {
-
-    private val cacheDir = File(context.cacheDir, "network_cache")
-
-    private val cacheSize = 5L * 1024 * 1024 // 5 MiB
-
-    val cookieManager = AndroidCookieJar(context)
-
-    val client = OkHttpClient.Builder()
-            .cookieJar(cookieManager)
-            .cache(Cache(cacheDir, cacheSize))
-            .enableTLS12()
-            .build()
-
-    val cloudflareClient = client.newBuilder()
-            .addInterceptor(CloudflareInterceptor(context))
-            .build()
-
-    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
-    }
-}
+package eu.kanade.tachiyomi.network
+
+import android.content.Context
+import android.os.Build
+import okhttp3.*
+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.*
+
+class NetworkHelper(context: Context) {
+
+    private val cacheDir = File(context.cacheDir, "network_cache")
+
+    private val cacheSize = 5L * 1024 * 1024 // 5 MiB
+
+    val cookieManager = AndroidCookieJar(context)
+
+    val client = OkHttpClient.Builder()
+            .cookieJar(cookieManager)
+            .cache(Cache(cacheDir, cacheSize))
+            .enableTLS12()
+            .build()
+
+    val cloudflareClient = client.newBuilder()
+            .addInterceptor(CloudflareInterceptor(context))
+            .build()
+
+    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/network/OkHttpExtensions.kt

@@ -1,70 +1,70 @@
-package eu.kanade.tachiyomi.network
-
-import okhttp3.Call
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
-import rx.Observable
-import rx.Producer
-import rx.Subscription
-import java.util.concurrent.atomic.AtomicBoolean
-
-fun Call.asObservable(): Observable<Response> {
-    return Observable.unsafeCreate { subscriber ->
-        // Since Call is a one-shot type, clone it for each new subscriber.
-        val call = clone()
-
-        // Wrap the call in a helper which handles both unsubscription and backpressure.
-        val requestArbiter = object : AtomicBoolean(), Producer, Subscription {
-            override fun request(n: Long) {
-                if (n == 0L || !compareAndSet(false, true)) return
-
-                try {
-                    val response = call.execute()
-                    if (!subscriber.isUnsubscribed) {
-                        subscriber.onNext(response)
-                        subscriber.onCompleted()
-                    }
-                } catch (error: Exception) {
-                    if (!subscriber.isUnsubscribed) {
-                        subscriber.onError(error)
-                    }
-                }
-            }
-
-            override fun unsubscribe() {
-                call.cancel()
-            }
-
-            override fun isUnsubscribed(): Boolean {
-                return call.isCanceled
-            }
-        }
-
-        subscriber.add(requestArbiter)
-        subscriber.setProducer(requestArbiter)
-    }
-}
-
-fun Call.asObservableSuccess(): Observable<Response> {
-    return asObservable().doOnNext { response ->
-        if (!response.isSuccessful) {
-            response.close()
-            throw Exception("HTTP error ${response.code()}")
-        }
-    }
-}
-
-fun OkHttpClient.newCallWithProgress(request: Request, listener: ProgressListener): Call {
-    val progressClient = newBuilder()
-            .cache(null)
-            .addNetworkInterceptor { chain ->
-                val originalResponse = chain.proceed(chain.request())
-                originalResponse.newBuilder()
-                        .body(ProgressResponseBody(originalResponse.body()!!, listener))
-                        .build()
-            }
-            .build()
-
-    return progressClient.newCall(request)
+package eu.kanade.tachiyomi.network
+
+import okhttp3.Call
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import rx.Observable
+import rx.Producer
+import rx.Subscription
+import java.util.concurrent.atomic.AtomicBoolean
+
+fun Call.asObservable(): Observable<Response> {
+    return Observable.unsafeCreate { subscriber ->
+        // Since Call is a one-shot type, clone it for each new subscriber.
+        val call = clone()
+
+        // Wrap the call in a helper which handles both unsubscription and backpressure.
+        val requestArbiter = object : AtomicBoolean(), Producer, Subscription {
+            override fun request(n: Long) {
+                if (n == 0L || !compareAndSet(false, true)) return
+
+                try {
+                    val response = call.execute()
+                    if (!subscriber.isUnsubscribed) {
+                        subscriber.onNext(response)
+                        subscriber.onCompleted()
+                    }
+                } catch (error: Exception) {
+                    if (!subscriber.isUnsubscribed) {
+                        subscriber.onError(error)
+                    }
+                }
+            }
+
+            override fun unsubscribe() {
+                call.cancel()
+            }
+
+            override fun isUnsubscribed(): Boolean {
+                return call.isCanceled
+            }
+        }
+
+        subscriber.add(requestArbiter)
+        subscriber.setProducer(requestArbiter)
+    }
+}
+
+fun Call.asObservableSuccess(): Observable<Response> {
+    return asObservable().doOnNext { response ->
+        if (!response.isSuccessful) {
+            response.close()
+            throw Exception("HTTP error ${response.code()}")
+        }
+    }
+}
+
+fun OkHttpClient.newCallWithProgress(request: Request, listener: ProgressListener): Call {
+    val progressClient = newBuilder()
+            .cache(null)
+            .addNetworkInterceptor { chain ->
+                val originalResponse = chain.proceed(chain.request())
+                originalResponse.newBuilder()
+                        .body(ProgressResponseBody(originalResponse.body()!!, listener))
+                        .build()
+            }
+            .build()
+
+    return progressClient.newCall(request)
 }

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

@@ -1,5 +1,5 @@
-package eu.kanade.tachiyomi.network
-
-interface ProgressListener {
-    fun update(bytesRead: Long, contentLength: Long, done: Boolean)
+package eu.kanade.tachiyomi.network
+
+interface ProgressListener {
+    fun update(bytesRead: Long, contentLength: Long, done: Boolean)
 }

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

@@ -1,40 +1,40 @@
-package eu.kanade.tachiyomi.network
-
-import okhttp3.MediaType
-import okhttp3.ResponseBody
-import okio.*
-import java.io.IOException
-
-class ProgressResponseBody(private val responseBody: ResponseBody, private val progressListener: ProgressListener) : ResponseBody() {
-
-    private val bufferedSource: BufferedSource by lazy {
-        Okio.buffer(source(responseBody.source()))
-    }
-
-    override fun contentType(): MediaType {
-        return responseBody.contentType()!!
-    }
-
-    override fun contentLength(): Long {
-        return responseBody.contentLength()
-    }
-
-    override fun source(): BufferedSource {
-        return bufferedSource
-    }
-
-    private fun source(source: Source): Source {
-        return object : ForwardingSource(source) {
-            internal var totalBytesRead = 0L
-
-            @Throws(IOException::class)
-            override fun read(sink: Buffer, byteCount: Long): Long {
-                val bytesRead = super.read(sink, byteCount)
-                // read() returns the number of bytes read, or -1 if this source is exhausted.
-                totalBytesRead += if (bytesRead != -1L) bytesRead else 0
-                progressListener.update(totalBytesRead, responseBody.contentLength(), bytesRead == -1L)
-                return bytesRead
-            }
-        }
-    }
+package eu.kanade.tachiyomi.network
+
+import okhttp3.MediaType
+import okhttp3.ResponseBody
+import okio.*
+import java.io.IOException
+
+class ProgressResponseBody(private val responseBody: ResponseBody, private val progressListener: ProgressListener) : ResponseBody() {
+
+    private val bufferedSource: BufferedSource by lazy {
+        Okio.buffer(source(responseBody.source()))
+    }
+
+    override fun contentType(): MediaType {
+        return responseBody.contentType()!!
+    }
+
+    override fun contentLength(): Long {
+        return responseBody.contentLength()
+    }
+
+    override fun source(): BufferedSource {
+        return bufferedSource
+    }
+
+    private fun source(source: Source): Source {
+        return object : ForwardingSource(source) {
+            internal var totalBytesRead = 0L
+
+            @Throws(IOException::class)
+            override fun read(sink: Buffer, byteCount: Long): Long {
+                val bytesRead = super.read(sink, byteCount)
+                // read() returns the number of bytes read, or -1 if this source is exhausted.
+                totalBytesRead += if (bytesRead != -1L) bytesRead else 0
+                progressListener.update(totalBytesRead, responseBody.contentLength(), bytesRead == -1L)
+                return bytesRead
+            }
+        }
+    }
 }

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

@@ -1,32 +1,32 @@
-package eu.kanade.tachiyomi.network
-
-import okhttp3.*
-import java.util.concurrent.TimeUnit.MINUTES
-
-private val DEFAULT_CACHE_CONTROL = CacheControl.Builder().maxAge(10, MINUTES).build()
-private val DEFAULT_HEADERS = Headers.Builder().build()
-private val DEFAULT_BODY: RequestBody = FormBody.Builder().build()
-
-fun GET(url: String,
-        headers: Headers = DEFAULT_HEADERS,
-        cache: CacheControl = DEFAULT_CACHE_CONTROL): Request {
-
-    return Request.Builder()
-            .url(url)
-            .headers(headers)
-            .cacheControl(cache)
-            .build()
-}
-
-fun POST(url: String,
-         headers: Headers = DEFAULT_HEADERS,
-         body: RequestBody = DEFAULT_BODY,
-         cache: CacheControl = DEFAULT_CACHE_CONTROL): Request {
-
-    return Request.Builder()
-            .url(url)
-            .post(body)
-            .headers(headers)
-            .cacheControl(cache)
-            .build()
-}
+package eu.kanade.tachiyomi.network
+
+import okhttp3.*
+import java.util.concurrent.TimeUnit.MINUTES
+
+private val DEFAULT_CACHE_CONTROL = CacheControl.Builder().maxAge(10, MINUTES).build()
+private val DEFAULT_HEADERS = Headers.Builder().build()
+private val DEFAULT_BODY: RequestBody = FormBody.Builder().build()
+
+fun GET(url: String,
+        headers: Headers = DEFAULT_HEADERS,
+        cache: CacheControl = DEFAULT_CACHE_CONTROL): Request {
+
+    return Request.Builder()
+            .url(url)
+            .headers(headers)
+            .cacheControl(cache)
+            .build()
+}
+
+fun POST(url: String,
+         headers: Headers = DEFAULT_HEADERS,
+         body: RequestBody = DEFAULT_BODY,
+         cache: CacheControl = DEFAULT_CACHE_CONTROL): Request {
+
+    return Request.Builder()
+            .url(url)
+            .post(body)
+            .headers(headers)
+            .cacheControl(cache)
+            .build()
+}

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

@@ -1,46 +1,46 @@
-package eu.kanade.tachiyomi.source
-
-import eu.kanade.tachiyomi.source.model.FilterList
-import eu.kanade.tachiyomi.source.model.MangasPage
-import rx.Observable
-
-interface CatalogueSource : Source {
-
-    /**
-     * An ISO 639-1 compliant language code (two letters in lower case).
-     */
-    val lang: String
-
-    /**
-     * Whether the source has support for latest updates.
-     */
-    val supportsLatest: Boolean
-
-    /**
-     * Returns an observable containing a page with a list of manga.
-     *
-     * @param page the page number to retrieve.
-     */
-    fun fetchPopularManga(page: Int): Observable<MangasPage>
-
-    /**
-     * Returns an observable containing a page with a list of manga.
-     *
-     * @param page the page number to retrieve.
-     * @param query the search query.
-     * @param filters the list of filters to apply.
-     */
-    fun fetchSearchManga(page: Int, query: String, filters: FilterList): Observable<MangasPage>
-
-    /**
-     * Returns an observable containing a page with a list of latest manga updates.
-     *
-     * @param page the page number to retrieve.
-     */
-    fun fetchLatestUpdates(page: Int): Observable<MangasPage>
-
-    /**
-     * Returns the list of filters for the source.
-     */
-    fun getFilterList(): FilterList
+package eu.kanade.tachiyomi.source
+
+import eu.kanade.tachiyomi.source.model.FilterList
+import eu.kanade.tachiyomi.source.model.MangasPage
+import rx.Observable
+
+interface CatalogueSource : Source {
+
+    /**
+     * An ISO 639-1 compliant language code (two letters in lower case).
+     */
+    val lang: String
+
+    /**
+     * Whether the source has support for latest updates.
+     */
+    val supportsLatest: Boolean
+
+    /**
+     * Returns an observable containing a page with a list of manga.
+     *
+     * @param page the page number to retrieve.
+     */
+    fun fetchPopularManga(page: Int): Observable<MangasPage>
+
+    /**
+     * Returns an observable containing a page with a list of manga.
+     *
+     * @param page the page number to retrieve.
+     * @param query the search query.
+     * @param filters the list of filters to apply.
+     */
+    fun fetchSearchManga(page: Int, query: String, filters: FilterList): Observable<MangasPage>
+
+    /**
+     * Returns an observable containing a page with a list of latest manga updates.
+     *
+     * @param page the page number to retrieve.
+     */
+    fun fetchLatestUpdates(page: Int): Observable<MangasPage>
+
+    /**
+     * Returns the list of filters for the source.
+     */
+    fun getFilterList(): FilterList
 }

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

@@ -2,20 +2,24 @@ package eu.kanade.tachiyomi.source
 
 import android.content.Context
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.source.model.*
+import eu.kanade.tachiyomi.source.model.Filter
+import eu.kanade.tachiyomi.source.model.FilterList
+import eu.kanade.tachiyomi.source.model.MangasPage
+import eu.kanade.tachiyomi.source.model.Page
+import eu.kanade.tachiyomi.source.model.SChapter
+import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.util.ChapterRecognition
+import eu.kanade.tachiyomi.util.ComparatorUtil.CaseInsensitiveNaturalComparator
 import eu.kanade.tachiyomi.util.DiskUtil
 import eu.kanade.tachiyomi.util.EpubFile
 import eu.kanade.tachiyomi.util.ImageUtil
 import junrar.Archive
 import junrar.rarfile.FileHeader
-import net.greypanther.natsort.CaseInsensitiveSimpleNaturalComparator
 import rx.Observable
 import timber.log.Timber
 import java.io.File
 import java.io.FileInputStream
 import java.io.InputStream
-import java.util.Comparator
 import java.util.Locale
 import java.util.concurrent.TimeUnit
 import java.util.zip.ZipEntry
@@ -125,7 +129,6 @@ class LocalSource(private val context: Context) : CatalogueSource {
     override fun fetchMangaDetails(manga: SManga) = Observable.just(manga)
 
     override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> {
-        val comparator = CaseInsensitiveSimpleNaturalComparator.getInstance<String>()
         val chapters = getBaseDirectories(context)
                 .mapNotNull { File(it, manga.url).listFiles()?.toList() }
                 .flatten()
@@ -146,7 +149,7 @@ class LocalSource(private val context: Context) : CatalogueSource {
                 }
                 .sortedWith(Comparator { c1, c2 ->
                     val c = c2.chapter_number.compareTo(c1.chapter_number)
-                    if (c == 0) comparator.compare(c2.name, c1.name) else c
+                    if (c == 0) CaseInsensitiveNaturalComparator.compare(c2.name, c1.name) else c
                 })
 
         return Observable.just(chapters)
@@ -189,20 +192,19 @@ class LocalSource(private val context: Context) : CatalogueSource {
 
     private fun updateCover(chapter: SChapter, manga: SManga): File? {
         val format = getFormat(chapter)
-        val comparator = CaseInsensitiveSimpleNaturalComparator.getInstance<String>()
         return when (format) {
             is Format.Directory -> {
                 val entry = format.file.listFiles()
-                    .sortedWith(Comparator<File> { f1, f2 -> comparator.compare(f1.name, f2.name) })
-                    .find { !it.isDirectory && ImageUtil.isImage(it.name, { FileInputStream(it) }) }
+                    .sortedWith(Comparator<File> { f1, f2 -> CaseInsensitiveNaturalComparator.compare(f1.name, f2.name) })
+                    .find { !it.isDirectory && ImageUtil.isImage(it.name) { FileInputStream(it) } }
 
                 entry?.let { updateCover(context, manga, it.inputStream())}
             }
             is Format.Zip -> {
                 ZipFile(format.file).use { zip ->
                     val entry = zip.entries().toList()
-                        .sortedWith(Comparator<ZipEntry> { f1, f2 -> comparator.compare(f1.name, f2.name) })
-                        .find { !it.isDirectory && ImageUtil.isImage(it.name, { zip.getInputStream(it) }) }
+                        .sortedWith(Comparator<ZipEntry> { f1, f2 -> CaseInsensitiveNaturalComparator.compare(f1.name, f2.name) })
+                        .find { !it.isDirectory && ImageUtil.isImage(it.name) { zip.getInputStream(it) } }
 
                     entry?.let { updateCover(context, manga, zip.getInputStream(it) )}
                 }
@@ -210,8 +212,8 @@ class LocalSource(private val context: Context) : CatalogueSource {
             is Format.Rar -> {
                 Archive(format.file).use { archive ->
                     val entry = archive.fileHeaders
-                        .sortedWith(Comparator<FileHeader> { f1, f2 -> comparator.compare(f1.fileNameString, f2.fileNameString) })
-                        .find { !it.isDirectory && ImageUtil.isImage(it.fileNameString, { archive.getInputStream(it) }) }
+                        .sortedWith(Comparator<FileHeader> { f1, f2 -> CaseInsensitiveNaturalComparator.compare(f1.fileNameString, f2.fileNameString) })
+                        .find { !it.isDirectory && ImageUtil.isImage(it.fileNameString) { archive.getInputStream(it) } }
 
                     entry?.let { updateCover(context, manga, archive.getInputStream(it) )}
                 }

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

@@ -1,44 +1,44 @@
-package eu.kanade.tachiyomi.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
-
-/**
- * A basic interface for creating a source. It could be an online source, a local source, etc...
- */
-interface Source {
-
-    /**
-     * Id for the source. Must be unique.
-     */
-    val id: Long
-
-    /**
-     * Name of the source.
-     */
-    val name: String
-
-    /**
-     * Returns an observable with the updated details for a manga.
-     *
-     * @param manga the manga to update.
-     */
-    fun fetchMangaDetails(manga: SManga): Observable<SManga>
-
-    /**
-     * Returns an observable with all the available chapters for a manga.
-     *
-     * @param manga the manga to update.
-     */
-    fun fetchChapterList(manga: SManga): Observable<List<SChapter>>
-
-    /**
-     * Returns an observable with the list of pages a chapter has.
-     *
-     * @param chapter the chapter.
-     */
-    fun fetchPageList(chapter: SChapter): Observable<List<Page>>
-
+package eu.kanade.tachiyomi.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
+
+/**
+ * A basic interface for creating a source. It could be an online source, a local source, etc...
+ */
+interface Source {
+
+    /**
+     * Id for the source. Must be unique.
+     */
+    val id: Long
+
+    /**
+     * Name of the source.
+     */
+    val name: String
+
+    /**
+     * Returns an observable with the updated details for a manga.
+     *
+     * @param manga the manga to update.
+     */
+    fun fetchMangaDetails(manga: SManga): Observable<SManga>
+
+    /**
+     * Returns an observable with all the available chapters for a manga.
+     *
+     * @param manga the manga to update.
+     */
+    fun fetchChapterList(manga: SManga): Observable<List<SChapter>>
+
+    /**
+     * Returns an observable with the list of pages a chapter has.
+     *
+     * @param chapter the chapter.
+     */
+    fun fetchPageList(chapter: SChapter): Observable<List<Page>>
+
 }

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

@@ -1,74 +1,74 @@
-package eu.kanade.tachiyomi.source
-
-import android.content.Context
-import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.source.model.Page
-import eu.kanade.tachiyomi.source.model.SChapter
-import eu.kanade.tachiyomi.source.model.SManga
-import eu.kanade.tachiyomi.source.online.HttpSource
-import rx.Observable
-
-open class SourceManager(private val context: Context) {
-
-    private val sourcesMap = mutableMapOf<Long, Source>()
-
-    private val stubSourcesMap = mutableMapOf<Long, StubSource>()
-
-    init {
-        createInternalSources().forEach { registerSource(it) }
-    }
-
-    open fun get(sourceKey: Long): Source? {
-        return sourcesMap[sourceKey]
-    }
-
-    fun getOrStub(sourceKey: Long): Source {
-        return sourcesMap[sourceKey] ?: stubSourcesMap.getOrPut(sourceKey) {
-            StubSource(sourceKey)
-        }
-    }
-
-    fun getOnlineSources() = sourcesMap.values.filterIsInstance<HttpSource>()
-
-    fun getCatalogueSources() = sourcesMap.values.filterIsInstance<CatalogueSource>()
-
-    internal fun registerSource(source: Source, overwrite: Boolean = false) {
-        if (overwrite || !sourcesMap.containsKey(source.id)) {
-            sourcesMap[source.id] = source
-        }
-    }
-
-    internal fun unregisterSource(source: Source) {
-        sourcesMap.remove(source.id)
-    }
-
-    private fun createInternalSources(): List<Source> = listOf(
-            LocalSource(context)
-    )
-
-    private inner class StubSource(override val id: Long) : Source {
-
-        override val name: String
-            get() = id.toString()
-
-        override fun fetchMangaDetails(manga: SManga): Observable<SManga> {
-            return Observable.error(getSourceNotInstalledException())
-        }
-
-        override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> {
-            return Observable.error(getSourceNotInstalledException())
-        }
-
-        override fun fetchPageList(chapter: SChapter): Observable<List<Page>> {
-            return Observable.error(getSourceNotInstalledException())
-        }
-
-        override fun toString(): String {
-            return name
-        }
-
-        private fun getSourceNotInstalledException(): Exception {
-            return Exception(context.getString(R.string.source_not_installed, id.toString()))
-        }
-    }
-}
+package eu.kanade.tachiyomi.source
+
+import android.content.Context
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.source.model.Page
+import eu.kanade.tachiyomi.source.model.SChapter
+import eu.kanade.tachiyomi.source.model.SManga
+import eu.kanade.tachiyomi.source.online.HttpSource
+import rx.Observable
+
+open class SourceManager(private val context: Context) {
+
+    private val sourcesMap = mutableMapOf<Long, Source>()
+
+    private val stubSourcesMap = mutableMapOf<Long, StubSource>()
+
+    init {
+        createInternalSources().forEach { registerSource(it) }
+    }
+
+    open fun get(sourceKey: Long): Source? {
+        return sourcesMap[sourceKey]
+    }
+
+    fun getOrStub(sourceKey: Long): Source {
+        return sourcesMap[sourceKey] ?: stubSourcesMap.getOrPut(sourceKey) {
+            StubSource(sourceKey)
+        }
+    }
+
+    fun getOnlineSources() = sourcesMap.values.filterIsInstance<HttpSource>()
+
+    fun getCatalogueSources() = sourcesMap.values.filterIsInstance<CatalogueSource>()
+
+    internal fun registerSource(source: Source, overwrite: Boolean = false) {
+        if (overwrite || !sourcesMap.containsKey(source.id)) {
+            sourcesMap[source.id] = source
+        }
+    }
+
+    internal fun unregisterSource(source: Source) {
+        sourcesMap.remove(source.id)
+    }
+
+    private fun createInternalSources(): List<Source> = listOf(
+            LocalSource(context)
+    )
+
+    private inner class StubSource(override val id: Long) : Source {
+
+        override val name: String
+            get() = id.toString()
+
+        override fun fetchMangaDetails(manga: SManga): Observable<SManga> {
+            return Observable.error(getSourceNotInstalledException())
+        }
+
+        override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> {
+            return Observable.error(getSourceNotInstalledException())
+        }
+
+        override fun fetchPageList(chapter: SChapter): Observable<List<Page>> {
+            return Observable.error(getSourceNotInstalledException())
+        }
+
+        override fun toString(): String {
+            return name
+        }
+
+        private fun getSourceNotInstalledException(): Exception {
+            return Exception(context.getString(R.string.source_not_installed, id.toString()))
+        }
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/source/model/Filter.kt

@@ -1,40 +1,40 @@
-package eu.kanade.tachiyomi.source.model
-
-sealed class Filter<T>(val name: String, var state: T) {
-    open class Header(name: String) : Filter<Any>(name, 0)
-    open class Separator(name: String = "") : Filter<Any>(name, 0)
-    abstract class Select<V>(name: String, val values: Array<V>, state: Int = 0) : Filter<Int>(name, state)
-    abstract class Text(name: String, state: String = "") : Filter<String>(name, state)
-    abstract class CheckBox(name: String, state: Boolean = false) : Filter<Boolean>(name, state)
-    abstract class TriState(name: String, state: Int = STATE_IGNORE) : Filter<Int>(name, state) {
-        fun isIgnored() = state == STATE_IGNORE
-        fun isIncluded() = state == STATE_INCLUDE
-        fun isExcluded() = state == STATE_EXCLUDE
-
-        companion object {
-            const val STATE_IGNORE = 0
-            const val STATE_INCLUDE = 1
-            const val STATE_EXCLUDE = 2
-        }
-    }
-    abstract class Group<V>(name: String, state: List<V>): Filter<List<V>>(name, state)
-
-    abstract class Sort(name: String, val values: Array<String>, state: Selection? = null)
-        : Filter<Sort.Selection?>(name, state) {
-        data class Selection(val index: Int, val ascending: Boolean)
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other !is Filter<*>) return false
-
-        return name == other.name && state == other.state
-    }
-
-    override fun hashCode(): Int {
-        var result = name.hashCode()
-        result = 31 * result + (state?.hashCode() ?: 0)
-        return result
-    }
-
+package eu.kanade.tachiyomi.source.model
+
+sealed class Filter<T>(val name: String, var state: T) {
+    open class Header(name: String) : Filter<Any>(name, 0)
+    open class Separator(name: String = "") : Filter<Any>(name, 0)
+    abstract class Select<V>(name: String, val values: Array<V>, state: Int = 0) : Filter<Int>(name, state)
+    abstract class Text(name: String, state: String = "") : Filter<String>(name, state)
+    abstract class CheckBox(name: String, state: Boolean = false) : Filter<Boolean>(name, state)
+    abstract class TriState(name: String, state: Int = STATE_IGNORE) : Filter<Int>(name, state) {
+        fun isIgnored() = state == STATE_IGNORE
+        fun isIncluded() = state == STATE_INCLUDE
+        fun isExcluded() = state == STATE_EXCLUDE
+
+        companion object {
+            const val STATE_IGNORE = 0
+            const val STATE_INCLUDE = 1
+            const val STATE_EXCLUDE = 2
+        }
+    }
+    abstract class Group<V>(name: String, state: List<V>): Filter<List<V>>(name, state)
+
+    abstract class Sort(name: String, val values: Array<String>, state: Selection? = null)
+        : Filter<Sort.Selection?>(name, state) {
+        data class Selection(val index: Int, val ascending: Boolean)
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is Filter<*>) return false
+
+        return name == other.name && state == other.state
+    }
+
+    override fun hashCode(): Int {
+        var result = name.hashCode()
+        result = 31 * result + (state?.hashCode() ?: 0)
+        return result
+    }
+
 }

app/src/main/java/eu/kanade/tachiyomi/source/model/FilterList.kt

@@ -1,7 +1,7 @@
-package eu.kanade.tachiyomi.source.model
-
-data class FilterList(val list: List<Filter<*>>) : List<Filter<*>> by list {
-
-    constructor(vararg fs: Filter<*>) : this(if (fs.isNotEmpty()) fs.asList() else emptyList())
-
+package eu.kanade.tachiyomi.source.model
+
+data class FilterList(val list: List<Filter<*>>) : List<Filter<*>> by list {
+
+    constructor(vararg fs: Filter<*>) : this(if (fs.isNotEmpty()) fs.asList() else emptyList())
+
 }

app/src/main/java/eu/kanade/tachiyomi/source/model/MangasPage.kt

@@ -1,3 +1,3 @@
-package eu.kanade.tachiyomi.source.model
-
+package eu.kanade.tachiyomi.source.model
+
 data class MangasPage(val mangas: List<SManga>, val hasNextPage: Boolean)

app/src/main/java/eu/kanade/tachiyomi/source/model/Page.kt

@@ -1,48 +1,48 @@
-package eu.kanade.tachiyomi.source.model
-
-import android.net.Uri
-import eu.kanade.tachiyomi.network.ProgressListener
-import rx.subjects.Subject
-
-open class Page(
-        val index: Int,
-        val url: String = "",
-        var imageUrl: String? = null,
-        @Transient var uri: Uri? = null // Deprecated but can't be deleted due to extensions
-) : ProgressListener {
-
-    val number: Int
-        get() = index + 1
-
-    @Transient @Volatile var status: Int = 0
-        set(value) {
-            field = value
-            statusSubject?.onNext(value)
-        }
-
-    @Transient @Volatile var progress: Int = 0
-
-    @Transient private var statusSubject: Subject<Int, Int>? = null
-
-    override fun update(bytesRead: Long, contentLength: Long, done: Boolean) {
-        progress = if (contentLength > 0) {
-            (100 * bytesRead / contentLength).toInt()
-        } else {
-            -1
-        }
-    }
-
-    fun setStatusSubject(subject: Subject<Int, Int>?) {
-        this.statusSubject = subject
-    }
-
-    companion object {
-
-        const val QUEUE = 0
-        const val LOAD_PAGE = 1
-        const val DOWNLOAD_IMAGE = 2
-        const val READY = 3
-        const val ERROR = 4
-    }
-
-}
+package eu.kanade.tachiyomi.source.model
+
+import android.net.Uri
+import eu.kanade.tachiyomi.network.ProgressListener
+import rx.subjects.Subject
+
+open class Page(
+        val index: Int,
+        val url: String = "",
+        var imageUrl: String? = null,
+        @Transient var uri: Uri? = null // Deprecated but can't be deleted due to extensions
+) : ProgressListener {
+
+    val number: Int
+        get() = index + 1
+
+    @Transient @Volatile var status: Int = 0
+        set(value) {
+            field = value
+            statusSubject?.onNext(value)
+        }
+
+    @Transient @Volatile var progress: Int = 0
+
+    @Transient private var statusSubject: Subject<Int, Int>? = null
+
+    override fun update(bytesRead: Long, contentLength: Long, done: Boolean) {
+        progress = if (contentLength > 0) {
+            (100 * bytesRead / contentLength).toInt()
+        } else {
+            -1
+        }
+    }
+
+    fun setStatusSubject(subject: Subject<Int, Int>?) {
+        this.statusSubject = subject
+    }
+
+    companion object {
+
+        const val QUEUE = 0
+        const val LOAD_PAGE = 1
+        const val DOWNLOAD_IMAGE = 2
+        const val READY = 3
+        const val ERROR = 4
+    }
+
+}

app/src/main/java/eu/kanade/tachiyomi/source/model/SChapter.kt

@@ -1,31 +1,31 @@
-package eu.kanade.tachiyomi.source.model
-
-import java.io.Serializable
-
-interface SChapter : Serializable {
-
-    var url: String
-
-    var name: String
-
-    var date_upload: Long
-
-    var chapter_number: Float
-
-    var scanlator: String?
-
-    fun copyFrom(other: SChapter) {
-        name = other.name
-        url = other.url
-        date_upload = other.date_upload
-        chapter_number = other.chapter_number
-        scanlator = other.scanlator
-    }
-
-    companion object {
-        fun create(): SChapter {
-            return SChapterImpl()
-        }
-    }
-
+package eu.kanade.tachiyomi.source.model
+
+import java.io.Serializable
+
+interface SChapter : Serializable {
+
+    var url: String
+
+    var name: String
+
+    var date_upload: Long
+
+    var chapter_number: Float
+
+    var scanlator: String?
+
+    fun copyFrom(other: SChapter) {
+        name = other.name
+        url = other.url
+        date_upload = other.date_upload
+        chapter_number = other.chapter_number
+        scanlator = other.scanlator
+    }
+
+    companion object {
+        fun create(): SChapter {
+            return SChapterImpl()
+        }
+    }
+
 }

app/src/main/java/eu/kanade/tachiyomi/source/model/SChapterImpl.kt

@@ -1,15 +1,15 @@
-package eu.kanade.tachiyomi.source.model
-
-class SChapterImpl : SChapter {
-
-    override lateinit var url: String
-
-    override lateinit var name: String
-
-    override var date_upload: Long = 0
-
-    override var chapter_number: Float = -1f
-
-    override  var scanlator: String? = null
-
+package eu.kanade.tachiyomi.source.model
+
+class SChapterImpl : SChapter {
+
+    override lateinit var url: String
+
+    override lateinit var name: String
+
+    override var date_upload: Long = 0
+
+    override var chapter_number: Float = -1f
+
+    override  var scanlator: String? = null
+
 }

app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt

@@ -1,58 +1,58 @@
-package eu.kanade.tachiyomi.source.model
-
-import java.io.Serializable
-
-interface SManga : Serializable {
-
-    var url: String
-
-    var title: String
-
-    var artist: String?
-
-    var author: String?
-
-    var description: String?
-
-    var genre: String?
-
-    var status: Int
-
-    var thumbnail_url: String?
-
-    var initialized: Boolean
-
-    fun copyFrom(other: SManga) {
-        if (other.author != null)
-            author = other.author
-
-        if (other.artist != null)
-            artist = other.artist
-
-        if (other.description != null)
-            description = other.description
-
-        if (other.genre != null)
-            genre = other.genre
-
-        if (other.thumbnail_url != null)
-            thumbnail_url = other.thumbnail_url
-
-        status = other.status
-
-        if (!initialized)
-            initialized = other.initialized
-    }
-
-    companion object {
-        const val UNKNOWN = 0
-        const val ONGOING = 1
-        const val COMPLETED = 2
-        const val LICENSED = 3
-
-        fun create(): SManga {
-            return SMangaImpl()
-        }
-    }
-
+package eu.kanade.tachiyomi.source.model
+
+import java.io.Serializable
+
+interface SManga : Serializable {
+
+    var url: String
+
+    var title: String
+
+    var artist: String?
+
+    var author: String?
+
+    var description: String?
+
+    var genre: String?
+
+    var status: Int
+
+    var thumbnail_url: String?
+
+    var initialized: Boolean
+
+    fun copyFrom(other: SManga) {
+        if (other.author != null)
+            author = other.author
+
+        if (other.artist != null)
+            artist = other.artist
+
+        if (other.description != null)
+            description = other.description
+
+        if (other.genre != null)
+            genre = other.genre
+
+        if (other.thumbnail_url != null)
+            thumbnail_url = other.thumbnail_url
+
+        status = other.status
+
+        if (!initialized)
+            initialized = other.initialized
+    }
+
+    companion object {
+        const val UNKNOWN = 0
+        const val ONGOING = 1
+        const val COMPLETED = 2
+        const val LICENSED = 3
+
+        fun create(): SManga {
+            return SMangaImpl()
+        }
+    }
+
 }

app/src/main/java/eu/kanade/tachiyomi/source/model/SMangaImpl.kt

@@ -1,23 +1,23 @@
-package eu.kanade.tachiyomi.source.model
-
-class SMangaImpl : SManga {
-
-    override lateinit var url: String
-
-    override lateinit var title: String
-
-    override var artist: String? = null
-
-    override var author: String? = null
-
-    override var description: String? = null
-
-    override var genre: String? = null
-
-    override var status: Int = 0
-
-    override var thumbnail_url: String? = null
-
-    override var initialized: Boolean = false
-
+package eu.kanade.tachiyomi.source.model
+
+class SMangaImpl : SManga {
+
+    override lateinit var url: String
+
+    override lateinit var title: String
+
+    override var artist: String? = null
+
+    override var author: String? = null
+
+    override var description: String? = null
+
+    override var genre: String? = null
+
+    override var status: Int = 0
+
+    override var thumbnail_url: String? = null
+
+    override var initialized: Boolean = false
+
 }

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

@@ -1,367 +1,367 @@
-package eu.kanade.tachiyomi.source.online
-
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.NetworkHelper
-import eu.kanade.tachiyomi.network.asObservableSuccess
-import eu.kanade.tachiyomi.network.newCallWithProgress
-import eu.kanade.tachiyomi.source.CatalogueSource
-import eu.kanade.tachiyomi.source.model.*
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
-import rx.Observable
-import uy.kohesive.injekt.injectLazy
-import java.lang.Exception
-import java.net.URI
-import java.net.URISyntaxException
-import java.security.MessageDigest
-
-/**
- * A simple implementation for sources from a website.
- */
-abstract class HttpSource : CatalogueSource {
-
-    /**
-     * Network service.
-     */
-    protected val network: NetworkHelper 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
-     */
-    abstract val baseUrl: String
-
-    /**
-     * Version id used to generate the source id. If the site completely changes and urls are
-     * incompatible, you may increase this value and it'll be considered as a new source.
-     */
-    open val versionId = 1
-
-    /**
-     * Id of the source. By default it uses a generated id using the first 16 characters (64 bits)
-     * of the MD5 of the string: sourcename/language/versionId
-     * Note the generated id sets the sign bit to 0.
-     */
-    override val id by lazy {
-        val key = "${name.toLowerCase()}/$lang/$versionId"
-        val bytes = MessageDigest.getInstance("MD5").digest(key.toByteArray())
-        (0..7).map { bytes[it].toLong() and 0xff shl 8 * (7 - it) }.reduce(Long::or) and Long.MAX_VALUE
-    }
-
-    /**
-     * Headers used for requests.
-     */
-    val headers: Headers by lazy { headersBuilder().build() }
-
-    /**
-     * Default network client for doing requests.
-     */
-    open val client: OkHttpClient
-        get() = network.client
-
-    /**
-     * Headers builder for requests. Implementations can override this method for custom headers.
-     */
-    open protected fun headersBuilder() = Headers.Builder().apply {
-        add("User-Agent", "Mozilla/5.0 (Windows NT 6.3; WOW64)")
-    }
-
-    /**
-     * Visible name of the source.
-     */
-    override fun toString() = "$name (${lang.toUpperCase()})"
-
-    /**
-     * Returns an observable containing a page with a list of manga. Normally it's not needed to
-     * override this method.
-     *
-     * @param page the page number to retrieve.
-     */
-    override fun fetchPopularManga(page: Int): Observable<MangasPage> {
-        return client.newCall(popularMangaRequest(page))
-                .asObservableSuccess()
-                .map { response ->
-                    popularMangaParse(response)
-                }
-    }
-
-    /**
-     * Returns the request for the popular manga given the page.
-     *
-     * @param page the page number to retrieve.
-     */
-    abstract protected fun popularMangaRequest(page: Int): Request
-
-    /**
-     * Parses the response from the site and returns a [MangasPage] object.
-     *
-     * @param response the response from the site.
-     */
-    abstract protected fun popularMangaParse(response: Response): MangasPage
-
-    /**
-     * Returns an observable containing a page with a list of manga. Normally it's not needed to
-     * override this method.
-     *
-     * @param page the page number to retrieve.
-     * @param query the search query.
-     * @param filters the list of filters to apply.
-     */
-    override fun fetchSearchManga(page: Int, query: String, filters: FilterList): Observable<MangasPage> {
-        return client.newCall(searchMangaRequest(page, query, filters))
-                .asObservableSuccess()
-                .map { response ->
-                    searchMangaParse(response)
-                }
-    }
-
-    /**
-     * Returns the request for the search manga given the page.
-     *
-     * @param page the page number to retrieve.
-     * @param query the search query.
-     * @param filters the list of filters to apply.
-     */
-    abstract protected fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request
-
-    /**
-     * Parses the response from the site and returns a [MangasPage] object.
-     *
-     * @param response the response from the site.
-     */
-    abstract protected fun searchMangaParse(response: Response): MangasPage
-
-    /**
-     * Returns an observable containing a page with a list of latest manga updates.
-     *
-     * @param page the page number to retrieve.
-     */
-    override fun fetchLatestUpdates(page: Int): Observable<MangasPage> {
-        return client.newCall(latestUpdatesRequest(page))
-                .asObservableSuccess()
-                .map { response ->
-                    latestUpdatesParse(response)
-                }
-    }
-
-    /**
-     * Returns the request for latest manga given the page.
-     *
-     * @param page the page number to retrieve.
-     */
-    abstract protected fun latestUpdatesRequest(page: Int): Request
-
-    /**
-     * Parses the response from the site and returns a [MangasPage] object.
-     *
-     * @param response the response from the site.
-     */
-    abstract protected fun latestUpdatesParse(response: Response): MangasPage
-
-    /**
-     * Returns an observable with the updated details for a manga. Normally it's not needed to
-     * override this method.
-     *
-     * @param manga the manga to be updated.
-     */
-    override fun fetchMangaDetails(manga: SManga): Observable<SManga> {
-        return client.newCall(mangaDetailsRequest(manga))
-                .asObservableSuccess()
-                .map { response ->
-                    mangaDetailsParse(response).apply { initialized = true }
-                }
-    }
-
-    /**
-     * Returns the request for the details of a manga. Override only if it's needed to change the
-     * url, send different headers or request method like POST.
-     *
-     * @param manga the manga to be updated.
-     */
-    open fun mangaDetailsRequest(manga: SManga): Request {
-        return GET(baseUrl + manga.url, headers)
-    }
-
-    /**
-     * Parses the response from the site and returns the details of a manga.
-     *
-     * @param response the response from the site.
-     */
-    abstract protected fun mangaDetailsParse(response: Response): SManga
-
-    /**
-     * Returns an observable with the updated chapter list for a manga. Normally it's not needed to
-     * override this method.  If a manga is licensed an empty chapter list observable is returned
-     *
-     * @param manga the manga to look for chapters.
-     */
-    override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> {
-        if (manga.status != SManga.LICENSED) {
-            return client.newCall(chapterListRequest(manga))
-                    .asObservableSuccess()
-                    .map { response ->
-                        chapterListParse(response)
-                    }
-        } else {
-            return Observable.error(Exception("Licensed - No chapters to show"))
-        }
-    }
-
-    /**
-     * Returns the request for updating the chapter list. Override only if it's needed to override
-     * the url, send different headers or request method like POST.
-     *
-     * @param manga the manga to look for chapters.
-     */
-    open protected fun chapterListRequest(manga: SManga): Request {
-        return GET(baseUrl + manga.url, headers)
-    }
-
-    /**
-     * Parses the response from the site and returns a list of chapters.
-     *
-     * @param response the response from the site.
-     */
-    abstract protected fun chapterListParse(response: Response): List<SChapter>
-
-    /**
-     * Returns an observable with the page list for a chapter.
-     *
-     * @param chapter the chapter whose page list has to be fetched.
-     */
-    override fun fetchPageList(chapter: SChapter): Observable<List<Page>> {
-        return client.newCall(pageListRequest(chapter))
-                .asObservableSuccess()
-                .map { response ->
-                    pageListParse(response)
-                }
-    }
-
-    /**
-     * Returns the request for getting the page list. Override only if it's needed to override the
-     * url, send different headers or request method like POST.
-     *
-     * @param chapter the chapter whose page list has to be fetched.
-     */
-    open protected fun pageListRequest(chapter: SChapter): Request {
-        return GET(baseUrl + chapter.url, headers)
-    }
-
-    /**
-     * Parses the response from the site and returns a list of pages.
-     *
-     * @param response the response from the site.
-     */
-    abstract protected fun pageListParse(response: Response): List<Page>
-
-    /**
-     * Returns an observable with the page containing the source url of the image. If there's any
-     * error, it will return null instead of throwing an exception.
-     *
-     * @param page the page whose source image has to be fetched.
-     */
-    open fun fetchImageUrl(page: Page): Observable<String> {
-        return client.newCall(imageUrlRequest(page))
-                .asObservableSuccess()
-                .map { imageUrlParse(it) }
-    }
-
-    /**
-     * Returns the request for getting the url to the source image. Override only if it's needed to
-     * override the url, send different headers or request method like POST.
-     *
-     * @param page the chapter whose page list has to be fetched
-     */
-    open protected fun imageUrlRequest(page: Page): Request {
-        return GET(page.url, headers)
-    }
-
-    /**
-     * Parses the response from the site and returns the absolute url to the source image.
-     *
-     * @param response the response from the site.
-     */
-    abstract protected fun imageUrlParse(response: Response): String
-
-    /**
-     * Returns an observable with the response of the source image.
-     *
-     * @param page the page whose source image has to be downloaded.
-     */
-    fun fetchImage(page: Page): Observable<Response> {
-        return client.newCallWithProgress(imageRequest(page), page)
-                .asObservableSuccess()
-    }
-
-    /**
-     * Returns the request for getting the source image. Override only if it's needed to override
-     * the url, send different headers or request method like POST.
-     *
-     * @param page the chapter whose page list has to be fetched
-     */
-    open protected fun imageRequest(page: Page): Request {
-        return GET(page.imageUrl!!, headers)
-    }
-
-    /**
-     * Assigns the url of the chapter without the scheme and domain. It saves some redundancy from
-     * database and the urls could still work after a domain change.
-     *
-     * @param url the full url to the chapter.
-     */
-    fun SChapter.setUrlWithoutDomain(url: String) {
-        this.url = getUrlWithoutDomain(url)
-    }
-
-    /**
-     * Assigns the url of the manga without the scheme and domain. It saves some redundancy from
-     * database and the urls could still work after a domain change.
-     *
-     * @param url the full url to the manga.
-     */
-    fun SManga.setUrlWithoutDomain(url: String) {
-        this.url = getUrlWithoutDomain(url)
-    }
-
-    /**
-     * Returns the url of the given string without the scheme and domain.
-     *
-     * @param orig the full url.
-     */
-    private fun getUrlWithoutDomain(orig: String): String {
-        try {
-            val uri = URI(orig)
-            var out = uri.path
-            if (uri.query != null)
-                out += "?" + uri.query
-            if (uri.fragment != null)
-                out += "#" + uri.fragment
-            return out
-        } catch (e: URISyntaxException) {
-            return orig
-        }
-    }
-
-    /**
-     * Called before inserting a new chapter into database. Use it if you need to override chapter
-     * fields, like the title or the chapter number. Do not change anything to [manga].
-     *
-     * @param chapter the chapter to be added.
-     * @param manga the manga of the chapter.
-     */
-    open fun prepareNewChapter(chapter: SChapter, manga: SManga) {
-    }
-
-    /**
-     * Returns the list of filters for the source.
-     */
-    override fun getFilterList() = FilterList()
-}
+package eu.kanade.tachiyomi.source.online
+
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.NetworkHelper
+import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.newCallWithProgress
+import eu.kanade.tachiyomi.source.CatalogueSource
+import eu.kanade.tachiyomi.source.model.*
+import okhttp3.Headers
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import rx.Observable
+import uy.kohesive.injekt.injectLazy
+import java.lang.Exception
+import java.net.URI
+import java.net.URISyntaxException
+import java.security.MessageDigest
+
+/**
+ * A simple implementation for sources from a website.
+ */
+abstract class HttpSource : CatalogueSource {
+
+    /**
+     * Network service.
+     */
+    protected val network: NetworkHelper 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
+     */
+    abstract val baseUrl: String
+
+    /**
+     * Version id used to generate the source id. If the site completely changes and urls are
+     * incompatible, you may increase this value and it'll be considered as a new source.
+     */
+    open val versionId = 1
+
+    /**
+     * Id of the source. By default it uses a generated id using the first 16 characters (64 bits)
+     * of the MD5 of the string: sourcename/language/versionId
+     * Note the generated id sets the sign bit to 0.
+     */
+    override val id by lazy {
+        val key = "${name.toLowerCase()}/$lang/$versionId"
+        val bytes = MessageDigest.getInstance("MD5").digest(key.toByteArray())
+        (0..7).map { bytes[it].toLong() and 0xff shl 8 * (7 - it) }.reduce(Long::or) and Long.MAX_VALUE
+    }
+
+    /**
+     * Headers used for requests.
+     */
+    val headers: Headers by lazy { headersBuilder().build() }
+
+    /**
+     * Default network client for doing requests.
+     */
+    open val client: OkHttpClient
+        get() = network.client
+
+    /**
+     * Headers builder for requests. Implementations can override this method for custom headers.
+     */
+    open protected fun headersBuilder() = Headers.Builder().apply {
+        add("User-Agent", "Mozilla/5.0 (Windows NT 6.3; WOW64)")
+    }
+
+    /**
+     * Visible name of the source.
+     */
+    override fun toString() = "$name (${lang.toUpperCase()})"
+
+    /**
+     * Returns an observable containing a page with a list of manga. Normally it's not needed to
+     * override this method.
+     *
+     * @param page the page number to retrieve.
+     */
+    override fun fetchPopularManga(page: Int): Observable<MangasPage> {
+        return client.newCall(popularMangaRequest(page))
+                .asObservableSuccess()
+                .map { response ->
+                    popularMangaParse(response)
+                }
+    }
+
+    /**
+     * Returns the request for the popular manga given the page.
+     *
+     * @param page the page number to retrieve.
+     */
+    abstract protected fun popularMangaRequest(page: Int): Request
+
+    /**
+     * Parses the response from the site and returns a [MangasPage] object.
+     *
+     * @param response the response from the site.
+     */
+    abstract protected fun popularMangaParse(response: Response): MangasPage
+
+    /**
+     * Returns an observable containing a page with a list of manga. Normally it's not needed to
+     * override this method.
+     *
+     * @param page the page number to retrieve.
+     * @param query the search query.
+     * @param filters the list of filters to apply.
+     */
+    override fun fetchSearchManga(page: Int, query: String, filters: FilterList): Observable<MangasPage> {
+        return client.newCall(searchMangaRequest(page, query, filters))
+                .asObservableSuccess()
+                .map { response ->
+                    searchMangaParse(response)
+                }
+    }
+
+    /**
+     * Returns the request for the search manga given the page.
+     *
+     * @param page the page number to retrieve.
+     * @param query the search query.
+     * @param filters the list of filters to apply.
+     */
+    abstract protected fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request
+
+    /**
+     * Parses the response from the site and returns a [MangasPage] object.
+     *
+     * @param response the response from the site.
+     */
+    abstract protected fun searchMangaParse(response: Response): MangasPage
+
+    /**
+     * Returns an observable containing a page with a list of latest manga updates.
+     *
+     * @param page the page number to retrieve.
+     */
+    override fun fetchLatestUpdates(page: Int): Observable<MangasPage> {
+        return client.newCall(latestUpdatesRequest(page))
+                .asObservableSuccess()
+                .map { response ->
+                    latestUpdatesParse(response)
+                }
+    }
+
+    /**
+     * Returns the request for latest manga given the page.
+     *
+     * @param page the page number to retrieve.
+     */
+    abstract protected fun latestUpdatesRequest(page: Int): Request
+
+    /**
+     * Parses the response from the site and returns a [MangasPage] object.
+     *
+     * @param response the response from the site.
+     */
+    abstract protected fun latestUpdatesParse(response: Response): MangasPage
+
+    /**
+     * Returns an observable with the updated details for a manga. Normally it's not needed to
+     * override this method.
+     *
+     * @param manga the manga to be updated.
+     */
+    override fun fetchMangaDetails(manga: SManga): Observable<SManga> {
+        return client.newCall(mangaDetailsRequest(manga))
+                .asObservableSuccess()
+                .map { response ->
+                    mangaDetailsParse(response).apply { initialized = true }
+                }
+    }
+
+    /**
+     * Returns the request for the details of a manga. Override only if it's needed to change the
+     * url, send different headers or request method like POST.
+     *
+     * @param manga the manga to be updated.
+     */
+    open fun mangaDetailsRequest(manga: SManga): Request {
+        return GET(baseUrl + manga.url, headers)
+    }
+
+    /**
+     * Parses the response from the site and returns the details of a manga.
+     *
+     * @param response the response from the site.
+     */
+    abstract protected fun mangaDetailsParse(response: Response): SManga
+
+    /**
+     * Returns an observable with the updated chapter list for a manga. Normally it's not needed to
+     * override this method.  If a manga is licensed an empty chapter list observable is returned
+     *
+     * @param manga the manga to look for chapters.
+     */
+    override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> {
+        if (manga.status != SManga.LICENSED) {
+            return client.newCall(chapterListRequest(manga))
+                    .asObservableSuccess()
+                    .map { response ->
+                        chapterListParse(response)
+                    }
+        } else {
+            return Observable.error(Exception("Licensed - No chapters to show"))
+        }
+    }
+
+    /**
+     * Returns the request for updating the chapter list. Override only if it's needed to override
+     * the url, send different headers or request method like POST.
+     *
+     * @param manga the manga to look for chapters.
+     */
+    open protected fun chapterListRequest(manga: SManga): Request {
+        return GET(baseUrl + manga.url, headers)
+    }
+
+    /**
+     * Parses the response from the site and returns a list of chapters.
+     *
+     * @param response the response from the site.
+     */
+    abstract protected fun chapterListParse(response: Response): List<SChapter>
+
+    /**
+     * Returns an observable with the page list for a chapter.
+     *
+     * @param chapter the chapter whose page list has to be fetched.
+     */
+    override fun fetchPageList(chapter: SChapter): Observable<List<Page>> {
+        return client.newCall(pageListRequest(chapter))
+                .asObservableSuccess()
+                .map { response ->
+                    pageListParse(response)
+                }
+    }
+
+    /**
+     * Returns the request for getting the page list. Override only if it's needed to override the
+     * url, send different headers or request method like POST.
+     *
+     * @param chapter the chapter whose page list has to be fetched.
+     */
+    open protected fun pageListRequest(chapter: SChapter): Request {
+        return GET(baseUrl + chapter.url, headers)
+    }
+
+    /**
+     * Parses the response from the site and returns a list of pages.
+     *
+     * @param response the response from the site.
+     */
+    abstract protected fun pageListParse(response: Response): List<Page>
+
+    /**
+     * Returns an observable with the page containing the source url of the image. If there's any
+     * error, it will return null instead of throwing an exception.
+     *
+     * @param page the page whose source image has to be fetched.
+     */
+    open fun fetchImageUrl(page: Page): Observable<String> {
+        return client.newCall(imageUrlRequest(page))
+                .asObservableSuccess()
+                .map { imageUrlParse(it) }
+    }
+
+    /**
+     * Returns the request for getting the url to the source image. Override only if it's needed to
+     * override the url, send different headers or request method like POST.
+     *
+     * @param page the chapter whose page list has to be fetched
+     */
+    open protected fun imageUrlRequest(page: Page): Request {
+        return GET(page.url, headers)
+    }
+
+    /**
+     * Parses the response from the site and returns the absolute url to the source image.
+     *
+     * @param response the response from the site.
+     */
+    abstract protected fun imageUrlParse(response: Response): String
+
+    /**
+     * Returns an observable with the response of the source image.
+     *
+     * @param page the page whose source image has to be downloaded.
+     */
+    fun fetchImage(page: Page): Observable<Response> {
+        return client.newCallWithProgress(imageRequest(page), page)
+                .asObservableSuccess()
+    }
+
+    /**
+     * Returns the request for getting the source image. Override only if it's needed to override
+     * the url, send different headers or request method like POST.
+     *
+     * @param page the chapter whose page list has to be fetched
+     */
+    open protected fun imageRequest(page: Page): Request {
+        return GET(page.imageUrl!!, headers)
+    }
+
+    /**
+     * Assigns the url of the chapter without the scheme and domain. It saves some redundancy from
+     * database and the urls could still work after a domain change.
+     *
+     * @param url the full url to the chapter.
+     */
+    fun SChapter.setUrlWithoutDomain(url: String) {
+        this.url = getUrlWithoutDomain(url)
+    }
+
+    /**
+     * Assigns the url of the manga without the scheme and domain. It saves some redundancy from
+     * database and the urls could still work after a domain change.
+     *
+     * @param url the full url to the manga.
+     */
+    fun SManga.setUrlWithoutDomain(url: String) {
+        this.url = getUrlWithoutDomain(url)
+    }
+
+    /**
+     * Returns the url of the given string without the scheme and domain.
+     *
+     * @param orig the full url.
+     */
+    private fun getUrlWithoutDomain(orig: String): String {
+        try {
+            val uri = URI(orig)
+            var out = uri.path
+            if (uri.query != null)
+                out += "?" + uri.query
+            if (uri.fragment != null)
+                out += "#" + uri.fragment
+            return out
+        } catch (e: URISyntaxException) {
+            return orig
+        }
+    }
+
+    /**
+     * Called before inserting a new chapter into database. Use it if you need to override chapter
+     * fields, like the title or the chapter number. Do not change anything to [manga].
+     *
+     * @param chapter the chapter to be added.
+     * @param manga the manga of the chapter.
+     */
+    open fun prepareNewChapter(chapter: SChapter, manga: SManga) {
+    }
+
+    /**
+     * Returns the list of filters for the source.
+     */
+    override fun getFilterList() = FilterList()
+}

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

@@ -1,25 +1,25 @@
-package eu.kanade.tachiyomi.source.online
-
-import eu.kanade.tachiyomi.source.model.Page
-import rx.Observable
-
-fun HttpSource.getImageUrl(page: Page): Observable<Page> {
-    page.status = Page.LOAD_PAGE
-    return fetchImageUrl(page)
-        .doOnError { page.status = Page.ERROR }
-        .onErrorReturn { null }
-        .doOnNext { page.imageUrl = it }
-        .map { page }
-}
-
-fun HttpSource.fetchAllImageUrlsFromPageList(pages: List<Page>): Observable<Page> {
-    return Observable.from(pages)
-            .filter { !it.imageUrl.isNullOrEmpty() }
-            .mergeWith(fetchRemainingImageUrlsFromPageList(pages))
-}
-
-fun HttpSource.fetchRemainingImageUrlsFromPageList(pages: List<Page>): Observable<Page> {
-    return Observable.from(pages)
-            .filter { it.imageUrl.isNullOrEmpty() }
-            .concatMap { getImageUrl(it) }
-}
+package eu.kanade.tachiyomi.source.online
+
+import eu.kanade.tachiyomi.source.model.Page
+import rx.Observable
+
+fun HttpSource.getImageUrl(page: Page): Observable<Page> {
+    page.status = Page.LOAD_PAGE
+    return fetchImageUrl(page)
+        .doOnError { page.status = Page.ERROR }
+        .onErrorReturn { null }
+        .doOnNext { page.imageUrl = it }
+        .map { page }
+}
+
+fun HttpSource.fetchAllImageUrlsFromPageList(pages: List<Page>): Observable<Page> {
+    return Observable.from(pages)
+            .filter { !it.imageUrl.isNullOrEmpty() }
+            .mergeWith(fetchRemainingImageUrlsFromPageList(pages))
+}
+
+fun HttpSource.fetchRemainingImageUrlsFromPageList(pages: List<Page>): Observable<Page> {
+    return Observable.from(pages)
+            .filter { it.imageUrl.isNullOrEmpty() }
+            .concatMap { getImageUrl(it) }
+}

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

@@ -1,15 +1,15 @@
-package eu.kanade.tachiyomi.source.online
-
-import eu.kanade.tachiyomi.source.Source
-import okhttp3.Response
-import rx.Observable
-
-interface LoginSource : Source {
-
-    fun isLogged(): Boolean
-
-    fun login(username: String, password: String): Observable<Boolean>
-
-    fun isAuthenticationSuccessful(response: Response): Boolean
-
+package eu.kanade.tachiyomi.source.online
+
+import eu.kanade.tachiyomi.source.Source
+import okhttp3.Response
+import rx.Observable
+
+interface LoginSource : Source {
+
+    fun isLogged(): Boolean
+
+    fun login(username: String, password: String): Observable<Boolean>
+
+    fun isAuthenticationSuccessful(response: Response): Boolean
+
 }

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

@@ -1,200 +1,200 @@
-package eu.kanade.tachiyomi.source.online
-
-import eu.kanade.tachiyomi.source.model.MangasPage
-import eu.kanade.tachiyomi.source.model.Page
-import eu.kanade.tachiyomi.source.model.SChapter
-import eu.kanade.tachiyomi.source.model.SManga
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.Response
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-
-/**
- * A simple implementation for sources from a website using Jsoup, an HTML parser.
- */
-abstract class ParsedHttpSource : HttpSource() {
-
-    /**
-     * Parses the response from the site and returns a [MangasPage] object.
-     *
-     * @param response the response from the site.
-     */
-    override fun popularMangaParse(response: Response): MangasPage {
-        val document = response.asJsoup()
-
-        val mangas = document.select(popularMangaSelector()).map { element ->
-            popularMangaFromElement(element)
-        }
-
-        val hasNextPage = popularMangaNextPageSelector()?.let { selector ->
-            document.select(selector).first()
-        } != null
-
-        return MangasPage(mangas, hasNextPage)
-    }
-
-    /**
-     * Returns the Jsoup selector that returns a list of [Element] corresponding to each manga.
-     */
-    abstract protected fun popularMangaSelector(): String
-
-    /**
-     * Returns a manga from the given [element]. Most sites only show the title and the url, it's
-     * totally fine to fill only those two values.
-     *
-     * @param element an element obtained from [popularMangaSelector].
-     */
-    abstract protected fun popularMangaFromElement(element: Element): SManga
-
-    /**
-     * Returns the Jsoup selector that returns the <a> tag linking to the next page, or null if
-     * there's no next page.
-     */
-    abstract protected fun popularMangaNextPageSelector(): String?
-
-    /**
-     * Parses the response from the site and returns a [MangasPage] object.
-     *
-     * @param response the response from the site.
-     */
-    override fun searchMangaParse(response: Response): MangasPage {
-        val document = response.asJsoup()
-
-        val mangas = document.select(searchMangaSelector()).map { element ->
-            searchMangaFromElement(element)
-        }
-
-        val hasNextPage = searchMangaNextPageSelector()?.let { selector ->
-            document.select(selector).first()
-        } != null
-
-        return MangasPage(mangas, hasNextPage)
-    }
-
-    /**
-     * Returns the Jsoup selector that returns a list of [Element] corresponding to each manga.
-     */
-    abstract protected fun searchMangaSelector(): String
-
-    /**
-     * Returns a manga from the given [element]. Most sites only show the title and the url, it's
-     * totally fine to fill only those two values.
-     *
-     * @param element an element obtained from [searchMangaSelector].
-     */
-    abstract protected fun searchMangaFromElement(element: Element): SManga
-
-    /**
-     * Returns the Jsoup selector that returns the <a> tag linking to the next page, or null if
-     * there's no next page.
-     */
-    abstract protected fun searchMangaNextPageSelector(): String?
-
-    /**
-     * Parses the response from the site and returns a [MangasPage] object.
-     *
-     * @param response the response from the site.
-     */
-    override fun latestUpdatesParse(response: Response): MangasPage {
-        val document = response.asJsoup()
-
-        val mangas = document.select(latestUpdatesSelector()).map { element ->
-            latestUpdatesFromElement(element)
-        }
-
-        val hasNextPage = latestUpdatesNextPageSelector()?.let { selector ->
-            document.select(selector).first()
-        } != null
-
-        return MangasPage(mangas, hasNextPage)
-    }
-
-    /**
-     * Returns the Jsoup selector that returns a list of [Element] corresponding to each manga.
-     */
-    abstract protected fun latestUpdatesSelector(): String
-
-    /**
-     * Returns a manga from the given [element]. Most sites only show the title and the url, it's
-     * totally fine to fill only those two values.
-     *
-     * @param element an element obtained from [latestUpdatesSelector].
-     */
-    abstract protected fun latestUpdatesFromElement(element: Element): SManga
-
-    /**
-     * Returns the Jsoup selector that returns the <a> tag linking to the next page, or null if
-     * there's no next page.
-     */
-    abstract protected fun latestUpdatesNextPageSelector(): String?
-
-    /**
-     * Parses the response from the site and returns the details of a manga.
-     *
-     * @param response the response from the site.
-     */
-    override fun mangaDetailsParse(response: Response): SManga {
-        return mangaDetailsParse(response.asJsoup())
-    }
-
-    /**
-     * Returns the details of the manga from the given [document].
-     *
-     * @param document the parsed document.
-     */
-    abstract protected fun mangaDetailsParse(document: Document): SManga
-
-    /**
-     * Parses the response from the site and returns a list of chapters.
-     *
-     * @param response the response from the site.
-     */
-    override fun chapterListParse(response: Response): List<SChapter> {
-        val document = response.asJsoup()
-        return document.select(chapterListSelector()).map { chapterFromElement(it) }
-    }
-
-    /**
-     * Returns the Jsoup selector that returns a list of [Element] corresponding to each chapter.
-     */
-    abstract protected fun chapterListSelector(): String
-
-    /**
-     * Returns a chapter from the given element.
-     *
-     * @param element an element obtained from [chapterListSelector].
-     */
-    abstract protected fun chapterFromElement(element: Element): SChapter
-
-    /**
-     * Parses the response from the site and returns the page list.
-     *
-     * @param response the response from the site.
-     */
-    override fun pageListParse(response: Response): List<Page> {
-        return pageListParse(response.asJsoup())
-    }
-
-    /**
-     * Returns a page list from the given document.
-     *
-     * @param document the parsed document.
-     */
-    abstract protected fun pageListParse(document: Document): List<Page>
-
-    /**
-     * Parse the response from the site and returns the absolute url to the source image.
-     *
-     * @param response the response from the site.
-     */
-    override fun imageUrlParse(response: Response): String {
-        return imageUrlParse(response.asJsoup())
-    }
-
-    /**
-     * Returns the absolute url to the source image from the document.
-     *
-     * @param document the parsed document.
-     */
-    abstract protected fun imageUrlParse(document: Document): String
-}
+package eu.kanade.tachiyomi.source.online
+
+import eu.kanade.tachiyomi.source.model.MangasPage
+import eu.kanade.tachiyomi.source.model.Page
+import eu.kanade.tachiyomi.source.model.SChapter
+import eu.kanade.tachiyomi.source.model.SManga
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.Response
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+
+/**
+ * A simple implementation for sources from a website using Jsoup, an HTML parser.
+ */
+abstract class ParsedHttpSource : HttpSource() {
+
+    /**
+     * Parses the response from the site and returns a [MangasPage] object.
+     *
+     * @param response the response from the site.
+     */
+    override fun popularMangaParse(response: Response): MangasPage {
+        val document = response.asJsoup()
+
+        val mangas = document.select(popularMangaSelector()).map { element ->
+            popularMangaFromElement(element)
+        }
+
+        val hasNextPage = popularMangaNextPageSelector()?.let { selector ->
+            document.select(selector).first()
+        } != null
+
+        return MangasPage(mangas, hasNextPage)
+    }
+
+    /**
+     * Returns the Jsoup selector that returns a list of [Element] corresponding to each manga.
+     */
+    abstract protected fun popularMangaSelector(): String
+
+    /**
+     * Returns a manga from the given [element]. Most sites only show the title and the url, it's
+     * totally fine to fill only those two values.
+     *
+     * @param element an element obtained from [popularMangaSelector].
+     */
+    abstract protected fun popularMangaFromElement(element: Element): SManga
+
+    /**
+     * Returns the Jsoup selector that returns the <a> tag linking to the next page, or null if
+     * there's no next page.
+     */
+    abstract protected fun popularMangaNextPageSelector(): String?
+
+    /**
+     * Parses the response from the site and returns a [MangasPage] object.
+     *
+     * @param response the response from the site.
+     */
+    override fun searchMangaParse(response: Response): MangasPage {
+        val document = response.asJsoup()
+
+        val mangas = document.select(searchMangaSelector()).map { element ->
+            searchMangaFromElement(element)
+        }
+
+        val hasNextPage = searchMangaNextPageSelector()?.let { selector ->
+            document.select(selector).first()
+        } != null
+
+        return MangasPage(mangas, hasNextPage)
+    }
+
+    /**
+     * Returns the Jsoup selector that returns a list of [Element] corresponding to each manga.
+     */
+    abstract protected fun searchMangaSelector(): String
+
+    /**
+     * Returns a manga from the given [element]. Most sites only show the title and the url, it's
+     * totally fine to fill only those two values.
+     *
+     * @param element an element obtained from [searchMangaSelector].
+     */
+    abstract protected fun searchMangaFromElement(element: Element): SManga
+
+    /**
+     * Returns the Jsoup selector that returns the <a> tag linking to the next page, or null if
+     * there's no next page.
+     */
+    abstract protected fun searchMangaNextPageSelector(): String?
+
+    /**
+     * Parses the response from the site and returns a [MangasPage] object.
+     *
+     * @param response the response from the site.
+     */
+    override fun latestUpdatesParse(response: Response): MangasPage {
+        val document = response.asJsoup()
+
+        val mangas = document.select(latestUpdatesSelector()).map { element ->
+            latestUpdatesFromElement(element)
+        }
+
+        val hasNextPage = latestUpdatesNextPageSelector()?.let { selector ->
+            document.select(selector).first()
+        } != null
+
+        return MangasPage(mangas, hasNextPage)
+    }
+
+    /**
+     * Returns the Jsoup selector that returns a list of [Element] corresponding to each manga.
+     */
+    abstract protected fun latestUpdatesSelector(): String
+
+    /**
+     * Returns a manga from the given [element]. Most sites only show the title and the url, it's
+     * totally fine to fill only those two values.
+     *
+     * @param element an element obtained from [latestUpdatesSelector].
+     */
+    abstract protected fun latestUpdatesFromElement(element: Element): SManga
+
+    /**
+     * Returns the Jsoup selector that returns the <a> tag linking to the next page, or null if
+     * there's no next page.
+     */
+    abstract protected fun latestUpdatesNextPageSelector(): String?
+
+    /**
+     * Parses the response from the site and returns the details of a manga.
+     *
+     * @param response the response from the site.
+     */
+    override fun mangaDetailsParse(response: Response): SManga {
+        return mangaDetailsParse(response.asJsoup())
+    }
+
+    /**
+     * Returns the details of the manga from the given [document].
+     *
+     * @param document the parsed document.
+     */
+    abstract protected fun mangaDetailsParse(document: Document): SManga
+
+    /**
+     * Parses the response from the site and returns a list of chapters.
+     *
+     * @param response the response from the site.
+     */
+    override fun chapterListParse(response: Response): List<SChapter> {
+        val document = response.asJsoup()
+        return document.select(chapterListSelector()).map { chapterFromElement(it) }
+    }
+
+    /**
+     * Returns the Jsoup selector that returns a list of [Element] corresponding to each chapter.
+     */
+    abstract protected fun chapterListSelector(): String
+
+    /**
+     * Returns a chapter from the given element.
+     *
+     * @param element an element obtained from [chapterListSelector].
+     */
+    abstract protected fun chapterFromElement(element: Element): SChapter
+
+    /**
+     * Parses the response from the site and returns the page list.
+     *
+     * @param response the response from the site.
+     */
+    override fun pageListParse(response: Response): List<Page> {
+        return pageListParse(response.asJsoup())
+    }
+
+    /**
+     * Returns a page list from the given document.
+     *
+     * @param document the parsed document.
+     */
+    abstract protected fun pageListParse(document: Document): List<Page>
+
+    /**
+     * Parse the response from the site and returns the absolute url to the source image.
+     *
+     * @param response the response from the site.
+     */
+    override fun imageUrlParse(response: Response): String {
+        return imageUrlParse(response.asJsoup())
+    }
+
+    /**
+     * Returns the absolute url to the source image from the document.
+     *
+     * @param document the parsed document.
+     */
+    abstract protected fun imageUrlParse(document: Document): String
+}

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

@@ -1,21 +1,21 @@
-package eu.kanade.tachiyomi.ui.base.controller
-
-import android.os.Bundle
-import eu.kanade.tachiyomi.ui.base.presenter.NucleusConductorDelegate
-import eu.kanade.tachiyomi.ui.base.presenter.NucleusConductorLifecycleListener
-import nucleus.factory.PresenterFactory
-import nucleus.presenter.Presenter
-
-@Suppress("LeakingThis")
-abstract class NucleusController<P : Presenter<*>>(val bundle: Bundle? = null) : RxController(bundle),
-        PresenterFactory<P> {
-
-    private val delegate = NucleusConductorDelegate(this)
-
-    val presenter: P
-        get() = delegate.presenter
-
-    init {
-        addLifecycleListener(NucleusConductorLifecycleListener(delegate))
-    }
-}
+package eu.kanade.tachiyomi.ui.base.controller
+
+import android.os.Bundle
+import eu.kanade.tachiyomi.ui.base.presenter.NucleusConductorDelegate
+import eu.kanade.tachiyomi.ui.base.presenter.NucleusConductorLifecycleListener
+import nucleus.factory.PresenterFactory
+import nucleus.presenter.Presenter
+
+@Suppress("LeakingThis")
+abstract class NucleusController<P : Presenter<*>>(val bundle: Bundle? = null) : RxController(bundle),
+        PresenterFactory<P> {
+
+    private val delegate = NucleusConductorDelegate(this)
+
+    val presenter: P
+        get() = delegate.presenter
+
+    init {
+        addLifecycleListener(NucleusConductorLifecycleListener(delegate))
+    }
+}

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

@@ -1,61 +1,61 @@
-package eu.kanade.tachiyomi.ui.base.presenter;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-
-import nucleus.factory.PresenterFactory;
-import nucleus.presenter.Presenter;
-
-public class NucleusConductorDelegate<P extends Presenter> {
-
-    @Nullable private P presenter;
-    @Nullable private Bundle bundle;
-
-    private PresenterFactory<P> factory;
-
-    public NucleusConductorDelegate(PresenterFactory<P> creator) {
-        this.factory = creator;
-    }
-
-    public P getPresenter() {
-        if (presenter == null) {
-            presenter = factory.createPresenter();
-            presenter.create(bundle);
-            bundle = null;
-        }
-        return presenter;
-    }
-
-    Bundle onSaveInstanceState() {
-        Bundle bundle = new Bundle();
-//        getPresenter(); // Workaround a crash related to saving instance state with child routers
-        if (presenter != null) {
-            presenter.save(bundle);
-        }
-        return bundle;
-    }
-
-    void onRestoreInstanceState(Bundle presenterState) {
-        bundle = presenterState;
-    }
-
-    void onTakeView(Object view) {
-        getPresenter();
-        if (presenter != null) {
-            //noinspection unchecked
-            presenter.takeView(view);
-        }
-    }
-
-    void onDropView() {
-        if (presenter != null) {
-            presenter.dropView();
-        }
-    }
-
-    void onDestroy() {
-        if (presenter != null) {
-            presenter.destroy();
-        }
-    }
-}
+package eu.kanade.tachiyomi.ui.base.presenter;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+
+import nucleus.factory.PresenterFactory;
+import nucleus.presenter.Presenter;
+
+public class NucleusConductorDelegate<P extends Presenter> {
+
+    @Nullable private P presenter;
+    @Nullable private Bundle bundle;
+
+    private PresenterFactory<P> factory;
+
+    public NucleusConductorDelegate(PresenterFactory<P> creator) {
+        this.factory = creator;
+    }
+
+    public P getPresenter() {
+        if (presenter == null) {
+            presenter = factory.createPresenter();
+            presenter.create(bundle);
+            bundle = null;
+        }
+        return presenter;
+    }
+
+    Bundle onSaveInstanceState() {
+        Bundle bundle = new Bundle();
+//        getPresenter(); // Workaround a crash related to saving instance state with child routers
+        if (presenter != null) {
+            presenter.save(bundle);
+        }
+        return bundle;
+    }
+
+    void onRestoreInstanceState(Bundle presenterState) {
+        bundle = presenterState;
+    }
+
+    void onTakeView(Object view) {
+        getPresenter();
+        if (presenter != null) {
+            //noinspection unchecked
+            presenter.takeView(view);
+        }
+    }
+
+    void onDropView() {
+        if (presenter != null) {
+            presenter.dropView();
+        }
+    }
+
+    void onDestroy() {
+        if (presenter != null) {
+            presenter.destroy();
+        }
+    }
+}

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

@@ -1,44 +1,44 @@
-package eu.kanade.tachiyomi.ui.base.presenter;
-
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.view.View;
-
-import com.bluelinelabs.conductor.Controller;
-
-public class NucleusConductorLifecycleListener extends Controller.LifecycleListener {
-
-    private static final String PRESENTER_STATE_KEY = "presenter_state";
-
-    private NucleusConductorDelegate delegate;
-
-    public NucleusConductorLifecycleListener(NucleusConductorDelegate delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public void postCreateView(@NonNull Controller controller, @NonNull View view) {
-        delegate.onTakeView(controller);
-    }
-
-    @Override
-    public void preDestroyView(@NonNull Controller controller, @NonNull View view) {
-        delegate.onDropView();
-    }
-
-    @Override
-    public void preDestroy(@NonNull Controller controller) {
-        delegate.onDestroy();
-    }
-
-    @Override
-    public void onSaveInstanceState(@NonNull Controller controller, @NonNull Bundle outState) {
-        outState.putBundle(PRESENTER_STATE_KEY, delegate.onSaveInstanceState());
-    }
-
-    @Override
-    public void onRestoreInstanceState(@NonNull Controller controller, @NonNull Bundle savedInstanceState) {
-        delegate.onRestoreInstanceState(savedInstanceState.getBundle(PRESENTER_STATE_KEY));
-    }
-
-}
+package eu.kanade.tachiyomi.ui.base.presenter;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.view.View;
+
+import com.bluelinelabs.conductor.Controller;
+
+public class NucleusConductorLifecycleListener extends Controller.LifecycleListener {
+
+    private static final String PRESENTER_STATE_KEY = "presenter_state";
+
+    private NucleusConductorDelegate delegate;
+
+    public NucleusConductorLifecycleListener(NucleusConductorDelegate delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public void postCreateView(@NonNull Controller controller, @NonNull View view) {
+        delegate.onTakeView(controller);
+    }
+
+    @Override
+    public void preDestroyView(@NonNull Controller controller, @NonNull View view) {
+        delegate.onDropView();
+    }
+
+    @Override
+    public void preDestroy(@NonNull Controller controller) {
+        delegate.onDestroy();
+    }
+
+    @Override
+    public void onSaveInstanceState(@NonNull Controller controller, @NonNull Bundle outState) {
+        outState.putBundle(PRESENTER_STATE_KEY, delegate.onSaveInstanceState());
+    }
+
+    @Override
+    public void onRestoreInstanceState(@NonNull Controller controller, @NonNull Bundle savedInstanceState) {
+        delegate.onRestoreInstanceState(savedInstanceState.getBundle(PRESENTER_STATE_KEY));
+    }
+
+}

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

@@ -13,7 +13,7 @@ class SourceDividerItemDecoration(context: Context) : RecyclerView.ItemDecoratio
 
     init {
         val a = context.obtainStyledAttributes(intArrayOf(android.R.attr.listDivider))
-        divider = a.getDrawable(0)
+        divider = a.getDrawable(0)!!
         a.recycle()
     }
 

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

@@ -17,11 +17,13 @@ import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.model.FilterList
+import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.ui.base.controller.NucleusController
 import eu.kanade.tachiyomi.ui.base.controller.SecondaryDrawerController
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.library.ChangeMangaCategoriesDialog
 import eu.kanade.tachiyomi.ui.manga.MangaController
+import eu.kanade.tachiyomi.ui.manga.info.MangaWebViewController
 import eu.kanade.tachiyomi.util.*
 import eu.kanade.tachiyomi.widget.AutofitRecyclerView
 import kotlinx.android.synthetic.main.catalogue_controller.*
@@ -173,6 +175,7 @@ open class BrowseCatalogueController(bundle: Bundle) :
             RecyclerView(view.context).apply {
                 id = R.id.recycler
                 layoutManager = LinearLayoutManager(context)
+                layoutParams = RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
                 addItemDecoration(DividerItemDecoration(context, DividerItemDecoration.VERTICAL))
             }
         } else {
@@ -199,7 +202,7 @@ open class BrowseCatalogueController(bundle: Bundle) :
         catalogue_view.addView(recycler, 1)
 
         if (oldPosition != RecyclerView.NO_POSITION) {
-            recycler.layoutManager.scrollToPosition(oldPosition)
+            recycler.layoutManager?.scrollToPosition(oldPosition)
         }
         this.recycler = recycler
     }
@@ -259,15 +262,38 @@ open class BrowseCatalogueController(bundle: Bundle) :
         }
     }
 
+    override fun onPrepareOptionsMenu(menu: Menu) {
+        super.onPrepareOptionsMenu(menu)
+
+        val isHttpSource = presenter.source is HttpSource
+        menu.findItem(R.id.action_open_in_browser).isVisible = isHttpSource
+        menu.findItem(R.id.action_open_in_web_view).isVisible = isHttpSource
+    }
+
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.action_display_mode -> swapDisplayMode()
             R.id.action_set_filter -> navView?.let { activity?.drawer?.openDrawer(Gravity.END) }
+            R.id.action_open_in_browser -> openInBrowser()
+            R.id.action_open_in_web_view -> openInWebView()
             else -> return super.onOptionsItemSelected(item)
         }
         return true
     }
 
+    private fun openInBrowser() {
+        val source = presenter.source as? HttpSource ?: return
+
+        activity?.openInBrowser(source.baseUrl)
+    }
+
+    private fun openInWebView() {
+        val source = presenter.source as? HttpSource ?: return
+
+        router.pushController(MangaWebViewController(source.id, source.baseUrl)
+                .withFadeTransaction())
+    }
+
     /**
      * Restarts the request with a new query.
      *
@@ -316,19 +342,22 @@ open class BrowseCatalogueController(bundle: Bundle) :
         adapter.onLoadMoreComplete(null)
         hideProgressBar()
 
-        val message = if (error is NoResultsException) "No results found" else (error.message ?: "")
-
         snack?.dismiss()
-        snack = catalogue_view?.snack(message, Snackbar.LENGTH_INDEFINITE) {
-            setAction(R.string.action_retry) {
-                // If not the first page, show bottom progress bar.
-                if (adapter.mainItemCount > 0) {
-                    val item = progressItem ?: return@setAction
-                    adapter.addScrollableFooterWithDelay(item, 0, true)
-                } else {
-                    showProgressBar()
+
+        if (catalogue_view != null) {
+            val message = if (error is NoResultsException) catalogue_view.context.getString(R.string.no_results_found) else (error.message ?: "")
+
+            snack = catalogue_view.snack(message, Snackbar.LENGTH_INDEFINITE) {
+                setAction(R.string.action_retry) {
+                    // If not the first page, show bottom progress bar.
+                    if (adapter.mainItemCount > 0) {
+                        val item = progressItem ?: return@setAction
+                        adapter.addScrollableFooterWithDelay(item, 0, true)
+                    } else {
+                        showProgressBar()
+                    }
+                    presenter.requestNext()
                 }
-                presenter.requestNext()
             }
         }
     }
@@ -475,19 +504,21 @@ open class BrowseCatalogueController(bundle: Bundle) :
             adapter?.notifyItemChanged(position)
 
             val categories = presenter.getCategories()
-            val defaultCategory = categories.find { it.id == preferences.defaultCategory() }
-            if (defaultCategory != null) {
-                presenter.moveMangaToCategory(manga, defaultCategory)
-            } else if (categories.size <= 1) { // default or the one from the user
-                presenter.moveMangaToCategory(manga, categories.firstOrNull())
-            } else {
-                val ids = presenter.getMangaCategoryIds(manga)
-                val preselected = ids.mapNotNull { id ->
-                    categories.indexOfFirst { it.id == id }.takeIf { it != -1 }
-                }.toTypedArray()
+            val defaultCategoryId = preferences.defaultCategory()
+            val defaultCategory = categories.find { it.id == defaultCategoryId }
+            when {
+                defaultCategory != null -> presenter.moveMangaToCategory(manga, defaultCategory)
+                defaultCategoryId == 0 || categories.isEmpty() -> // 'Default' or no category
+                    presenter.moveMangaToCategory(manga, null)
+                else -> {
+                    val ids = presenter.getMangaCategoryIds(manga)
+                    val preselected = ids.mapNotNull { id ->
+                        categories.indexOfFirst { it.id == id }.takeIf { it != -1 }
+                    }.toTypedArray()
 
-                ChangeMangaCategoriesDialog(this, listOf(manga), categories, preselected)
-                        .showDialog(router)
+                    ChangeMangaCategoriesDialog(this, listOf(manga), categories, preselected)
+                            .showDialog(router)
+                }
             }
             activity?.toast(activity?.getString(R.string.manga_added_library))
         }

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

@@ -316,9 +316,9 @@ open class BrowseCataloguePresenter(
     }
 
     /**
-     * Get the default, and user categories.
+     * Get user categories.
      *
-     * @return List of categories, default plus user categories
+     * @return List of categories, not including the default category
      */
     fun getCategories(): List<Category> {
         return db.getCategories().executeAsBlocking()

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)
+        title.text = context.getString(R.string.source_search_options)
         search_btn.setOnClickListener { onSearchClicked() }
         reset_btn.setOnClickListener { onResetClicked() }
     }
@@ -37,4 +37,4 @@ class CatalogueNavigationView @JvmOverloads constructor(context: Context, attrs:
         adapter.updateDataSet(items)
     }
 
-}
+}

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

@@ -1,88 +1,88 @@
-package eu.kanade.tachiyomi.ui.catalogue.filter
-
-import eu.davidea.flexibleadapter.items.ISectionable
-import eu.kanade.tachiyomi.source.model.Filter
-
-class TriStateSectionItem(filter: Filter.TriState) : TriStateItem(filter), ISectionable<TriStateItem.Holder, GroupItem> {
-
-    private var head: GroupItem? = null
-
-    override fun getHeader(): GroupItem? = head
-
-    override fun setHeader(header: GroupItem?) {
-        head = header
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-        return filter == (other as TriStateSectionItem).filter
-    }
-
-    override fun hashCode(): Int {
-        return filter.hashCode()
-    }
-}
-
-class TextSectionItem(filter: Filter.Text) : TextItem(filter), ISectionable<TextItem.Holder, GroupItem> {
-
-    private var head: GroupItem? = null
-
-    override fun getHeader(): GroupItem? = head
-
-    override fun setHeader(header: GroupItem?) {
-        head = header
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-        return filter == (other as TextSectionItem).filter
-    }
-
-    override fun hashCode(): Int {
-        return filter.hashCode()
-    }
-}
-
-class CheckboxSectionItem(filter: Filter.CheckBox) : CheckboxItem(filter), ISectionable<CheckboxItem.Holder, GroupItem> {
-
-    private var head: GroupItem? = null
-
-    override fun getHeader(): GroupItem? = head
-
-    override fun setHeader(header: GroupItem?) {
-        head = header
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-        return filter == (other as CheckboxSectionItem).filter
-    }
-
-    override fun hashCode(): Int {
-        return filter.hashCode()
-    }
-}
-
-class SelectSectionItem(filter: Filter.Select<*>) : SelectItem(filter), ISectionable<SelectItem.Holder, GroupItem> {
-
-    private var head: GroupItem? = null
-
-    override fun getHeader(): GroupItem? = head
-
-    override fun setHeader(header: GroupItem?) {
-        head = header
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-        return filter == (other as SelectSectionItem).filter
-    }
-
-    override fun hashCode(): Int {
-        return filter.hashCode()
-    }
-}
+package eu.kanade.tachiyomi.ui.catalogue.filter
+
+import eu.davidea.flexibleadapter.items.ISectionable
+import eu.kanade.tachiyomi.source.model.Filter
+
+class TriStateSectionItem(filter: Filter.TriState) : TriStateItem(filter), ISectionable<TriStateItem.Holder, GroupItem> {
+
+    private var head: GroupItem? = null
+
+    override fun getHeader(): GroupItem? = head
+
+    override fun setHeader(header: GroupItem?) {
+        head = header
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+        return filter == (other as TriStateSectionItem).filter
+    }
+
+    override fun hashCode(): Int {
+        return filter.hashCode()
+    }
+}
+
+class TextSectionItem(filter: Filter.Text) : TextItem(filter), ISectionable<TextItem.Holder, GroupItem> {
+
+    private var head: GroupItem? = null
+
+    override fun getHeader(): GroupItem? = head
+
+    override fun setHeader(header: GroupItem?) {
+        head = header
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+        return filter == (other as TextSectionItem).filter
+    }
+
+    override fun hashCode(): Int {
+        return filter.hashCode()
+    }
+}
+
+class CheckboxSectionItem(filter: Filter.CheckBox) : CheckboxItem(filter), ISectionable<CheckboxItem.Holder, GroupItem> {
+
+    private var head: GroupItem? = null
+
+    override fun getHeader(): GroupItem? = head
+
+    override fun setHeader(header: GroupItem?) {
+        head = header
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+        return filter == (other as CheckboxSectionItem).filter
+    }
+
+    override fun hashCode(): Int {
+        return filter.hashCode()
+    }
+}
+
+class SelectSectionItem(filter: Filter.Select<*>) : SelectItem(filter), ISectionable<SelectItem.Holder, GroupItem> {
+
+    private var head: GroupItem? = null
+
+    override fun getHeader(): GroupItem? = head
+
+    override fun setHeader(header: GroupItem?) {
+        head = header
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+        return filter == (other as SelectSectionItem).filter
+    }
+
+    override fun hashCode(): Int {
+        return filter.hashCode()
+    }
+}

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

@@ -1,52 +1,52 @@
-package eu.kanade.tachiyomi.ui.catalogue.filter
-
-import android.view.View
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractExpandableHeaderItem
-import eu.davidea.flexibleadapter.items.ISectionable
-import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.source.model.Filter
-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
-    }
-
-    override fun getItemViewType(): Int {
-        return 100
-    }
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<*>): Holder {
-        return Holder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<*>, holder: Holder, position: Int, payloads: List<Any?>?) {
-        holder.title.text = filter.name
-
-        holder.icon.setVectorCompat(if (isExpanded)
-            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 {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-        return filter == (other as SortGroup).filter
-    }
-
-    override fun hashCode(): Int {
-        return filter.hashCode()
-    }
-
-    class Holder(view: View, adapter: FlexibleAdapter<*>) : GroupItem.Holder(view, adapter)
+package eu.kanade.tachiyomi.ui.catalogue.filter
+
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractExpandableHeaderItem
+import eu.davidea.flexibleadapter.items.ISectionable
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.source.model.Filter
+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
+    }
+
+    override fun getItemViewType(): Int {
+        return 100
+    }
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<*>): Holder {
+        return Holder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<*>, holder: Holder, position: Int, payloads: List<Any?>?) {
+        holder.title.text = filter.name
+
+        holder.icon.setVectorCompat(if (isExpanded)
+            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 {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+        return filter == (other as SortGroup).filter
+    }
+
+    override fun hashCode(): Int {
+        return filter.hashCode()
+    }
+
+    class Holder(view: View, adapter: FlexibleAdapter<*>) : GroupItem.Holder(view, adapter)
 }

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

@@ -19,7 +19,7 @@ class CatalogueSearchAdapter(val controller: CatalogueSearchController) :
      */
     private var bundle = Bundle()
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int, payloads: List<Any?>?) {
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int, payloads: List<Any?>) {
         super.onBindViewHolder(holder, position, payloads)
         restoreHolderState(holder)
     }
@@ -38,7 +38,7 @@ class CatalogueSearchAdapter(val controller: CatalogueSearchController) :
 
     override fun onRestoreInstanceState(savedInstanceState: Bundle) {
         super.onRestoreInstanceState(savedInstanceState)
-        bundle = savedInstanceState.getBundle(HOLDER_BUNDLE_KEY)
+        bundle = savedInstanceState.getBundle(HOLDER_BUNDLE_KEY)!!
     }
 
     /**
@@ -71,4 +71,4 @@ class CatalogueSearchAdapter(val controller: CatalogueSearchController) :
     private companion object {
         const val HOLDER_BUNDLE_KEY = "holder_bundle"
     }
-}
+}