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

@@ -4,6 +4,8 @@
 
 **App version:**
 
+**Android version:**
+
 **Issue/Request:**
 
 **Steps to reproduce (if applicable)**

.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) [![fdroid dev](https://img.shields.io/badge/autoupdate-wiki-blue.svg)](//github.com/inorichi/tachiyomi/wiki/F-Droid-for-dev-versions) | [![Translation status](https://hosted.weblate.org/widgets/tachiyomi/-/svg-badge.svg)](https://hosted.weblate.org/engage/tachiyomi/?utm_source=widget) | [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/tachiyomi) |
+| [![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), or add our [F-Droid repo](https://github.com/inorichi/tachiyomi/wiki/F-Droid-for-dev-versions).
+If you want to try new features before they get to the stable release, you can download the dev version [here](http://tachiyomi.kanade.eu/latest).
 
 ## Issues, Feature Requests and Contributing
 
@@ -63,8 +63,8 @@ Catalogue requests should be created at https://github.com/inorichi/tachiyomi-ex
 
 ## FAQ
 
-[See our wiki.](https://github.com/inorichi/tachiyomi/wiki/FAQ)
-You can also reach out to us on [Discord](https://discord.gg/WrBkRk4).
+[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 39
-        versionName "0.8.1"
+        versionCode 42
+        versionName "0.8.5"
 
         buildConfigField "String", "COMMIT_COUNT", "\"${getCommitCount()}\""
         buildConfigField "String", "COMMIT_SHA", "\"${getGitSha()}\""
@@ -48,6 +48,8 @@ android {
 
         vectorDrawables.useSupportLibrary = true
 
+        multiDexEnabled true
+
         ndk {
             abiFilters "armeabi-v7a", "arm64-v8a", "x86"
         }
@@ -57,13 +59,6 @@ android {
         debug {
             versionNameSuffix "-${getCommitCount()}"
             applicationIdSuffix ".debug"
-            multiDexEnabled true
-        }
-        release {
-            minifyEnabled true
-            shrinkResources true
-            multiDexEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 
@@ -78,7 +73,6 @@ android {
             dimension "default"
         }
         dev {
-            minSdkVersion 21
             resConfigs "en", "xxhdpi"
             dimension "default"
         }
@@ -97,6 +91,14 @@ android {
         checkReleaseBuilds false
     }
 
+    compileOptions {
+        sourceCompatibility = 1.8
+        targetCompatibility = 1.8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }
 
 dependencies {
@@ -106,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"
@@ -116,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'
 
@@ -124,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"
@@ -151,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'
@@ -161,7 +163,9 @@ dependencies {
     implementation 'com.github.gabrielemariotti.changeloglib:changelog:2.1.0'
 
     // Database
-    implementation 'eu.kanade.storio:storio:1.13.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'
 
     // Model View Presenter
@@ -182,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'
@@ -231,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()
     }
@@ -250,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,12 +9,16 @@
     <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
         android:name=".App"
         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"
@@ -22,12 +26,21 @@
         android:theme="@style/Theme.Tachiyomi">
         <activity
             android:name=".ui.main.MainActivity"
-            android:launchMode="singleTop">
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+                <action android:name="com.google.android.gms.actions.SEARCH_ACTION"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="eu.kanade.tachiyomi.SEARCH" />
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <meta-data android:name="android.app.searchable" android:resource="@xml/searchable"/>
             <!--suppress AndroidDomInspection -->
             <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts"/>
         </activity>
@@ -51,6 +64,35 @@
                     android:scheme="tachiyomi" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".ui.setting.ShikimoriLoginActivity"
+            android:label="Shikimori">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="shikimori-auth"
+                    android:scheme="tachiyomi" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".ui.setting.BangumiLoginActivity"
+            android:label="Bangumi">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="bangumi-auth"
+                    android:scheme="tachiyomi" />
+            </intent-filter>
+        </activity>
+
         <activity
             android:name=".extension.util.ExtensionInstallActivity"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"/>

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

@@ -42,10 +42,8 @@ open class App : Application() {
 
     override fun attachBaseContext(base: Context) {
         super.attachBaseContext(base)
-        if (BuildConfig.DEBUG) {
         MultiDex.install(this)
     }
-    }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)

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/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/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 {
+        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

@@ -15,6 +15,8 @@ object PreferenceKeys {
 
     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"
@@ -27,6 +29,8 @@ object PreferenceKeys {
 
     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"
@@ -83,6 +87,8 @@ object PreferenceKeys {
 
     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"
@@ -105,6 +111,8 @@ object PreferenceKeys {
 
     const val defaultCategory = "default_category"
 
+    const val skipRead = "skip_read"
+
     const val downloadBadge = "display_download_badge"
 
     @Deprecated("Use the preferences of the source")

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

@@ -43,6 +43,8 @@ class PreferencesHelper(val context: Context) {
 
     fun showPageNumber() = rxPrefs.getBoolean(Keys.showPageNumber, true)
 
+    fun trueColor() = rxPrefs.getBoolean(Keys.trueColor, false)
+
     fun fullscreen() = rxPrefs.getBoolean(Keys.fullscreen, true)
 
     fun keepScreenOn() = rxPrefs.getBoolean(Keys.keepScreenOn, true)
@@ -55,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)
@@ -139,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)
@@ -165,6 +171,8 @@ class PreferencesHelper(val context: Context) {
 
     fun defaultCategory() = prefs.getInt(Keys.defaultCategory, -1)
 
+    fun skipRead() = prefs.getBoolean(Keys.skipRead, false)
+
     fun migrateFlags() = rxPrefs.getInteger("migrate_flags", Int.MAX_VALUE)
 
     fun trustedSignatures() = rxPrefs.getStringSet("trusted_signatures", emptySet())

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

@@ -45,7 +45,7 @@ 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)
     }
 

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

@@ -4,6 +4,8 @@ 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) {
 
@@ -11,6 +13,8 @@ class TrackManager(private val context: Context) {
         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)
@@ -19,7 +23,11 @@ class TrackManager(private val context: Context) {
 
     val kitsu = Kitsu(context, KITSU)
 
-    val services = listOf(myAnimeList, aniList, 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 }
 

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

@@ -21,13 +21,15 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
     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 } }
-                     """
+            |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,
@@ -58,14 +60,14 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
 
     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
-                        }
-                    }
-            """
+            |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,
@@ -90,29 +92,29 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
 
     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
-                      }
-                    }
-                  }
-                }
-            """
+            |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
         )
@@ -144,35 +146,35 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
 
     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
-                       }
-                      }
-                    }
-                  }
-                }
-            """
+            |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
@@ -214,16 +216,15 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
 
     fun getCurrentUser(): Observable<Pair<Int, String>> {
         val query = """
-            query User
-                {
-                  Viewer {
-                    id
-                    mediaListOptions {
-                      scoreFormat
-                    }
-                  }
-                }
-                """
+            |query User {
+                |Viewer {
+                    |id
+                    |mediaListOptions {
+                        |scoreFormat
+                    |}
+                |}
+            |}
+            |""".trimMargin()
         val payload = jsonObject(
                 "query" to query
         )
@@ -246,7 +247,7 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
                 }
     }
 
-    fun jsonToALManga(struct: JsonObject): ALManga{
+    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,
@@ -261,11 +262,10 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
                 date, struct["chapters"].nullInt ?: 0)
     }
 
-    fun jsonToALUserManga(struct: JsonObject): ALUserManga{
+    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"

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/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/myanimelist/MyAnimeList.kt

@@ -7,14 +7,14 @@ 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.net.URI
+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
@@ -29,7 +29,8 @@ class Myanimelist(private val context: Context, id: Int) : TrackService(id) {
         const val LOGGED_IN_COOKIE = "is_logged_in"
     }
 
-    private val api by lazy { MyanimelistApi(client) }
+    private val interceptor by lazy { MyAnimeListInterceptor(this) }
+    private val api by lazy { MyanimelistApi(client, interceptor) }
 
     override val name: String
         get() = "MyAnimeList"
@@ -62,7 +63,7 @@ class Myanimelist(private val context: Context, id: Int) : TrackService(id) {
     }
 
     override fun add(track: Track): Observable<Track> {
-        return api.addLibManga(track, getCSRF())
+        return api.addLibManga(track)
     }
 
     override fun update(track: Track): Observable<Track> {
@@ -70,11 +71,11 @@ class Myanimelist(private val context: Context, id: Int) : TrackService(id) {
             track.status = COMPLETED
         }
 
-        return api.updateLibManga(track, getCSRF())
+        return api.updateLibManga(track)
     }
 
     override fun bind(track: Track): Observable<Track> {
-        return api.findLibManga(track, getCSRF())
+        return api.findLibManga(track)
                 .flatMap { remoteTrack ->
                     if (remoteTrack != null) {
                         track.copyPersonalFrom(remoteTrack)
@@ -93,7 +94,7 @@ class Myanimelist(private val context: Context, id: Int) : TrackService(id) {
     }
 
     override fun refresh(track: Track): Observable<Track> {
-        return api.getLibManga(track, getCSRF())
+        return api.getLibManga(track)
                 .map { remoteTrack ->
                     track.copyPersonalFrom(remoteTrack)
                     track.total_chapters = remoteTrack.total_chapters
@@ -104,33 +105,55 @@ class Myanimelist(private val context: Context, id: Int) : TrackService(id) {
     override fun login(username: String, password: String): Completable {
         logout()
 
-        return api.login(username, password)
+        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.cookies.remove(URI(BASE_URL))
+        networkService.cookieManager.remove(HttpUrl.parse(BASE_URL)!!)
     }
 
-    override val isLogged: Boolean
-        get() = !getUsername().isEmpty() &&
-                !getPassword().isEmpty() &&
-                checkCookies(URI(BASE_URL)) &&
-                !getCSRF().isEmpty()
+    val isAuthorized: Boolean
+        get() = super.isLogged &&
+                getCSRF().isNotEmpty() &&
+                checkCookies()
 
-    private fun getCSRF(): String = preferences.trackToken(this).getOrDefault()
+    fun getCSRF(): String = preferences.trackToken(this).getOrDefault()
 
     private fun saveCSRF(csrf: String) = preferences.trackToken(this).set(csrf)
 
-    private fun checkCookies(uri: URI): Boolean {
+    private fun checkCookies(): Boolean {
         var ckCount = 0
-
-        for (ck in networkService.cookies.get(uri)) {
+        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++
         }

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,26 +22,20 @@ 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)))
+        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())
@@ -67,16 +61,83 @@ class MyanimelistApi(private val client: OkHttpClient) {
                     }
                     .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 getAddUrl() = Uri.parse(baseModifyListUrl).buildUpon()
-            .appendPath( "add.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 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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,139 @@
+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

@@ -0,0 +1,205 @@
+package eu.kanade.tachiyomi.data.track.shikimori
+
+import android.net.Uri
+import com.github.salomonbrys.kotson.array
+import com.github.salomonbrys.kotson.jsonObject
+import com.github.salomonbrys.kotson.nullString
+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.GET
+import eu.kanade.tachiyomi.network.POST
+import eu.kanade.tachiyomi.network.asObservableSuccess
+import okhttp3.*
+import rx.Observable
+import uy.kohesive.injekt.injectLazy
+
+class ShikimoriApi(private val client: OkHttpClient, interceptor: ShikimoriInterceptor) {
+
+    private val gson: Gson by injectLazy()
+    private val parser = JsonParser()
+    private val jsonime = MediaType.parse("application/json; charset=utf-8")
+    private val authClient = client.newBuilder().addInterceptor(interceptor).build()
+
+    fun addLibManga(track: Track, user_id: String): Observable<Track> {
+        val payload = jsonObject(
+                "user_rate" to jsonObject(
+                        "user_id" to user_id,
+                        "target_id" to track.media_id,
+                        "target_type" to "Manga",
+                        "chapters" to track.last_chapter_read,
+                        "score" to track.score.toInt(),
+                        "status" to track.toShikimoriStatus()
+                )
+        )
+        val body = RequestBody.create(jsonime, payload.toString())
+        val request = Request.Builder()
+                .url("$apiUrl/v2/user_rates")
+                .post(body)
+                .build()
+        return authClient.newCall(request)
+                .asObservableSuccess()
+                .map {
+                    track
+                }
+    }
+
+    fun updateLibManga(track: Track, user_id: String): Observable<Track> = addLibManga(track, user_id)
+
+    fun search(search: String): Observable<List<TrackSearch>> {
+        val url = Uri.parse("$apiUrl/mangas").buildUpon()
+                .appendQueryParameter("order", "popularity")
+                .appendQueryParameter("search", search)
+                .appendQueryParameter("limit", "20")
+                .build()
+        val request = Request.Builder()
+                .url(url.toString())
+                .get()
+                .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).array
+                    response.map { jsonToSearch(it.obj) }
+                }
+
+    }
+
+    private fun jsonToSearch(obj: JsonObject): TrackSearch {
+        return TrackSearch.create(TrackManager.SHIKIMORI).apply {
+            media_id = obj["id"].asInt
+            title = obj["name"].asString
+            total_chapters = obj["chapters"].asInt
+            cover_url = baseUrl + obj["image"].obj["preview"].asString
+            summary = ""
+            tracking_url = baseUrl + obj["url"].asString
+            publishing_status = obj["status"].asString
+            publishing_type = obj["kind"].asString
+            start_date = obj.get("aired_on").nullString.orEmpty()
+        }
+    }
+
+    private fun jsonToTrack(obj: JsonObject, mangas: JsonObject): Track {
+        return Track.create(TrackManager.SHIKIMORI).apply {
+            title = mangas["name"].asString
+            media_id = obj["id"].asInt
+            total_chapters = mangas["chapters"].asInt
+            last_chapter_read = obj["chapters"].asInt
+            score = (obj["score"].asInt).toFloat()
+            status = toTrackStatus(obj["status"].asString)
+            tracking_url = baseUrl + mangas["url"].asString
+        }
+    }
+
+    fun findLibManga(track: Track, user_id: String): Observable<Track?> {
+        val url = Uri.parse("$apiUrl/v2/user_rates").buildUpon()
+                .appendQueryParameter("user_id", user_id)
+                .appendQueryParameter("target_id", track.media_id.toString())
+                .appendQueryParameter("target_type", "Manga")
+                .build()
+        val request = Request.Builder()
+                .url(url.toString())
+                .get()
+                .build()
+
+        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()
+                    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()
+                            }
+                }
+    }
+
+    fun getCurrentUser(): Int {
+        val user = authClient.newCall(GET("$apiUrl/users/whoami")).execute().body()?.string()
+        return parser.parse(user).obj["id"].asInt
+    }
+
+    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 = "1aaf4cf232372708e98b5abc813d795b539c5a916dbbfe9ac61bf02a360832cc"
+        private const val clientSecret = "229942c742dd4cde803125d17d64501d91c0b12e14cb1e5120184d77d67024c0"
+
+        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"
+
+        fun mangaUrl(remoteId: Int): String {
+            return "$baseMangaUrl/$remoteId"
+        }
+
+        fun authUrl() =
+                Uri.parse(loginUrl).buildUpon()
+                        .appendQueryParameter("client_id", clientId)
+                        .appendQueryParameter("redirect_uri", redirectUrl)
+                        .appendQueryParameter("response_type", "code")
+                        .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)
+                        .build())
+
+    }
+
+}

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

@@ -0,0 +1,43 @@
+package eu.kanade.tachiyomi.data.track.shikimori
+
+import com.google.gson.Gson
+import okhttp3.Interceptor
+import okhttp3.Response
+
+class ShikimoriInterceptor(val shikimori: Shikimori, val gson: Gson) : Interceptor {
+
+    /**
+     * OAuth object used for authenticated requests.
+     */
+    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 Shikimori")
+
+        val refreshToken = currAuth.refresh_token!!
+
+        // Refresh access token if expired.
+        if (currAuth.isExpired()) {
+            val response = chain.proceed(ShikimoriApi.refreshTokenRequest(refreshToken))
+            if (response.isSuccessful) {
+                newAuth(gson.fromJson(response.body()!!.string(), OAuth::class.java))
+            } else {
+                response.close()
+            }
+        }
+        // Add the authorization header to the original request.
+        val authRequest = originalRequest.newBuilder()
+                .addHeader("Authorization", "Bearer ${oauth!!.access_token}")
+                .header("User-Agent", "Tachiyomi")
+                .build()
+
+        return chain.proceed(authRequest)
+    }
+
+    fun newAuth(oauth: OAuth?) {
+        this.oauth = 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/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()

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

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,7 +37,13 @@ internal class ExtensionGithubApi {
 
         val json = gson.fromJson<JsonArray>(text)
 
-        return json.map { element ->
+        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

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

@@ -0,0 +1,79 @@
+package eu.kanade.tachiyomi.network
+
+import android.content.Context
+import android.os.Build
+import android.webkit.CookieManager
+import android.webkit.CookieSyncManager
+import okhttp3.Cookie
+import okhttp3.CookieJar
+import okhttp3.HttpUrl
+
+class AndroidCookieJar(context: Context) : CookieJar {
+
+    private val manager = CookieManager.getInstance()
+
+    private val syncManager by lazy { CookieSyncManager.createInstance(context) }
+
+    init {
+        // Init sync manager when using anything below L
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            syncManager
+        }
+    }
+
+    override fun saveFromResponse(url: HttpUrl, cookies: MutableList<Cookie>) {
+        val urlString = url.toString()
+
+        for (cookie in cookies) {
+            manager.setCookie(urlString, cookie.toString())
+        }
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            syncManager.sync()
+        }
+    }
+
+    override fun loadForRequest(url: HttpUrl): List<Cookie> {
+        return get(url)
+    }
+
+    fun get(url: HttpUrl): List<Cookie> {
+        val cookies = manager.getCookie(url.toString())
+
+        return if (cookies != null && !cookies.isEmpty()) {
+            cookies.split(";").mapNotNull { Cookie.parse(url, it) }
+        } else {
+            emptyList()
+        }
+    }
+
+    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("=") }
+            .filterNames()
+            .onEach { manager.setCookie(urlString, "$it=;Max-Age=$maxAge") }
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            syncManager.sync()
+        }
+    }
+
+    fun removeAll() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            manager.removeAllCookies {}
+        } else {
+            manager.removeAllCookie()
+            syncManager.sync()
+        }
+    }
+}

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

@@ -1,27 +1,59 @@
 package eu.kanade.tachiyomi.network
 
-import com.squareup.duktape.Duktape
+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 : Interceptor {
-
-    private val operationPattern = Regex("""setTimeout\(function\(\)\{\s+(var (?:\w,)+f.+?\r?\n[\s\S]+?a\.value =.+?)\r?\n""")
-    
-    private val passPattern = Regex("""name="pass" value="(.+?)"""")
-
-    private val challengePattern = Regex("""name="jschl_vc" value="(\w+)"""")
+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 {
-        val response = chain.proceed(chain.request())
+        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) {
-            return try {
-                chain.proceed(resolveChallenge(response))
+            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
@@ -32,48 +64,77 @@ class CloudflareInterceptor : Interceptor {
         return response
     }
 
-    private fun resolveChallenge(response: Response): Request {
-        Duktape.create().use { duktape ->
-            val originalRequest = response.request()
-            val url = originalRequest.url()
-            val domain = url.host()
-            val content = response.body()!!.string()
+    @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)
 
-            // CloudFlare requires waiting 4 seconds before resolving the challenge
-            Thread.sleep(4000)
+        var webView: WebView? = null
+        var challengeFound = false
+        var cloudflareBypassed = false
 
-            val operation = operationPattern.find(content)?.groups?.get(1)?.value
-            val challenge = challengePattern.find(content)?.groups?.get(1)?.value
-            val pass = passPattern.find(content)?.groups?.get(1)?.value
+        val origRequestUrl = request.url().toString()
+        val headers = request.headers().toMultimap().mapValues { it.value.getOrNull(0) ?: "" }
 
-            if (operation == null || challenge == null || pass == null) {
-                throw Exception("Failed resolving Cloudflare challenge")
+        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 }
                     }
 
-            val js = operation
-                    .replace(Regex("""a\.value = (.+ \+ t\.length(\).toFixed\(10\))?).+"""), "$1")
-                    .replace(Regex("""\s{3,}[a-z](?: = |\.).+"""), "")
-                    .replace("t.length", "${domain.length}")
-                    .replace("\n", "")
-
-            val result = duktape.evaluate(js) as String
-
-            val cloudflareUrl = HttpUrl.parse("${url.scheme()}://$domain/cdn-cgi/l/chk_jschl")!!
-                    .newBuilder()
-                    .addQueryParameter("jschl_vc", challenge)
-                    .addQueryParameter("pass", pass)
-                    .addQueryParameter("jschl_answer", result)
-                    .toString()
-
-            val cloudflareHeaders = originalRequest.headers()
-                    .newBuilder()
-                    .add("Referer", url.toString())
-                    .add("Accept", "text/html,application/xhtml+xml,application/xml")
-                    .add("Accept-Language", "en")
-                    .build()
-
-            return GET(cloudflareUrl, cloudflareHeaders, cache = CacheControl.Builder().build())
+                    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

@@ -2,11 +2,7 @@ package eu.kanade.tachiyomi.network
 
 import android.content.Context
 import android.os.Build
-import okhttp3.Cache
-import okhttp3.CipherSuite
-import okhttp3.ConnectionSpec
-import okhttp3.OkHttpClient
-import okhttp3.TlsVersion
+import okhttp3.*
 import java.io.File
 import java.io.IOException
 import java.net.InetAddress
@@ -15,11 +11,7 @@ import java.net.UnknownHostException
 import java.security.KeyManagementException
 import java.security.KeyStore
 import java.security.NoSuchAlgorithmException
-import javax.net.ssl.SSLContext
-import javax.net.ssl.SSLSocket
-import javax.net.ssl.SSLSocketFactory
-import javax.net.ssl.TrustManagerFactory
-import javax.net.ssl.X509TrustManager
+import javax.net.ssl.*
 
 class NetworkHelper(context: Context) {
 
@@ -27,7 +19,7 @@ class NetworkHelper(context: Context) {
 
     private val cacheSize = 5L * 1024 * 1024 // 5 MiB
 
-    private val cookieManager = PersistentCookieJar(context)
+    val cookieManager = AndroidCookieJar(context)
 
     val client = OkHttpClient.Builder()
             .cookieJar(cookieManager)
@@ -36,12 +28,9 @@ class NetworkHelper(context: Context) {
             .build()
 
     val cloudflareClient = client.newBuilder()
-            .addInterceptor(CloudflareInterceptor())
+            .addInterceptor(CloudflareInterceptor(context))
             .build()
 
-    val cookies: PersistentCookieStore
-        get() = cookieManager.store
-
     private fun OkHttpClient.Builder.enableTLS12(): OkHttpClient.Builder {
         if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) {
             return this

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

@@ -1,19 +0,0 @@
-package eu.kanade.tachiyomi.network
-
-import android.content.Context
-import okhttp3.Cookie
-import okhttp3.CookieJar
-import okhttp3.HttpUrl
-
-class PersistentCookieJar(context: Context) : CookieJar {
-
-    val store = PersistentCookieStore(context)
-
-    override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) {
-        store.addAll(url, cookies)
-    }
-
-    override fun loadForRequest(url: HttpUrl): List<Cookie> {
-        return store.get(url)
-    }
-}

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

@@ -1,78 +0,0 @@
-package eu.kanade.tachiyomi.network
-
-import android.content.Context
-import okhttp3.Cookie
-import okhttp3.HttpUrl
-import java.net.URI
-import java.util.concurrent.ConcurrentHashMap
-
-class PersistentCookieStore(context: Context) {
-
-    private val cookieMap = ConcurrentHashMap<String, List<Cookie>>()
-    private val prefs = context.getSharedPreferences("cookie_store", Context.MODE_PRIVATE)
-
-    init {
-        for ((key, value) in prefs.all) {
-            @Suppress("UNCHECKED_CAST")
-            val cookies = value as? Set<String>
-            if (cookies != null) {
-                try {
-                    val url = HttpUrl.parse("http://$key") ?: continue
-                    val nonExpiredCookies = cookies.mapNotNull { Cookie.parse(url, it) }
-                            .filter { !it.hasExpired() }
-                    cookieMap.put(key, nonExpiredCookies)
-                } catch (e: Exception) {
-                    // Ignore
-                }
-            }
-        }
-    }
-
-    @Synchronized
-    fun addAll(url: HttpUrl, cookies: List<Cookie>) {
-        val key = url.uri().host
-
-        // Append or replace the cookies for this domain.
-        val cookiesForDomain = cookieMap[key].orEmpty().toMutableList()
-        for (cookie in cookies) {
-            // Find a cookie with the same name. Replace it if found, otherwise add a new one.
-            val pos = cookiesForDomain.indexOfFirst { it.name() == cookie.name() }
-            if (pos == -1) {
-                cookiesForDomain.add(cookie)
-            } else {
-                cookiesForDomain[pos] = cookie
-            }
-        }
-        cookieMap.put(key, cookiesForDomain)
-
-        // Get cookies to be stored in disk
-        val newValues = cookiesForDomain.asSequence()
-                .filter { it.persistent() && !it.hasExpired() }
-                .map(Cookie::toString)
-                .toSet()
-
-        prefs.edit().putStringSet(key, newValues).apply()
-    }
-
-    @Synchronized
-    fun removeAll() {
-        prefs.edit().clear().apply()
-        cookieMap.clear()
-    }
-
-    fun remove(uri: URI) {
-        prefs.edit().remove(uri.host).apply()
-        cookieMap.remove(uri.host)
-    }
-
-    fun get(url: HttpUrl) = get(url.uri().host)
-
-    fun get(uri: URI) = get(uri.host)
-
-    private fun get(url: String): List<Cookie> {
-        return cookieMap[url].orEmpty().filter { !it.hasExpired() }
-    }
-
-    private fun Cookie.hasExpired() = System.currentTimeMillis() >= expiresAt()
-
-}

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

@@ -6,11 +6,6 @@ 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 eu.kanade.tachiyomi.source.online.english.*
-import eu.kanade.tachiyomi.source.online.german.WieManga
-import eu.kanade.tachiyomi.source.online.russian.Mangachan
-import eu.kanade.tachiyomi.source.online.russian.Mintmanga
-import eu.kanade.tachiyomi.source.online.russian.Readmanga
 import rx.Observable
 
 open class SourceManager(private val context: Context) {
@@ -48,17 +43,7 @@ open class SourceManager(private val context: Context) {
     }
 
     private fun createInternalSources(): List<Source> = listOf(
-            LocalSource(context),
-            Batoto(),
-            Mangahere(),
-            Mangafox(),
-            Kissmanga(),
-            Readmanga(),
-            Mintmanga(),
-            Mangachan(),
-            Readmangatoday(),
-            Mangasee(),
-            WieManga()
+            LocalSource(context)
     )
 
     private inner class StubSource(override val id: Long) : Source {

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

@@ -1,31 +0,0 @@
-package eu.kanade.tachiyomi.source.online.english
-
-import eu.kanade.tachiyomi.source.Source
-import eu.kanade.tachiyomi.source.model.Page
-import eu.kanade.tachiyomi.source.model.SChapter
-import eu.kanade.tachiyomi.source.model.SManga
-import rx.Observable
-
-class Batoto : Source {
-
-    override val id: Long = 1
-
-    override val name = "Batoto"
-
-    override fun fetchMangaDetails(manga: SManga): Observable<SManga> {
-        return Observable.error(Exception("RIP Batoto"))
-    }
-
-    override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> {
-        return Observable.error(Exception("RIP Batoto"))
-    }
-
-    override fun fetchPageList(chapter: SChapter): Observable<List<Page>> {
-        return Observable.error(Exception("RIP Batoto"))
-    }
-
-    override fun toString(): String {
-        return "$name (EN)"
-    }
-
-}

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

@@ -1,253 +0,0 @@
-package eu.kanade.tachiyomi.source.online.english
-
-import com.squareup.duktape.Duktape
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.source.model.*
-import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.FormBody
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import timber.log.Timber
-import java.text.SimpleDateFormat
-import java.util.regex.Pattern
-
-class Kissmanga : ParsedHttpSource() {
-
-    override val id: Long = 4
-
-    override val name = "Kissmanga"
-
-    override val baseUrl = "http://kissmanga.com"
-
-    override val lang = "en"
-
-    override val supportsLatest = true
-
-    override val client: OkHttpClient = network.cloudflareClient
-
-    override fun headersBuilder(): Headers.Builder {
-        return Headers.Builder()
-            .add("User-Agent", "Mozilla/5.0 (Windows NT 10.0; WOW64) Gecko/20100101 Firefox/60")
-    }
-
-    override fun popularMangaSelector() = "table.listing tr:gt(1)"
-
-    override fun latestUpdatesSelector() = "table.listing tr:gt(1)"
-
-    override fun popularMangaRequest(page: Int): Request {
-        return GET("$baseUrl/MangaList/MostPopular?page=$page", headers)
-    }
-
-    override fun latestUpdatesRequest(page: Int): Request {
-        return GET("http://kissmanga.com/MangaList/LatestUpdate?page=$page", headers)
-    }
-
-    override fun popularMangaFromElement(element: Element): SManga {
-        val manga = SManga.create()
-        element.select("td a:eq(0)").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            val title = it.text()
-            //check if cloudfire email obfuscation is affecting title name
-            if (title.contains("[email protected]", true)) {
-                try {
-                    var str: String = it.html()
-                    //get the  number
-                    str = str.substringAfter("data-cfemail=\"")
-                    str = str.substringBefore("\">[email")
-                    val sb = StringBuilder()
-                    //convert number to char
-                    val r = Integer.valueOf(str.substring(0, 2), 16)!!
-                    var i = 2
-                    while (i < str.length) {
-                        val c = (Integer.valueOf(str.substring(i, i + 2), 16) xor r).toChar()
-                        sb.append(c)
-                        i += 2
-                    }
-                    //replace the new word into the title
-                    manga.title = title.replace("[email protected]", sb.toString(), true)
-                } catch (e: Exception) {
-                    //on error just default to obfuscated title
-                    Timber.e("error parsing [email protected]", e)
-                    manga.title = title
-                }
-            } else {
-                manga.title = title
-            }
-        }
-        return manga
-    }
-
-    override fun latestUpdatesFromElement(element: Element): SManga {
-        return popularMangaFromElement(element)
-    }
-
-    override fun popularMangaNextPageSelector() = "li > a:contains(› Next)"
-
-    override fun latestUpdatesNextPageSelector(): String = "ul.pager > li > a:contains(Next)"
-
-    override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val form = FormBody.Builder().apply {
-            add("mangaName", query)
-
-            for (filter in if (filters.isEmpty()) getFilterList() else filters) {
-                when (filter) {
-                    is Author -> add("authorArtist", filter.state)
-                    is Status -> add("status", arrayOf("", "Completed", "Ongoing")[filter.state])
-                    is GenreList -> filter.state.forEach { genre -> add("genres", genre.state.toString()) }
-                }
-            }
-        }
-        return POST("$baseUrl/AdvanceSearch", headers, form.build())
-    }
-
-    override fun searchMangaSelector() = popularMangaSelector()
-
-    override fun searchMangaFromElement(element: Element): SManga {
-        return popularMangaFromElement(element)
-    }
-
-    override fun searchMangaNextPageSelector() = null
-
-    override fun mangaDetailsParse(document: Document): SManga {
-        val infoElement = document.select("div.barContent").first()
-
-        val manga = SManga.create()
-        manga.author = infoElement.select("p:has(span:contains(Author:)) > a").first()?.text()
-        manga.genre = infoElement.select("p:has(span:contains(Genres:)) > *:gt(0)").text()
-        manga.description = infoElement.select("p:has(span:contains(Summary:)) ~ p").text()
-        manga.status = infoElement.select("p:has(span:contains(Status:))").first()?.text().orEmpty().let { parseStatus(it) }
-        manga.thumbnail_url = document.select(".rightBox:eq(0) img").first()?.attr("src")
-        return manga
-    }
-
-    fun parseStatus(status: String) = when {
-        status.contains("Ongoing") -> SManga.ONGOING
-        status.contains("Completed") -> SManga.COMPLETED
-        else -> SManga.UNKNOWN
-    }
-
-    override fun chapterListSelector() = "table.listing tr:gt(1)"
-
-    override fun chapterFromElement(element: Element): SChapter {
-        val urlElement = element.select("a").first()
-
-        val chapter = SChapter.create()
-        chapter.setUrlWithoutDomain(urlElement.attr("href"))
-        chapter.name = urlElement.text()
-        chapter.date_upload = element.select("td:eq(1)").first()?.text()?.let {
-            SimpleDateFormat("MM/dd/yyyy").parse(it).time
-        } ?: 0
-        return chapter
-    }
-
-    override fun pageListRequest(chapter: SChapter) = POST(baseUrl + chapter.url, headers)
-
-    override fun pageListParse(response: Response): List<Page> {
-        val body = response.body()!!.string()
-
-        val pages = mutableListOf<Page>()
-
-        // Kissmanga now encrypts the urls, so we need to execute these two scripts in JS.
-        val ca = client.newCall(GET("$baseUrl/Scripts/ca.js", headers)).execute().body()!!.string()
-        val lo = client.newCall(GET("$baseUrl/Scripts/lo.js", headers)).execute().body()!!.string()
-
-        Duktape.create().use {
-            it.evaluate(ca)
-            it.evaluate(lo)
-
-            // There are two functions in an inline script needed to decrypt the urls. We find and
-            // execute them.
-            var p = Pattern.compile("(var.*CryptoJS.*)")
-            var m = p.matcher(body)
-            while (m.find()) {
-                it.evaluate(m.group(1))
-            }
-
-            // Finally find all the urls and decrypt them in JS.
-            p = Pattern.compile("""lstImages.push\((.*)\);""")
-            m = p.matcher(body)
-
-            var i = 0
-            while (m.find()) {
-                val url = it.evaluate(m.group(1)) as String
-                pages.add(Page(i++, "", url))
-            }
-        }
-
-        return pages
-    }
-
-    override fun pageListParse(document: Document): List<Page> {
-        throw Exception("Not used")
-    }
-
-    override fun imageUrlRequest(page: Page) = GET(page.url)
-
-    override fun imageUrlParse(document: Document) = ""
-
-    private class Status : Filter.TriState("Completed")
-    private class Author : Filter.Text("Author")
-    private class Genre(name: String) : Filter.TriState(name)
-    private class GenreList(genres: List<Genre>) : Filter.Group<Genre>("Genres", genres)
-
-    override fun getFilterList() = FilterList(
-            Author(),
-            Status(),
-            GenreList(getGenreList())
-    )
-
-    // $("select[name=\"genres\"]").map((i,el) => `Genre("${$(el).next().text().trim()}", ${i})`).get().join(',\n')
-    // on http://kissmanga.com/AdvanceSearch
-    private fun getGenreList() = listOf(
-            Genre("4-Koma"),
-            Genre("Action"),
-            Genre("Adult"),
-            Genre("Adventure"),
-            Genre("Comedy"),
-            Genre("Comic"),
-            Genre("Cooking"),
-            Genre("Doujinshi"),
-            Genre("Drama"),
-            Genre("Ecchi"),
-            Genre("Fantasy"),
-            Genre("Gender Bender"),
-            Genre("Harem"),
-            Genre("Historical"),
-            Genre("Horror"),
-            Genre("Josei"),
-            Genre("Lolicon"),
-            Genre("Manga"),
-            Genre("Manhua"),
-            Genre("Manhwa"),
-            Genre("Martial Arts"),
-            Genre("Mature"),
-            Genre("Mecha"),
-            Genre("Medical"),
-            Genre("Music"),
-            Genre("Mystery"),
-            Genre("One shot"),
-            Genre("Psychological"),
-            Genre("Romance"),
-            Genre("School Life"),
-            Genre("Sci-fi"),
-            Genre("Seinen"),
-            Genre("Shotacon"),
-            Genre("Shoujo"),
-            Genre("Shoujo Ai"),
-            Genre("Shounen"),
-            Genre("Shounen Ai"),
-            Genre("Slice of Life"),
-            Genre("Smut"),
-            Genre("Sports"),
-            Genre("Supernatural"),
-            Genre("Tragedy"),
-            Genre("Webtoon"),
-            Genre("Yaoi"),
-            Genre("Yuri")
-    )
-}

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

@@ -1,231 +0,0 @@
-package eu.kanade.tachiyomi.source.online.english
-
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.source.model.*
-import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
-import okhttp3.Request
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import java.text.ParseException
-import java.text.SimpleDateFormat
-import java.util.*
-
-class Mangafox : ParsedHttpSource() {
-
-    override val id: Long = 3
-
-    override val name = "Mangafox"
-
-    override val baseUrl = "http://mangafox.la"
-
-    override val lang = "en"
-
-    override val supportsLatest = true
-
-    override fun popularMangaSelector() = "div#mangalist > ul.list > li"
-
-    override fun popularMangaRequest(page: Int): Request {
-        val pageStr = if (page != 1) "$page.htm" else ""
-        return GET("$baseUrl/directory/$pageStr", headers)
-    }
-
-    override fun latestUpdatesSelector() = "div#mangalist > ul.list > li"
-
-    override fun latestUpdatesRequest(page: Int): Request {
-        val pageStr = if (page != 1) "$page.htm" else ""
-        return GET("$baseUrl/directory/$pageStr?latest")
-    }
-
-    override fun popularMangaFromElement(element: Element): SManga {
-        val manga = SManga.create()
-        element.select("a.title").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.text()
-        }
-        return manga
-    }
-
-    override fun latestUpdatesFromElement(element: Element): SManga {
-        return popularMangaFromElement(element)
-    }
-
-    override fun popularMangaNextPageSelector() = "a:has(span.next)"
-
-    override fun latestUpdatesNextPageSelector() = "a:has(span.next)"
-
-    override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/search.php?name_method=cw&author_method=cw&artist_method=cw&advopts=1")!!.newBuilder().addQueryParameter("name", query)
-        (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
-            when (filter) {
-                is Status -> url.addQueryParameter(filter.id, filter.state.toString())
-                is GenreList -> filter.state.forEach { genre -> url.addQueryParameter(genre.id, genre.state.toString()) }
-                is TextField -> url.addQueryParameter(filter.key, filter.state)
-                is Type -> url.addQueryParameter("type", if (filter.state == 0) "" else filter.state.toString())
-                is OrderBy -> {
-                    url.addQueryParameter("sort", arrayOf("name", "rating", "views", "total_chapters", "last_chapter_time")[filter.state!!.index])
-                    url.addQueryParameter("order", if (filter.state?.ascending == true) "az" else "za")
-                }
-            }
-        }
-        url.addQueryParameter("page", page.toString())
-        return GET(url.toString(), headers)
-    }
-
-    override fun searchMangaSelector() = "div#mangalist > ul.list > li"
-
-    override fun searchMangaFromElement(element: Element): SManga {
-        val manga = SManga.create()
-        element.select("a.title").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.text()
-        }
-        return manga
-    }
-
-    override fun searchMangaNextPageSelector() = "a:has(span.next)"
-
-    override fun mangaDetailsParse(document: Document): SManga {
-        val infoElement = document.select("div#title").first()
-        val rowElement = infoElement.select("table > tbody > tr:eq(1)").first()
-        val sideInfoElement = document.select("#series_info").first()
-        val licensedElement = document.select("div.warning").first()
-
-        val manga = SManga.create()
-        manga.author = rowElement.select("td:eq(1)").first()?.text()
-        manga.artist = rowElement.select("td:eq(2)").first()?.text()
-        manga.genre = rowElement.select("td:eq(3)").first()?.text()
-        manga.description = infoElement.select("p.summary").first()?.text()
-        val isLicensed = licensedElement?.text()?.contains("licensed")
-        if (isLicensed == true) {
-            manga.status = SManga.LICENSED
-        } else {
-            manga.status = sideInfoElement.select(".data").first()?.text().orEmpty().let { parseStatus(it) }
-        }
-
-        manga.thumbnail_url = sideInfoElement.select("div.cover > img").first()?.attr("src")
-        return manga
-    }
-
-    private fun parseStatus(status: String) = when {
-        status.contains("Ongoing") -> SManga.ONGOING
-        status.contains("Completed") -> SManga.COMPLETED
-        else -> SManga.UNKNOWN
-    }
-
-    override fun chapterListSelector() = "div#chapters li div"
-
-    override fun chapterFromElement(element: Element): SChapter {
-        val urlElement = element.select("a.tips").first()
-
-        val chapter = SChapter.create()
-        chapter.setUrlWithoutDomain(urlElement.attr("href"))
-        chapter.name = element.select("span.title.nowrap").first()?.text()?.let { urlElement.text() + " - " + it } ?: urlElement.text()
-        chapter.date_upload = element.select("span.date").first()?.text()?.let { parseChapterDate(it) } ?: 0
-        return chapter
-    }
-
-    private fun parseChapterDate(date: String): Long {
-        return if ("Today" in date || " ago" in date) {
-            Calendar.getInstance().apply {
-                set(Calendar.HOUR_OF_DAY, 0)
-                set(Calendar.MINUTE, 0)
-                set(Calendar.SECOND, 0)
-                set(Calendar.MILLISECOND, 0)
-            }.timeInMillis
-        } else if ("Yesterday" in date) {
-            Calendar.getInstance().apply {
-                add(Calendar.DATE, -1)
-                set(Calendar.HOUR_OF_DAY, 0)
-                set(Calendar.MINUTE, 0)
-                set(Calendar.SECOND, 0)
-                set(Calendar.MILLISECOND, 0)
-            }.timeInMillis
-        } else {
-            try {
-                SimpleDateFormat("MMM d, yyyy", Locale.ENGLISH).parse(date).time
-            } catch (e: ParseException) {
-                0L
-            }
-        }
-    }
-
-    override fun pageListParse(document: Document): List<Page> {
-        val url = document.baseUri().substringBeforeLast('/')
-
-        val pages = mutableListOf<Page>()
-        document.select("select.m").first()?.select("option:not([value=0])")?.forEach {
-            pages.add(Page(pages.size, "$url/${it.attr("value")}.html"))
-        }
-        return pages
-    }
-
-    override fun imageUrlParse(document: Document): String {
-        val url = document.getElementById("image").attr("src")
-        return if ("compressed?token=" !in url) {
-            url
-        } else {
-            "http://mangafox.me/media/logo.png"
-        }
-    }
-
-    private class Status(val id: String = "is_completed") : Filter.TriState("Completed")
-    private class Genre(name: String, val id: String = "genres[$name]") : Filter.TriState(name)
-    private class TextField(name: String, val key: String) : Filter.Text(name)
-    private class Type : Filter.Select<String>("Type", arrayOf("Any", "Japanese Manga", "Korean Manhwa", "Chinese Manhua"))
-    private class OrderBy : Filter.Sort("Order by",
-            arrayOf("Series name", "Rating", "Views", "Total chapters", "Last chapter"),
-            Filter.Sort.Selection(2, false))
-
-    private class GenreList(genres: List<Genre>) : Filter.Group<Genre>("Genres", genres)
-
-    override fun getFilterList() = FilterList(
-            TextField("Author", "author"),
-            TextField("Artist", "artist"),
-            Type(),
-            Status(),
-            OrderBy(),
-            GenreList(getGenreList())
-    )
-
-    // $('select.genres').map((i,el)=>`Genre("${$(el).next().text().trim()}", "${$(el).attr('name')}")`).get().join(',\n')
-    // on http://mangafox.me/search.php
-    private fun getGenreList() = listOf(
-            Genre("Action"),
-            Genre("Adult"),
-            Genre("Adventure"),
-            Genre("Comedy"),
-            Genre("Doujinshi"),
-            Genre("Drama"),
-            Genre("Ecchi"),
-            Genre("Fantasy"),
-            Genre("Gender Bender"),
-            Genre("Harem"),
-            Genre("Historical"),
-            Genre("Horror"),
-            Genre("Josei"),
-            Genre("Martial Arts"),
-            Genre("Mature"),
-            Genre("Mecha"),
-            Genre("Mystery"),
-            Genre("One Shot"),
-            Genre("Psychological"),
-            Genre("Romance"),
-            Genre("School Life"),
-            Genre("Sci-fi"),
-            Genre("Seinen"),
-            Genre("Shoujo"),
-            Genre("Shoujo Ai"),
-            Genre("Shounen"),
-            Genre("Shounen Ai"),
-            Genre("Slice of Life"),
-            Genre("Smut"),
-            Genre("Sports"),
-            Genre("Supernatural"),
-            Genre("Tragedy"),
-            Genre("Webtoons"),
-            Genre("Yaoi"),
-            Genre("Yuri")
-    )
-
-}

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

@@ -1,259 +0,0 @@
-package eu.kanade.tachiyomi.source.online.english
-
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.source.model.*
-import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
-import okhttp3.Request
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import java.security.SecureRandom
-import java.security.cert.X509Certificate
-import java.text.ParseException
-import java.text.SimpleDateFormat
-import java.util.*
-import javax.net.ssl.SSLContext
-import javax.net.ssl.X509TrustManager
-
-class Mangahere : ParsedHttpSource() {
-
-    override val id: Long = 2
-
-    override val name = "Mangahere"
-
-    override val baseUrl = "http://www.mangahere.cc"
-
-    override val lang = "en"
-
-    override val supportsLatest = true
-
-    private val trustManager = object : X509TrustManager {
-        override fun getAcceptedIssuers(): Array<X509Certificate> {
-            return emptyArray()
-        }
-
-        override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) {
-        }
-
-        override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) {
-        }
-    }
-
-    private val sslContext = SSLContext.getInstance("SSL").apply {
-        init(null, arrayOf(trustManager), SecureRandom())
-    }
-
-    override val client = super.client.newBuilder()
-            .sslSocketFactory(sslContext.socketFactory, trustManager)
-            .build()
-
-    override fun popularMangaSelector() = "div.directory_list > ul > li"
-
-    override fun latestUpdatesSelector() = "div.directory_list > ul > li"
-
-    override fun popularMangaRequest(page: Int): Request {
-        return GET("$baseUrl/directory/$page.htm?views.za", headers)
-    }
-
-    override fun latestUpdatesRequest(page: Int): Request {
-        return GET("$baseUrl/directory/$page.htm?last_chapter_time.za", headers)
-    }
-
-    private fun mangaFromElement(query: String, element: Element): SManga {
-        val manga = SManga.create()
-        element.select(query).first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = if (it.hasAttr("title")) it.attr("title") else if (it.hasAttr("rel")) it.attr("rel") else it.text()
-        }
-        return manga
-    }
-
-    override fun popularMangaFromElement(element: Element): SManga {
-        return mangaFromElement("div.title > a", element)
-    }
-
-    override fun latestUpdatesFromElement(element: Element): SManga {
-        return popularMangaFromElement(element)
-    }
-
-    override fun popularMangaNextPageSelector() = "div.next-page > a.next"
-
-    override fun latestUpdatesNextPageSelector() = "div.next-page > a.next"
-
-    override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/search.php?name_method=cw&author_method=cw&artist_method=cw&advopts=1")!!.newBuilder().addQueryParameter("name", query)
-        (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
-            when (filter) {
-                is Status -> url.addQueryParameter("is_completed", arrayOf("", "1", "0")[filter.state])
-                is GenreList -> filter.state.forEach { genre -> url.addQueryParameter(genre.id, genre.state.toString()) }
-                is TextField -> url.addQueryParameter(filter.key, filter.state)
-                is Type -> url.addQueryParameter("direction", arrayOf("", "rl", "lr")[filter.state])
-                is OrderBy -> {
-                    url.addQueryParameter("sort", arrayOf("name", "rating", "views", "total_chapters", "last_chapter_time")[filter.state!!.index])
-                    url.addQueryParameter("order", if (filter.state?.ascending == true) "az" else "za")
-                }
-            }
-        }
-        url.addQueryParameter("page", page.toString())
-        return GET(url.toString(), headers)
-    }
-
-    override fun searchMangaSelector() = "div.result_search > dl:has(dt)"
-
-    override fun searchMangaFromElement(element: Element): SManga {
-        return mangaFromElement("a.manga_info", element)
-    }
-
-    override fun searchMangaNextPageSelector() = "div.next-page > a.next"
-
-    override fun mangaDetailsParse(document: Document): SManga {
-        val detailElement = document.select(".manga_detail_top").first()
-        val infoElement = detailElement.select(".detail_topText").first()
-        val licensedElement = document.select(".mt10.color_ff00.mb10").first()
-
-        val manga = SManga.create()
-        manga.author = infoElement.select("a[href*=author/]").first()?.text()
-        manga.artist = infoElement.select("a[href*=artist/]").first()?.text()
-        manga.genre = infoElement.select("li:eq(3)").first()?.text()?.substringAfter("Genre(s):")
-        manga.description = infoElement.select("#show").first()?.text()?.substringBeforeLast("Show less")
-        manga.thumbnail_url = detailElement.select("img.img").first()?.attr("src")
-
-        if (licensedElement?.text()?.contains("licensed") == true) {
-            manga.status = SManga.LICENSED
-        } else {
-            manga.status = infoElement.select("li:eq(6)").first()?.text().orEmpty().let { parseStatus(it) }
-        }
-
-        return manga
-    }
-
-    private fun parseStatus(status: String) = when {
-        status.contains("Ongoing") -> SManga.ONGOING
-        status.contains("Completed") -> SManga.COMPLETED
-        else -> SManga.UNKNOWN
-    }
-
-    override fun chapterListSelector() = ".detail_list > ul:not([class]) > li"
-
-    override fun chapterFromElement(element: Element): SChapter {
-        val parentEl = element.select("span.left").first()
-
-        val urlElement = parentEl.select("a").first()
-
-        var volume = parentEl.select("span.mr6")?.first()?.text()?.trim() ?: ""
-        if (volume.length > 0) {
-            volume = " - " + volume
-        }
-
-        var title = parentEl?.textNodes()?.last()?.text()?.trim() ?: ""
-        if (title.length > 0) {
-            title = " - " + title
-        }
-
-        val chapter = SChapter.create()
-        chapter.setUrlWithoutDomain(urlElement.attr("href"))
-        chapter.name = urlElement.text() + volume + title
-        chapter.date_upload = element.select("span.right").first()?.text()?.let { parseChapterDate(it) } ?: 0
-        return chapter
-    }
-
-    private fun parseChapterDate(date: String): Long {
-        return if ("Today" in date) {
-            Calendar.getInstance().apply {
-                set(Calendar.HOUR_OF_DAY, 0)
-                set(Calendar.MINUTE, 0)
-                set(Calendar.SECOND, 0)
-                set(Calendar.MILLISECOND, 0)
-            }.timeInMillis
-        } else if ("Yesterday" in date) {
-            Calendar.getInstance().apply {
-                add(Calendar.DATE, -1)
-                set(Calendar.HOUR_OF_DAY, 0)
-                set(Calendar.MINUTE, 0)
-                set(Calendar.SECOND, 0)
-                set(Calendar.MILLISECOND, 0)
-            }.timeInMillis
-        } else {
-            try {
-                SimpleDateFormat("MMM d, yyyy", Locale.ENGLISH).parse(date).time
-            } catch (e: ParseException) {
-                0L
-            }
-        }
-    }
-
-    override fun pageListParse(document: Document): List<Page> {
-        val licensedError = document.select(".mangaread_error > .mt10").first()
-        if (licensedError != null) {
-            throw Exception(licensedError.text())
-        }
-
-        val pages = mutableListOf<Page>()
-        document.select("select.wid60").first()?.getElementsByTag("option")?.forEach {
-            if (!it.attr("value").contains("featured.html")) {
-                pages.add(Page(pages.size, "http:" + it.attr("value")))
-            }
-        }
-        pages.getOrNull(0)?.imageUrl = imageUrlParse(document)
-        return pages
-    }
-
-    override fun imageUrlParse(document: Document) = document.getElementById("image").attr("src")
-
-    private class Status : Filter.TriState("Completed")
-    private class Genre(name: String, val id: String = "genres[$name]") : Filter.TriState(name)
-    private class TextField(name: String, val key: String) : Filter.Text(name)
-    private class Type : Filter.Select<String>("Type", arrayOf("Any", "Japanese Manga (read from right to left)", "Korean Manhwa (read from left to right)"))
-    private class OrderBy : Filter.Sort("Order by",
-            arrayOf("Series name", "Rating", "Views", "Total chapters", "Last chapter"),
-            Filter.Sort.Selection(2, false))
-
-    private class GenreList(genres: List<Genre>) : Filter.Group<Genre>("Genres", genres)
-
-    override fun getFilterList() = FilterList(
-            TextField("Author", "author"),
-            TextField("Artist", "artist"),
-            Type(),
-            Status(),
-            OrderBy(),
-            GenreList(getGenreList())
-    )
-
-    // [...document.querySelectorAll("select[id^='genres'")].map((el,i) => `Genre("${el.nextSibling.nextSibling.textContent.trim()}", "${el.getAttribute('name')}")`).join(',\n')
-    // http://www.mangahere.co/advsearch.htm
-    private fun getGenreList() = listOf(
-            Genre("Action"),
-            Genre("Adventure"),
-            Genre("Comedy"),
-            Genre("Doujinshi"),
-            Genre("Drama"),
-            Genre("Ecchi"),
-            Genre("Fantasy"),
-            Genre("Gender Bender"),
-            Genre("Harem"),
-            Genre("Historical"),
-            Genre("Horror"),
-            Genre("Josei"),
-            Genre("Martial Arts"),
-            Genre("Mature"),
-            Genre("Mecha"),
-            Genre("Mystery"),
-            Genre("One Shot"),
-            Genre("Psychological"),
-            Genre("Romance"),
-            Genre("School Life"),
-            Genre("Sci-fi"),
-            Genre("Seinen"),
-            Genre("Shoujo"),
-            Genre("Shoujo Ai"),
-            Genre("Shounen"),
-            Genre("Shounen Ai"),
-            Genre("Slice of Life"),
-            Genre("Sports"),
-            Genre("Supernatural"),
-            Genre("Tragedy"),
-            Genre("Yaoi"),
-            Genre("Yuri")
-    )
-
-}

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

@@ -1,249 +0,0 @@
-package eu.kanade.tachiyomi.source.online.english
-
-import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.source.model.*
-import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.FormBody
-import okhttp3.Headers
-import okhttp3.HttpUrl
-import okhttp3.Request
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import java.text.SimpleDateFormat
-import java.util.regex.Pattern
-
-class Mangasee : ParsedHttpSource() {
-
-    override val id: Long = 9
-
-    override val name = "Mangasee"
-
-    override val baseUrl = "http://mangaseeonline.us"
-
-    override val lang = "en"
-
-    override val supportsLatest = true
-
-    private val recentUpdatesPattern = Pattern.compile("(.*?)\\s(\\d+\\.?\\d*)\\s?(Completed)?")
-
-    private val indexPattern = Pattern.compile("-index-(.*?)-")
-
-    private val catalogHeaders = Headers.Builder().apply {
-        add("User-Agent", "Mozilla/5.0 (Windows NT 6.3; WOW64)")
-        add("Host", "mangaseeonline.us")
-    }.build()
-
-    override fun popularMangaSelector() = "div.requested > div.row"
-
-    override fun popularMangaRequest(page: Int): Request {
-        val (body, requestUrl) = convertQueryToPost(page, "$baseUrl/search/request.php?sortBy=popularity&sortOrder=descending")
-        return POST(requestUrl, catalogHeaders, body.build())
-    }
-
-    override fun popularMangaFromElement(element: Element): SManga {
-        val manga = SManga.create()
-        element.select("a.resultLink").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.text()
-        }
-        return manga
-    }
-
-    override fun popularMangaNextPageSelector() = "button.requestMore"
-
-    override fun searchMangaSelector() = "div.requested > div.row"
-
-    override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/search/request.php")!!.newBuilder()
-        if (!query.isEmpty()) url.addQueryParameter("keyword", query)
-        val genres = mutableListOf<String>()
-        val genresNo = mutableListOf<String>()
-        for (filter in if (filters.isEmpty()) getFilterList() else filters) {
-            when (filter) {
-                is Sort -> {
-                    if (filter.state?.index != 0)
-                        url.addQueryParameter("sortBy", if (filter.state?.index == 1) "dateUpdated" else "popularity")
-                    if (filter.state?.ascending != true)
-                        url.addQueryParameter("sortOrder", "descending")
-                }
-                is SelectField -> if (filter.state != 0) url.addQueryParameter(filter.key, filter.values[filter.state])
-                is TextField -> if (!filter.state.isEmpty()) url.addQueryParameter(filter.key, filter.state)
-                is GenreList -> filter.state.forEach { genre ->
-                    when (genre.state) {
-                        Filter.TriState.STATE_INCLUDE -> genres.add(genre.name)
-                        Filter.TriState.STATE_EXCLUDE -> genresNo.add(genre.name)
-                    }
-                }
-            }
-        }
-        if (genres.isNotEmpty()) url.addQueryParameter("genre", genres.joinToString(","))
-        if (genresNo.isNotEmpty()) url.addQueryParameter("genreNo", genresNo.joinToString(","))
-
-        val (body, requestUrl) = convertQueryToPost(page, url.toString())
-        return POST(requestUrl, catalogHeaders, body.build())
-    }
-
-    private fun convertQueryToPost(page: Int, url: String): Pair<FormBody.Builder, String> {
-        val url = HttpUrl.parse(url)!!
-        val body = FormBody.Builder().add("page", page.toString())
-        for (i in 0..url.querySize() - 1) {
-            body.add(url.queryParameterName(i), url.queryParameterValue(i))
-        }
-        val requestUrl = url.scheme() + "://" + url.host() + url.encodedPath()
-        return Pair(body, requestUrl)
-    }
-
-    override fun searchMangaFromElement(element: Element): SManga {
-        val manga = SManga.create()
-        element.select("a.resultLink").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.text()
-        }
-        return manga
-    }
-
-    override fun searchMangaNextPageSelector() = "button.requestMore"
-
-    override fun mangaDetailsParse(document: Document): SManga {
-        val detailElement = document.select("div.well > div.row").first()
-
-        val manga = SManga.create()
-        manga.author = detailElement.select("a[href^=/search/?author=]").first()?.text()
-        manga.genre = detailElement.select("span.details > div.row > div:has(b:contains(Genre(s))) > a").map { it.text() }.joinToString()
-        manga.description = detailElement.select("strong:contains(Description:) + div").first()?.text()
-        manga.status = detailElement.select("a[href^=/search/?status=]").first()?.text().orEmpty().let { parseStatus(it) }
-        manga.thumbnail_url = detailElement.select("div > img").first()?.absUrl("src")
-        return manga
-    }
-
-    private fun parseStatus(status: String) = when {
-        status.contains("Ongoing (Scan)") -> SManga.ONGOING
-        status.contains("Complete (Scan)") -> SManga.COMPLETED
-        else -> SManga.UNKNOWN
-    }
-
-    override fun chapterListSelector() = "div.chapter-list > a"
-
-    override fun chapterFromElement(element: Element): SChapter {
-        val urlElement = element.select("a").first()
-
-        val chapter = SChapter.create()
-        chapter.setUrlWithoutDomain(urlElement.attr("href"))
-        chapter.name = element.select("span.chapterLabel").first().text()?.let { it } ?: ""
-        chapter.date_upload = element.select("time").first()?.attr("datetime")?.let { parseChapterDate(it) } ?: 0
-        return chapter
-    }
-
-    private fun parseChapterDate(dateAsString: String): Long {
-        return SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").parse(dateAsString).time
-    }
-
-    override fun pageListParse(document: Document): List<Page> {
-        val fullUrl = document.baseUri()
-        val url = fullUrl.substringBeforeLast('/')
-
-        val pages = mutableListOf<Page>()
-
-        val series = document.select("input.IndexName").first().attr("value")
-        val chapter = document.select("span.CurChapter").first().text()
-        var index = ""
-
-        val m = indexPattern.matcher(fullUrl)
-        if (m.find()) {
-            val indexNumber = m.group(1)
-            index = "-index-$indexNumber"
-        }
-
-        document.select("div.ContainerNav").first().select("select.PageSelect > option").forEach {
-            pages.add(Page(pages.size, "$url/$series-chapter-$chapter$index-page-${pages.size + 1}.html"))
-        }
-        pages.getOrNull(0)?.imageUrl = imageUrlParse(document)
-        return pages
-    }
-
-    override fun imageUrlParse(document: Document): String = document.select("img.CurImage").attr("src")
-
-    override fun latestUpdatesNextPageSelector() = "button.requestMore"
-
-    override fun latestUpdatesSelector(): String = "a.latestSeries"
-
-    override fun latestUpdatesRequest(page: Int): Request {
-        val url = "http://mangaseeonline.net/home/latest.request.php"
-        val (body, requestUrl) = convertQueryToPost(page, url)
-        return POST(requestUrl, catalogHeaders, body.build())
-    }
-
-    override fun latestUpdatesFromElement(element: Element): SManga {
-        val manga = SManga.create()
-        element.select("a.latestSeries").first().let {
-            val chapterUrl = it.attr("href")
-            val indexOfMangaUrl = chapterUrl.indexOf("-chapter-")
-            val indexOfLastPath = chapterUrl.lastIndexOf("/")
-            val mangaUrl = chapterUrl.substring(indexOfLastPath, indexOfMangaUrl)
-            val defaultText = it.select("p.clamp2").text()
-            val m = recentUpdatesPattern.matcher(defaultText)
-            val title = if (m.matches()) m.group(1) else defaultText
-            manga.setUrlWithoutDomain("/manga" + mangaUrl)
-            manga.title = title
-        }
-        return manga
-    }
-
-    private class Sort : Filter.Sort("Sort", arrayOf("Alphabetically", "Date updated", "Popularity"), Filter.Sort.Selection(2, false))
-    private class Genre(name: String) : Filter.TriState(name)
-    private class TextField(name: String, val key: String) : Filter.Text(name)
-    private class SelectField(name: String, val key: String, values: Array<String>, state: Int = 0) : Filter.Select<String>(name, values, state)
-    private class GenreList(genres: List<Genre>) : Filter.Group<Genre>("Genres", genres)
-
-    override fun getFilterList() = FilterList(
-            TextField("Years", "year"),
-            TextField("Author", "author"),
-            SelectField("Scan Status", "status", arrayOf("Any", "Complete", "Discontinued", "Hiatus", "Incomplete", "Ongoing")),
-            SelectField("Publish Status", "pstatus", arrayOf("Any", "Cancelled", "Complete", "Discontinued", "Hiatus", "Incomplete", "Ongoing", "Unfinished")),
-            SelectField("Type", "type", arrayOf("Any", "Doujinshi", "Manga", "Manhua", "Manhwa", "OEL", "One-shot")),
-            Sort(),
-            GenreList(getGenreList())
-    )
-
-    // [...document.querySelectorAll("label.triStateCheckBox input")].map(el => `Filter("${el.getAttribute('name')}", "${el.nextSibling.textContent.trim()}")`).join(',\n')
-    // http://mangasee.co/advanced-search/
-    private fun getGenreList() = listOf(
-            Genre("Action"),
-            Genre("Adult"),
-            Genre("Adventure"),
-            Genre("Comedy"),
-            Genre("Doujinshi"),
-            Genre("Drama"),
-            Genre("Ecchi"),
-            Genre("Fantasy"),
-            Genre("Gender Bender"),
-            Genre("Harem"),
-            Genre("Hentai"),
-            Genre("Historical"),
-            Genre("Horror"),
-            Genre("Josei"),
-            Genre("Lolicon"),
-            Genre("Martial Arts"),
-            Genre("Mature"),
-            Genre("Mecha"),
-            Genre("Mystery"),
-            Genre("Psychological"),
-            Genre("Romance"),
-            Genre("School Life"),
-            Genre("Sci-fi"),
-            Genre("Seinen"),
-            Genre("Shotacon"),
-            Genre("Shoujo"),
-            Genre("Shoujo Ai"),
-            Genre("Shounen"),
-            Genre("Shounen Ai"),
-            Genre("Slice of Life"),
-            Genre("Smut"),
-            Genre("Sports"),
-            Genre("Supernatural"),
-            Genre("Tragedy"),
-            Genre("Yaoi"),
-            Genre("Yuri")
-    )
-
-}

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

@@ -1,224 +0,0 @@
-package eu.kanade.tachiyomi.source.online.english
-
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.source.model.*
-import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import java.util.*
-
-class Readmangatoday : ParsedHttpSource() {
-
-    override val id: Long = 8
-
-    override val name = "ReadMangaToday"
-
-    override val baseUrl = "https://www.readmng.com"
-
-    override val lang = "en"
-
-    override val supportsLatest = true
-
-    override val client: OkHttpClient get() = network.cloudflareClient
-
-    /**
-     * Search only returns data with this set
-     */
-    override fun headersBuilder() = Headers.Builder().apply {
-        add("User-Agent", "Mozilla/5.0 (Windows NT 6.3; WOW64)")
-        add("X-Requested-With", "XMLHttpRequest")
-    }
-
-    override fun popularMangaRequest(page: Int): Request {
-        return GET("$baseUrl/hot-manga/$page", headers)
-    }
-
-    override fun latestUpdatesRequest(page: Int): Request {
-        return GET("$baseUrl/latest-releases/$page", headers)
-    }
-
-    override fun popularMangaSelector() = "div.hot-manga > div.style-list > div.box"
-
-    override fun latestUpdatesSelector() = "div.hot-manga > div.style-grid > div.box"
-
-    override fun popularMangaFromElement(element: Element): SManga {
-        val manga = SManga.create()
-        element.select("div.title > h2 > a").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.attr("title")
-        }
-        return manga
-    }
-
-    override fun latestUpdatesFromElement(element: Element): SManga {
-        return popularMangaFromElement(element)
-    }
-
-    override fun popularMangaNextPageSelector() = "div.hot-manga > ul.pagination > li > a:contains(»)"
-
-    override fun latestUpdatesNextPageSelector() = "div.hot-manga > ul.pagination > li > a:contains(»)"
-
-    override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val builder = okhttp3.FormBody.Builder()
-        builder.add("manga-name", query)
-        (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
-            when (filter) {
-                is TextField -> builder.add(filter.key, filter.state)
-                is Type -> builder.add("type", arrayOf("all", "japanese", "korean", "chinese")[filter.state])
-                is Status -> builder.add("status", arrayOf("both", "completed", "ongoing")[filter.state])
-                is GenreList -> filter.state.forEach { genre ->
-                    when (genre.state) {
-                        Filter.TriState.STATE_INCLUDE -> builder.add("include[]", genre.id.toString())
-                        Filter.TriState.STATE_EXCLUDE -> builder.add("exclude[]", genre.id.toString())
-                    }
-                }
-            }
-        }
-        return POST("$baseUrl/service/advanced_search", headers, builder.build())
-    }
-
-    override fun searchMangaSelector() = "div.style-list > div.box"
-
-    override fun searchMangaFromElement(element: Element): SManga {
-        val manga = SManga.create()
-        element.select("div.title > h2 > a").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.attr("title")
-        }
-        return manga
-    }
-
-    override fun searchMangaNextPageSelector() = "div.next-page > a.next"
-
-    override fun mangaDetailsParse(document: Document): SManga {
-        val detailElement = document.select("div.movie-meta").first()
-        val genreElement = detailElement.select("dl.dl-horizontal > dd:eq(5) a")
-
-        val manga = SManga.create()
-        manga.author = document.select("ul.cast-list li.director > ul a").first()?.text()
-        manga.artist = document.select("ul.cast-list li:not(.director) > ul a").first()?.text()
-        manga.description = detailElement.select("li.movie-detail").first()?.text()
-        manga.status = detailElement.select("dl.dl-horizontal > dd:eq(3)").first()?.text().orEmpty().let { parseStatus(it) }
-        manga.thumbnail_url = detailElement.select("img.img-responsive").first()?.attr("src")
-
-        var genres = mutableListOf<String>()
-        genreElement?.forEach { genres.add(it.text()) }
-        manga.genre = genres.joinToString(", ")
-
-        return manga
-    }
-
-    private fun parseStatus(status: String) = when {
-        status.contains("Ongoing") -> SManga.ONGOING
-        status.contains("Completed") -> SManga.COMPLETED
-        else -> SManga.UNKNOWN
-    }
-
-    override fun chapterListSelector() = "ul.chp_lst > li"
-
-    override fun chapterFromElement(element: Element): SChapter {
-        val urlElement = element.select("a").first()
-
-        val chapter = SChapter.create()
-        chapter.setUrlWithoutDomain(urlElement.attr("href"))
-        chapter.name = urlElement.select("span.val").text()
-        chapter.date_upload = element.select("span.dte").first()?.text()?.let { parseChapterDate(it) } ?: 0
-        return chapter
-    }
-
-    private fun parseChapterDate(date: String): Long {
-        val dateWords: List<String> = date.split(" ")
-
-        if (dateWords.size == 3) {
-            val timeAgo = Integer.parseInt(dateWords[0])
-            val date: Calendar = Calendar.getInstance()
-
-            if (dateWords[1].contains("Minute")) {
-                date.add(Calendar.MINUTE, -timeAgo)
-            } else if (dateWords[1].contains("Hour")) {
-                date.add(Calendar.HOUR_OF_DAY, -timeAgo)
-            } else if (dateWords[1].contains("Day")) {
-                date.add(Calendar.DAY_OF_YEAR, -timeAgo)
-            } else if (dateWords[1].contains("Week")) {
-                date.add(Calendar.WEEK_OF_YEAR, -timeAgo)
-            } else if (dateWords[1].contains("Month")) {
-                date.add(Calendar.MONTH, -timeAgo)
-            } else if (dateWords[1].contains("Year")) {
-                date.add(Calendar.YEAR, -timeAgo)
-            }
-
-            return date.timeInMillis
-        }
-
-        return 0L
-    }
-
-    override fun pageListParse(document: Document): List<Page> {
-        val pages = mutableListOf<Page>()
-        document.select("ul.list-switcher-2 > li > select.jump-menu").first().getElementsByTag("option").forEach {
-            pages.add(Page(pages.size, it.attr("value")))
-        }
-        pages.getOrNull(0)?.imageUrl = imageUrlParse(document)
-        return pages
-    }
-
-    override fun imageUrlParse(document: Document) = document.select("#chapter_img").first().attr("src")
-
-    private class Status : Filter.TriState("Completed")
-    private class Genre(name: String, val id: Int) : Filter.TriState(name)
-    private class TextField(name: String, val key: String) : Filter.Text(name)
-    private class Type : Filter.Select<String>("Type", arrayOf("All", "Japanese Manga", "Korean Manhwa", "Chinese Manhua"))
-    private class GenreList(genres: List<Genre>) : Filter.Group<Genre>("Genres", genres)
-
-    override fun getFilterList() = FilterList(
-            TextField("Author", "author-name"),
-            TextField("Artist", "artist-name"),
-            Type(),
-            Status(),
-            GenreList(getGenreList())
-    )
-
-    // [...document.querySelectorAll("ul.manga-cat span")].map(el => `Genre("${el.nextSibling.textContent.trim()}", ${el.getAttribute('data-id')})`).join(',\n')
-    // http://www.readmanga.today/advanced-search
-    private fun getGenreList() = listOf(
-            Genre("Action", 2),
-            Genre("Adventure", 4),
-            Genre("Comedy", 5),
-            Genre("Doujinshi", 6),
-            Genre("Drama", 7),
-            Genre("Ecchi", 8),
-            Genre("Fantasy", 9),
-            Genre("Gender Bender", 10),
-            Genre("Harem", 11),
-            Genre("Historical", 12),
-            Genre("Horror", 13),
-            Genre("Josei", 14),
-            Genre("Lolicon", 15),
-            Genre("Martial Arts", 16),
-            Genre("Mature", 17),
-            Genre("Mecha", 18),
-            Genre("Mystery", 19),
-            Genre("One shot", 20),
-            Genre("Psychological", 21),
-            Genre("Romance", 22),
-            Genre("School Life", 23),
-            Genre("Sci-fi", 24),
-            Genre("Seinen", 25),
-            Genre("Shotacon", 26),
-            Genre("Shoujo", 27),
-            Genre("Shoujo Ai", 28),
-            Genre("Shounen", 29),
-            Genre("Shounen Ai", 30),
-            Genre("Slice of Life", 31),
-            Genre("Smut", 32),
-            Genre("Sports", 33),
-            Genre("Supernatural", 34),
-            Genre("Tragedy", 35),
-            Genre("Yaoi", 36),
-            Genre("Yuri", 37)
-    )
-}

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

@@ -1,122 +0,0 @@
-package eu.kanade.tachiyomi.source.online.german
-
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.source.model.FilterList
-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.ParsedHttpSource
-import okhttp3.Request
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import java.text.SimpleDateFormat
-
-class WieManga : ParsedHttpSource() {
-
-    override val id: Long = 10
-
-    override val name = "Wie Manga!"
-
-    override val baseUrl = "http://www.wiemanga.com"
-
-    override val lang = "de"
-
-    override val supportsLatest = true
-
-    override fun popularMangaSelector() = ".booklist td > div"
-
-    override fun latestUpdatesSelector() = ".booklist td > div"
-
-    override fun popularMangaRequest(page: Int): Request {
-        return GET("$baseUrl/list/Hot-Book/", headers)
-    }
-
-    override fun latestUpdatesRequest(page: Int): Request {
-        return GET("$baseUrl/list/New-Update/", headers)
-    }
-
-    override fun popularMangaFromElement(element: Element): SManga {
-        val image = element.select("dt img")
-        val title = element.select("dd a:first-child")
-
-        val manga = SManga.create()
-        manga.setUrlWithoutDomain(title.attr("href"))
-        manga.title = title.text()
-        manga.thumbnail_url = image.attr("src")
-        return manga
-    }
-
-    override fun latestUpdatesFromElement(element: Element): SManga {
-        return popularMangaFromElement(element)
-    }
-
-    override fun popularMangaNextPageSelector() = null
-
-    override fun latestUpdatesNextPageSelector() = null
-
-    override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        return GET("$baseUrl/search/?wd=$query", headers)
-    }
-
-    override fun searchMangaSelector() = ".searchresult td > div"
-
-    override fun searchMangaFromElement(element: Element): SManga {
-        val image = element.select(".resultimg img")
-        val title = element.select(".resultbookname")
-
-        val manga = SManga.create()
-        manga.setUrlWithoutDomain(title.attr("href"))
-        manga.title = title.text()
-        manga.thumbnail_url = image.attr("src")
-        return manga
-    }
-
-    override fun searchMangaNextPageSelector() = ".pagetor a.l"
-
-    override fun mangaDetailsParse(document: Document): SManga {
-        val imageElement = document.select(".bookmessgae tr > td:nth-child(1)").first()
-        val infoElement = document.select(".bookmessgae tr > td:nth-child(2)").first()
-
-        val manga = SManga.create()
-        manga.author = infoElement.select("dd:nth-of-type(2) a").first()?.text()
-        manga.artist = infoElement.select("dd:nth-of-type(3) a").first()?.text()
-        manga.description = infoElement.select("dl > dt:last-child").first()?.text()?.replaceFirst("Beschreibung", "")
-        manga.thumbnail_url = imageElement.select("img").first()?.attr("src")
-
-        if (manga.author == "RSS")
-            manga.author = null
-
-        if (manga.artist == "RSS")
-            manga.artist = null
-        return manga
-    }
-
-    override fun chapterListSelector() = ".chapterlist tr:not(:first-child)"
-
-    override fun chapterFromElement(element: Element): SChapter {
-        val urlElement = element.select(".col1 a").first()
-        val dateElement = element.select(".col3 a").first()
-
-        val chapter = SChapter.create()
-        chapter.setUrlWithoutDomain(urlElement.attr("href"))
-        chapter.name = urlElement.text()
-        chapter.date_upload = dateElement?.text()?.let { parseChapterDate(it) } ?: 0
-        return chapter
-    }
-
-    private fun parseChapterDate(date: String): Long {
-        return SimpleDateFormat("yyyy-MM-dd hh:mm:ss").parse(date).time
-    }
-
-    override fun pageListParse(document: Document): List<Page> {
-        val pages = mutableListOf<Page>()
-
-        document.select("select#page").first().select("option").forEach {
-            pages.add(Page(pages.size, it.attr("value")))
-        }
-        return pages
-    }
-
-    override fun imageUrlParse(document: Document) = document.select("img#comicpic").first().attr("src")
-
-}

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

@@ -1,290 +0,0 @@
-package eu.kanade.tachiyomi.source.online.russian
-
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.source.model.*
-import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.Request
-import okhttp3.Response
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import java.text.SimpleDateFormat
-import java.util.*
-
-class Mangachan : ParsedHttpSource() {
-
-    override val id: Long = 7
-
-    override val name = "Mangachan"
-
-    override val baseUrl = "http://mangachan.me"
-
-    override val lang = "ru"
-
-    override val supportsLatest = true
-
-    override fun popularMangaRequest(page: Int): Request =
-            GET("$baseUrl/mostfavorites?offset=${20 * (page - 1)}", headers)
-
-    override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        var pageNum = 1
-        when {
-            page <  1 -> pageNum = 1
-            page >= 1 -> pageNum = page
-        }
-        val url = if (query.isNotEmpty()) {
-            "$baseUrl/?do=search&subaction=search&story=$query&search_start=$pageNum"
-        } else {
-
-            var genres = ""
-            var order = ""
-            var statusParam = true
-            var status = ""
-            for (filter in if (filters.isEmpty()) getFilterList() else filters) {
-                when (filter) {
-                    is GenreList -> {
-                        filter.state.forEach { f ->
-                            if (!f.isIgnored()) {
-                                genres += (if (f.isExcluded()) "-" else "") + f.id + '+'
-                            }
-                        }
-                    }
-                    is OrderBy -> {
-                        if (filter.state!!.ascending && filter.state!!.index == 0) {
-                            statusParam = false
-                        }
-                    }
-                    is Status -> status = arrayOf("", "all_done", "end", "ongoing", "new_ch")[filter.state]
-                }
-            }
-
-            if (genres.isNotEmpty()) {
-                for (filter in filters) {
-                    when (filter) {
-                        is OrderBy -> {
-                            order = if (filter.state!!.ascending) {
-                                arrayOf("", "&n=favasc", "&n=abcdesc", "&n=chasc")[filter.state!!.index]
-                            } else {
-                                arrayOf("&n=dateasc", "&n=favdesc", "&n=abcasc", "&n=chdesc")[filter.state!!.index]
-                            }
-                        }
-                    }
-                }
-                if (statusParam) {
-                    "$baseUrl/tags/${genres.dropLast(1)}$order?offset=${20 * (pageNum - 1)}&status=$status"
-                } else {
-                    "$baseUrl/tags/$status/${genres.dropLast(1)}/$order?offset=${20 * (pageNum - 1)}"
-                }
-            } else {
-                for (filter in filters) {
-                    when (filter) {
-                        is OrderBy -> {
-                            order = if (filter.state!!.ascending) {
-                                arrayOf("manga/new", "manga/new&n=favasc", "manga/new&n=abcdesc", "manga/new&n=chasc")[filter.state!!.index]
-                            } else {
-                                arrayOf("manga/new&n=dateasc", "mostfavorites", "catalog", "sortch")[filter.state!!.index]
-                            }
-                        }
-                    }
-                }
-                if (statusParam) {
-                    "$baseUrl/$order?offset=${20 * (pageNum - 1)}&status=$status"
-                } else {
-                    "$baseUrl/$order/$status?offset=${20 * (pageNum - 1)}"
-                }
-            }
-        }
-        return GET(url, headers)
-    }
-
-    override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/newestch?page=$page")
-
-    override fun popularMangaSelector() = "div.content_row"
-
-    override fun latestUpdatesSelector() = "ul.area_rightNews li"
-
-    override fun searchMangaSelector() = popularMangaSelector()
-
-    override fun popularMangaFromElement(element: Element): SManga {
-        val manga = SManga.create()
-        manga.thumbnail_url = element.select("div.manga_images img").first().attr("src")
-        element.select("h2 > a").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.text()
-        }
-        return manga
-    }
-
-    override fun latestUpdatesFromElement(element: Element): SManga {
-        val manga = SManga.create()
-        element.select("a:nth-child(1)").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.text()
-        }
-        return manga
-    }
-
-    override fun searchMangaFromElement(element: Element): SManga = popularMangaFromElement(element)
-
-    override fun popularMangaNextPageSelector() = "a:contains(Вперед)"
-
-    override fun latestUpdatesNextPageSelector() = popularMangaNextPageSelector()
-
-    override fun searchMangaNextPageSelector() = "a:contains(Далее)"
-
-    private fun searchGenresNextPageSelector() = popularMangaNextPageSelector()
-
-    override fun searchMangaParse(response: Response): MangasPage {
-        val document = response.asJsoup()
-        var hasNextPage = false
-
-        val mangas = document.select(searchMangaSelector()).map { element ->
-            searchMangaFromElement(element)
-        }
-
-        val nextSearchPage = document.select(searchMangaNextPageSelector())
-        if (nextSearchPage.isNotEmpty()) {
-            val query = document.select("input#searchinput").first().attr("value")
-            val pageNum = nextSearchPage.let { selector ->
-                val onClick = selector.attr("onclick")
-                onClick?.split("""\\d+""")
-            }
-            nextSearchPage.attr("href", "$baseUrl/?do=search&subaction=search&story=$query&search_start=$pageNum")
-            hasNextPage = true
-        }
-
-        val nextGenresPage = document.select(searchGenresNextPageSelector())
-        if (nextGenresPage.isNotEmpty()) {
-            hasNextPage = true
-        }
-
-        return MangasPage(mangas, hasNextPage)
-    }
-
-    override fun mangaDetailsParse(document: Document): SManga {
-        val infoElement = document.select("table.mangatitle").first()
-        val descElement = document.select("div#description").first()
-        val imgElement = document.select("img#cover").first()
-
-        val manga = SManga.create()
-        manga.author = infoElement.select("tr:eq(2) > td:eq(1)").text()
-        manga.genre = infoElement.select("tr:eq(5) > td:eq(1)").text()
-        manga.status = parseStatus(infoElement.select("tr:eq(4) > td:eq(1)").text())
-        manga.description = descElement.textNodes().first().text()
-        manga.thumbnail_url = imgElement.attr("src")
-        return manga
-    }
-
-    private fun parseStatus(element: String): Int = when {
-        element.contains("перевод завершен") -> SManga.COMPLETED
-        element.contains("перевод продолжается") -> SManga.ONGOING
-        else -> SManga.UNKNOWN
-    }
-
-    override fun chapterListSelector() = "table.table_cha tr:gt(1)"
-
-    override fun chapterFromElement(element: Element): SChapter {
-        val urlElement = element.select("a").first()
-
-        val chapter = SChapter.create()
-        chapter.setUrlWithoutDomain(urlElement.attr("href"))
-        chapter.name = urlElement.text()
-        chapter.date_upload = element.select("div.date").first()?.text()?.let {
-            SimpleDateFormat("yyyy-MM-dd", Locale.US).parse(it).time
-        } ?: 0
-        return chapter
-    }
-
-    override fun pageListParse(response: Response): List<Page> {
-        val html = response.body()!!.string()
-        val beginIndex = html.indexOf("fullimg\":[") + 10
-        val endIndex = html.indexOf(",]", beginIndex)
-        val trimmedHtml = html.substring(beginIndex, endIndex).replace("\"", "")
-        val pageUrls = trimmedHtml.split(',')
-
-        return pageUrls.mapIndexed { i, url -> Page(i, "", url) }
-    }
-
-    override fun pageListParse(document: Document): List<Page> {
-        throw Exception("Not used")
-    }
-
-    override fun imageUrlParse(document: Document) = ""
-
-    private class GenreList(genres: List<Genre>) : Filter.Group<Genre>("Тэги", genres)
-    private class Genre(name: String, val id: String = name.replace(' ', '_')) : Filter.TriState(name)
-    private class Status : Filter.Select<String>("Статус", arrayOf("Все", "Перевод завершен", "Выпуск завершен", "Онгоинг", "Новые главы"))
-    private class OrderBy : Filter.Sort("Сортировка",
-            arrayOf("Дата", "Популярность", "Имя", "Главы"),
-            Filter.Sort.Selection(1, false))
-
-
-    override fun getFilterList() = FilterList(
-            Status(),
-            OrderBy(),
-            GenreList(getGenreList())
-    )
-
-
-    /* [...document.querySelectorAll("li.sidetag > a:nth-child(1)")]
-    *  .map(el => `Genre("${el.getAttribute('href').substr(6)}")`).join(',\n')
-    *  on http://mangachan.me/
-    */
-    private fun getGenreList() = listOf(
-            Genre("18_плюс"),
-            Genre("bdsm"),
-            Genre("арт"),
-            Genre("боевик"),
-            Genre("боевые_искусства"),
-            Genre("вампиры"),
-            Genre("веб"),
-            Genre("гарем"),
-            Genre("гендерная_интрига"),
-            Genre("героическое_фэнтези"),
-            Genre("детектив"),
-            Genre("дзёсэй"),
-            Genre("додзинси"),
-            Genre("драма"),
-            Genre("игра"),
-            Genre("инцест"),
-            Genre("искусство"),
-            Genre("история"),
-            Genre("киберпанк"),
-            Genre("кодомо"),
-            Genre("комедия"),
-            Genre("литРПГ"),
-            Genre("махо-сёдзё"),
-            Genre("меха"),
-            Genre("мистика"),
-            Genre("музыка"),
-            Genre("научная_фантастика"),
-            Genre("повседневность"),
-            Genre("постапокалиптика"),
-            Genre("приключения"),
-            Genre("психология"),
-            Genre("романтика"),
-            Genre("самурайский_боевик"),
-            Genre("сборник"),
-            Genre("сверхъестественное"),
-            Genre("сказка"),
-            Genre("спорт"),
-            Genre("супергерои"),
-            Genre("сэйнэн"),
-            Genre("сёдзё"),
-            Genre("сёдзё-ай"),
-            Genre("сёнэн"),
-            Genre("сёнэн-ай"),
-            Genre("тентакли"),
-            Genre("трагедия"),
-            Genre("триллер"),
-            Genre("ужасы"),
-            Genre("фантастика"),
-            Genre("фурри"),
-            Genre("фэнтези"),
-            Genre("школа"),
-            Genre("эротика"),
-            Genre("юри"),
-            Genre("яой"),
-            Genre("ёнкома")
-    )
-}

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

@@ -1,251 +0,0 @@
-package eu.kanade.tachiyomi.source.online.russian
-
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.source.model.*
-import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.Headers
-import okhttp3.HttpUrl
-import okhttp3.Request
-import okhttp3.Response
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import java.text.SimpleDateFormat
-import java.util.*
-import java.util.regex.Pattern
-
-class Mintmanga : ParsedHttpSource() {
-
-    override val id: Long = 6
-
-    override val name = "Mintmanga"
-
-    override val baseUrl = "http://mintmanga.com"
-
-    override val lang = "ru"
-
-    override val supportsLatest = true
-
-    override fun popularMangaRequest(page: Int): Request =
-            GET("$baseUrl/list?sortType=rate&offset=${70 * (page - 1)}&max=70", headers)
-
-    override fun latestUpdatesRequest(page: Int): Request =
-            GET("$baseUrl/list?sortType=updated&offset=${70 * (page - 1)}&max=70", headers)
-
-    override fun popularMangaSelector() = "div.tile"
-
-    override fun latestUpdatesSelector() = "div.tile"
-
-    override fun popularMangaFromElement(element: Element): SManga {
-        val manga = SManga.create()
-        manga.thumbnail_url = element.select("img.lazy").first()?.attr("data-original")
-        element.select("h3 > a").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.attr("title")
-        }
-        return manga
-    }
-
-    override fun latestUpdatesFromElement(element: Element): SManga =
-            popularMangaFromElement(element)
-
-    override fun popularMangaNextPageSelector() = "a.nextLink"
-
-    override fun latestUpdatesNextPageSelector() = "a.nextLink"
-
-    override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/search/advanced")!!.newBuilder()
-        (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
-            when (filter) {
-                is GenreList -> filter.state.forEach { genre ->
-                    if (genre.state != Filter.TriState.STATE_IGNORE) {
-                        url.addQueryParameter(genre.id, arrayOf("=", "=in", "=ex")[genre.state])
-                    }
-                }
-                is Category -> filter.state.forEach { category ->
-                    if (category.state != Filter.TriState.STATE_IGNORE) {
-                        url.addQueryParameter(category.id, arrayOf("=", "=in", "=ex")[category.state])
-                    }
-                }
-            }
-        }
-        if (!query.isEmpty()) {
-            url.addQueryParameter("q", query)
-        }
-        return GET(url.toString().replace("=%3D", "="), headers)
-    }
-
-    override fun searchMangaSelector() = popularMangaSelector()
-
-    override fun searchMangaFromElement(element: Element): SManga = popularMangaFromElement(element)
-
-    // max 200 results
-    override fun searchMangaNextPageSelector(): Nothing? = null
-
-    override fun mangaDetailsParse(document: Document): SManga {
-        val infoElement = document.select("div.leftContent").first()
-
-        val manga = SManga.create()
-        manga.author = infoElement.select("span.elem_author").first()?.text()
-        manga.genre = infoElement.select("span.elem_genre").text().replace(" ,", ",")
-        manga.description = infoElement.select("div.manga-description").text()
-        manga.status = parseStatus(infoElement.html())
-        manga.thumbnail_url = infoElement.select("img").attr("data-full")
-        return manga
-    }
-
-    private fun parseStatus(element: String): Int = when {
-        element.contains("<h3>Запрещена публикация произведения по копирайту</h3>") -> SManga.LICENSED
-        element.contains("<h1 class=\"names\"> Сингл") || element.contains("<b>Перевод:</b> завершен") -> SManga.COMPLETED
-        element.contains("<b>Перевод:</b> продолжается") -> SManga.ONGOING
-        else -> SManga.UNKNOWN
-    }
-
-    override fun chapterListSelector() = "div.chapters-link tbody tr"
-
-    override fun chapterFromElement(element: Element): SChapter {
-        val urlElement = element.select("a").first()
-        val urlText = urlElement.text()
-
-        val chapter = SChapter.create()
-        chapter.setUrlWithoutDomain(urlElement.attr("href") + "?mtr=1")
-        if (urlText.endsWith(" новое")) {
-            chapter.name = urlText.dropLast(6)
-        } else {
-            chapter.name = urlText
-        }
-        chapter.date_upload = element.select("td.hidden-xxs").last()?.text()?.let {
-            SimpleDateFormat("dd/MM/yy", Locale.US).parse(it).time
-        } ?: 0
-        return chapter
-    }
-
-    override fun prepareNewChapter(chapter: SChapter, manga: SManga) {
-        val basic = Regex("""\s*([0-9]+)(\s-\s)([0-9]+)\s*""")
-        val extra = Regex("""\s*([0-9]+\sЭкстра)\s*""")
-        val single = Regex("""\s*Сингл\s*""")
-        when {
-            basic.containsMatchIn(chapter.name) -> {
-                basic.find(chapter.name)?.let {
-                    val number = it.groups[3]?.value!!
-                    chapter.chapter_number = number.toFloat()
-                }
-            }
-            extra.containsMatchIn(chapter.name) -> // Extra chapters doesn't contain chapter number
-                chapter.chapter_number = -2f
-            single.containsMatchIn(chapter.name) -> // Oneshoots, doujinshi and other mangas with one chapter
-                chapter.chapter_number = 1f
-        }
-    }
-
-    override fun pageListParse(response: Response): List<Page> {
-        val html = response.body()!!.string()
-        val beginIndex = html.indexOf("rm_h.init( [")
-        val endIndex = html.indexOf("], 0, false);", beginIndex)
-        val trimmedHtml = html.substring(beginIndex, endIndex)
-
-        val p = Pattern.compile("'.*?','.*?',\".*?\"")
-        val m = p.matcher(trimmedHtml)
-
-        val pages = mutableListOf<Page>()
-
-        var i = 0
-        while (m.find()) {
-            val urlParts = m.group().replace("[\"\']+".toRegex(), "").split(',')
-            val url = if (urlParts[1].isEmpty() && urlParts[2].startsWith("/static/")) {
-                baseUrl + urlParts[2]
-            } else {
-                urlParts[1] + urlParts[0] + urlParts[2]
-            }
-            pages.add(Page(i++, "", url))
-        }
-        return pages
-    }
-
-    override fun pageListParse(document: Document): List<Page> {
-        throw Exception("Not used")
-    }
-
-    override fun imageUrlParse(document: Document) = ""
-
-    override fun imageRequest(page: Page): Request {
-        val imgHeader = Headers.Builder().apply {
-            add("User-Agent", "Mozilla/5.0 (Windows NT 6.3; WOW64)")
-            add("Referer", baseUrl)
-        }.build()
-        return GET(page.imageUrl!!, imgHeader)
-    }
-
-    private class Genre(name: String, val id: String) : Filter.TriState(name)
-    private class GenreList(genres: List<Genre>) : Filter.Group<Genre>("Genres", genres)
-    private class Category(categories: List<Genre>) : Filter.Group<Genre>("Category", categories)
-
-    /* [...document.querySelectorAll("tr.advanced_option:nth-child(1) > td:nth-child(3) span.js-link")]
-    *  .map(el => `Genre("${el.textContent.trim()}", "${el.getAttribute('onclick')
-    *  .substr(31,el.getAttribute('onclick').length-33)"})`).join(',\n')
-    *  on http://mintmanga.com/search/advanced
-    */
-    override fun getFilterList() = FilterList(
-            Category(getCategoryList()),
-            GenreList(getGenreList())
-    )
-
-    private fun getCategoryList() = listOf(
-            Genre("В цвете", "el_4614"),
-            Genre("Веб", "el_1355"),
-            Genre("Выпуск приостановлен", "el_5232"),
-            Genre("Ёнкома", "el_2741"),
-            Genre("Комикс западный", "el_1903"),
-            Genre("Комикс русский", "el_2173"),
-            Genre("Манхва", "el_1873"),
-            Genre("Маньхуа", "el_1875"),
-            Genre("Не Яой", "el_1874"),
-            Genre("Ранобэ", "el_5688"),
-            Genre("Сборник", "el_1348")
-    )
-
-    private fun getGenreList() = listOf(
-            Genre("арт", "el_2220"),
-            Genre("бара", "el_1353"),
-            Genre("боевик", "el_1346"),
-            Genre("боевые искусства", "el_1334"),
-            Genre("вампиры", "el_1339"),
-            Genre("гарем", "el_1333"),
-            Genre("гендерная интрига", "el_1347"),
-            Genre("героическое фэнтези", "el_1337"),
-            Genre("детектив", "el_1343"),
-            Genre("дзёсэй", "el_1349"),
-            Genre("додзинси", "el_1332"),
-            Genre("драма", "el_1310"),
-            Genre("игра", "el_5229"),
-            Genre("история", "el_1311"),
-            Genre("киберпанк", "el_1351"),
-            Genre("комедия", "el_1328"),
-            Genre("меха", "el_1318"),
-            Genre("мистика", "el_1324"),
-            Genre("научная фантастика", "el_1325"),
-            Genre("омегаверс", "el_5676"),
-            Genre("повседневность", "el_1327"),
-            Genre("постапокалиптика", "el_1342"),
-            Genre("приключения", "el_1322"),
-            Genre("психология", "el_1335"),
-            Genre("романтика", "el_1313"),
-            Genre("самурайский боевик", "el_1316"),
-            Genre("сверхъестественное", "el_1350"),
-            Genre("сёдзё", "el_1314"),
-            Genre("сёдзё-ай", "el_1320"),
-            Genre("сёнэн", "el_1326"),
-            Genre("сёнэн-ай", "el_1330"),
-            Genre("спорт", "el_1321"),
-            Genre("сэйнэн", "el_1329"),
-            Genre("трагедия", "el_1344"),
-            Genre("триллер", "el_1341"),
-            Genre("ужасы", "el_1317"),
-            Genre("фантастика", "el_1331"),
-            Genre("фэнтези", "el_1323"),
-            Genre("школа", "el_1319"),
-            Genre("эротика", "el_1340"),
-            Genre("этти", "el_1354"),
-            Genre("юри", "el_1315"),
-            Genre("яой", "el_1336")
-    )
-}

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

@@ -1,247 +0,0 @@
-package eu.kanade.tachiyomi.source.online.russian
-
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.source.model.*
-import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.Headers
-import okhttp3.HttpUrl
-import okhttp3.Request
-import okhttp3.Response
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import java.text.SimpleDateFormat
-import java.util.*
-import java.util.regex.Pattern
-
-class Readmanga : ParsedHttpSource() {
-
-    override val id: Long = 5
-
-    override val name = "Readmanga"
-
-    override val baseUrl = "http://readmanga.me"
-
-    override val lang = "ru"
-
-    override val supportsLatest = true
-
-    override fun popularMangaSelector() = "div.tile"
-
-    override fun latestUpdatesSelector() = "div.tile"
-
-    override fun popularMangaRequest(page: Int): Request =
-            GET("$baseUrl/list?sortType=rate&offset=${70 * (page - 1)}&max=70", headers)
-
-    override fun latestUpdatesRequest(page: Int): Request =
-            GET("$baseUrl/list?sortType=updated&offset=${70 * (page - 1)}&max=70", headers)
-
-    override fun popularMangaFromElement(element: Element): SManga {
-        val manga = SManga.create()
-        manga.thumbnail_url = element.select("img.lazy").first()?.attr("data-original")
-        element.select("h3 > a").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.attr("title")
-        }
-        return manga
-    }
-
-    override fun latestUpdatesFromElement(element: Element): SManga =
-            popularMangaFromElement(element)
-
-    override fun popularMangaNextPageSelector() = "a.nextLink"
-
-    override fun latestUpdatesNextPageSelector() = "a.nextLink"
-
-    override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/search/advanced")!!.newBuilder()
-        (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
-            when (filter) {
-                is GenreList -> filter.state.forEach { genre ->
-                    if (genre.state != Filter.TriState.STATE_IGNORE) {
-                        url.addQueryParameter(genre.id, arrayOf("=", "=in", "=ex")[genre.state])
-                    }
-                }
-                is Category -> filter.state.forEach { category ->
-                    if (category.state != Filter.TriState.STATE_IGNORE) {
-                        url.addQueryParameter(category.id, arrayOf("=", "=in", "=ex")[category.state])
-                    }
-                }
-            }
-        }
-        if (!query.isEmpty()) {
-            url.addQueryParameter("q", query)
-        }
-        return GET(url.toString().replace("=%3D", "="), headers)
-    }
-
-    override fun searchMangaSelector() = popularMangaSelector()
-
-    override fun searchMangaFromElement(element: Element): SManga = popularMangaFromElement(element)
-
-    // max 200 results
-    override fun searchMangaNextPageSelector(): Nothing? = null
-
-    override fun mangaDetailsParse(document: Document): SManga {
-        val infoElement = document.select("div.leftContent").first()
-
-        val manga = SManga.create()
-        manga.author = infoElement.select("span.elem_author").first()?.text()
-        manga.genre = infoElement.select("span.elem_genre").text().replace(" ,", ",")
-        manga.description = infoElement.select("div.manga-description").text()
-        manga.status = parseStatus(infoElement.html())
-        manga.thumbnail_url = infoElement.select("img").attr("data-full")
-        return manga
-    }
-
-    private fun parseStatus(element: String): Int = when {
-        element.contains("<h3>Запрещена публикация произведения по копирайту</h3>") -> SManga.LICENSED
-        element.contains("<h1 class=\"names\"> Сингл") || element.contains("<b>Перевод:</b> завершен") -> SManga.COMPLETED
-        element.contains("<b>Перевод:</b> продолжается") -> SManga.ONGOING
-        else -> SManga.UNKNOWN
-    }
-
-    override fun chapterListSelector() = "div.chapters-link tbody tr"
-
-    override fun chapterFromElement(element: Element): SChapter {
-        val urlElement = element.select("a").first()
-        val urlText = urlElement.text()
-
-        val chapter = SChapter.create()
-        chapter.setUrlWithoutDomain(urlElement.attr("href") + "?mtr=1")
-        if (urlText.endsWith(" новое")) {
-            chapter.name = urlText.dropLast(6)
-        } else {
-            chapter.name = urlText
-        }
-        chapter.date_upload = element.select("td.hidden-xxs").last()?.text()?.let {
-            SimpleDateFormat("dd/MM/yy", Locale.US).parse(it).time
-        } ?: 0
-        return chapter
-    }
-
-    override fun prepareNewChapter(chapter: SChapter, manga: SManga) {
-        val basic = Regex("""\s*([0-9]+)(\s-\s)([0-9]+)\s*""")
-        val extra = Regex("""\s*([0-9]+\sЭкстра)\s*""")
-        val single = Regex("""\s*Сингл\s*""")
-        when {
-            basic.containsMatchIn(chapter.name) -> {
-                basic.find(chapter.name)?.let {
-                    val number = it.groups[3]?.value!!
-                    chapter.chapter_number = number.toFloat()
-                }
-            }
-            extra.containsMatchIn(chapter.name) -> // Extra chapters doesn't contain chapter number
-                chapter.chapter_number = -2f
-            single.containsMatchIn(chapter.name) -> // Oneshoots, doujinshi and other mangas with one chapter
-                chapter.chapter_number = 1f
-        }
-    }
-
-    override fun pageListParse(response: Response): List<Page> {
-        val html = response.body()!!.string()
-        val beginIndex = html.indexOf("rm_h.init( [")
-        val endIndex = html.indexOf("], 0, false);", beginIndex)
-        val trimmedHtml = html.substring(beginIndex, endIndex)
-
-        val p = Pattern.compile("'.*?','.*?',\".*?\"")
-        val m = p.matcher(trimmedHtml)
-
-        val pages = mutableListOf<Page>()
-
-        var i = 0
-        while (m.find()) {
-            val urlParts = m.group().replace("[\"\']+".toRegex(), "").split(',')
-            val url = if (urlParts[1].isEmpty() && urlParts[2].startsWith("/static/")) {
-                baseUrl + urlParts[2]
-            } else {
-                urlParts[1] + urlParts[0] + urlParts[2]
-            }
-            pages.add(Page(i++, "", url))
-        }
-        return pages
-    }
-
-    override fun pageListParse(document: Document): List<Page> {
-        throw Exception("Not used")
-    }
-
-    override fun imageUrlParse(document: Document) = ""
-
-    override fun imageRequest(page: Page): Request {
-        val imgHeader = Headers.Builder().apply {
-            add("User-Agent", "Mozilla/5.0 (Windows NT 6.3; WOW64)")
-            add("Referer", baseUrl)
-        }.build()
-        return GET(page.imageUrl!!, imgHeader)
-    }
-
-    private class Genre(name: String, val id: String) : Filter.TriState(name)
-    private class GenreList(genres: List<Genre>) : Filter.Group<Genre>("Genres", genres)
-    private class Category(categories: List<Genre>) : Filter.Group<Genre>("Category", categories)
-
-    /* [...document.querySelectorAll("tr.advanced_option:nth-child(1) > td:nth-child(3) span.js-link")]
-    *  .map(el => `Genre("${el.textContent.trim()}", $"{el.getAttribute('onclick')
-    *  .substr(31,el.getAttribute('onclick').length-33)"})`).join(',\n')
-    *  on http://readmanga.me/search/advanced
-    */
-    override fun getFilterList() = FilterList(
-            Category(getCategoryList()),
-            GenreList(getGenreList())
-    )
-
-    private fun getCategoryList() = listOf(
-            Genre("В цвете", "el_7290"),
-            Genre("Веб", "el_2160"),
-            Genre("Выпуск приостановлен", "el_8033"),
-            Genre("Ёнкома", "el_2161"),
-            Genre("Комикс западный", "el_3515"),
-            Genre("Манхва", "el_3001"),
-            Genre("Маньхуа", "el_3002"),
-            Genre("Ранобэ", "el_8575"),
-            Genre("Сборник", "el_2157")
-    )
-
-    private fun getGenreList() = listOf(
-            Genre("арт", "el_5685"),
-            Genre("боевик", "el_2155"),
-            Genre("боевые искусства", "el_2143"),
-            Genre("вампиры", "el_2148"),
-            Genre("гарем", "el_2142"),
-            Genre("гендерная интрига", "el_2156"),
-            Genre("героическое фэнтези", "el_2146"),
-            Genre("детектив", "el_2152"),
-            Genre("дзёсэй", "el_2158"),
-            Genre("додзинси", "el_2141"),
-            Genre("драма", "el_2118"),
-            Genre("игра", "el_2154"),
-            Genre("история", "el_2119"),
-            Genre("киберпанк", "el_8032"),
-            Genre("кодомо", "el_2137"),
-            Genre("комедия", "el_2136"),
-            Genre("махо-сёдзё", "el_2147"),
-            Genre("меха", "el_2126"),
-            Genre("мистика", "el_2132"),
-            Genre("научная фантастика", "el_2133"),
-            Genre("повседневность", "el_2135"),
-            Genre("постапокалиптика", "el_2151"),
-            Genre("приключения", "el_2130"),
-            Genre("психология", "el_2144"),
-            Genre("романтика", "el_2121"),
-            Genre("самурайский боевик", "el_2124"),
-            Genre("сверхъестественное", "el_2159"),
-            Genre("сёдзё", "el_2122"),
-            Genre("сёдзё-ай", "el_2128"),
-            Genre("сёнэн", "el_2134"),
-            Genre("сёнэн-ай", "el_2139"),
-            Genre("спорт", "el_2129"),
-            Genre("сэйнэн", "el_2138"),
-            Genre("трагедия", "el_2153"),
-            Genre("триллер", "el_2150"),
-            Genre("ужасы", "el_2125"),
-            Genre("фантастика", "el_2140"),
-            Genre("фэнтези", "el_2131"),
-            Genre("школа", "el_2127"),
-            Genre("этти", "el_2149"),
-            Genre("юри", "el_2123")
-    )
-}

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,10 +342,12 @@ 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) {
+
+        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) {
@@ -332,6 +360,7 @@ open class BrowseCatalogueController(bundle: Bundle) :
                 }
             }
         }
+    }
 
     /**
      * Sets a new progress item and reenables the scroll listener.
@@ -475,12 +504,13 @@ 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 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 }
@@ -489,6 +519,7 @@ open class BrowseCatalogueController(bundle: Bundle) :
                     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() }
     }

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)!!
     }
 
     /**

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

@@ -18,8 +18,10 @@ import kotlinx.android.synthetic.main.catalogue_global_search_controller.*
  * This controller should only handle UI actions, IO actions should be done by [CatalogueSearchPresenter]
  * [CatalogueSearchCardAdapter.OnMangaClickListener] called when manga is clicked in global search
  */
-open class CatalogueSearchController(protected val initialQuery: String? = null) :
-        NucleusController<CatalogueSearchPresenter>(),
+open class CatalogueSearchController(
+        protected val initialQuery: String? = null,
+        protected val extensionFilter: String? = null
+) : NucleusController<CatalogueSearchPresenter>(),
         CatalogueSearchCardAdapter.OnMangaClickListener {
 
     /**
@@ -60,7 +62,7 @@ open class CatalogueSearchController(protected val initialQuery: String? = null)
      * @return instance of [CatalogueSearchPresenter]
      */
     override fun createPresenter(): CatalogueSearchPresenter {
-        return CatalogueSearchPresenter(initialQuery)
+        return CatalogueSearchPresenter(initialQuery, extensionFilter)
     }
 
     /**

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

@@ -31,9 +31,6 @@ class CatalogueSearchHolder(view: View, val adapter: CatalogueSearchAdapter) :
         // Set layout horizontal.
         recycler.layoutManager = LinearLayoutManager(view.context, LinearLayoutManager.HORIZONTAL, false)
         recycler.adapter = mangaAdapter
-
-        nothing_found_icon.setVectorCompat(R.drawable.ic_search_black_112dp,
-                view.context.getResourceColor(android.R.attr.textColorHint))
     }
 
     /**
@@ -54,15 +51,15 @@ class CatalogueSearchHolder(view: View, val adapter: CatalogueSearchAdapter) :
         when {
             results == null -> {
                 progress.visible()
-                nothing_found.gone()
+                showHolder()
             }
             results.isEmpty() -> {
                 progress.gone()
-                nothing_found.visible()
+                hideHolder()
             }
             else -> {
                 progress.gone()
-                nothing_found.gone()
+                showHolder()
             }
         }
         if (results !== lastBoundResults) {
@@ -96,4 +93,15 @@ class CatalogueSearchHolder(view: View, val adapter: CatalogueSearchAdapter) :
 
         return null
     }
+
+    private fun showHolder() {
+        title.visible()
+        source_card.visible()
+    }
+
+    private fun hideHolder() {
+        title.gone()
+        source_card.gone()
+    }
+
 }

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

@@ -5,10 +5,12 @@ import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.preference.getOrDefault
+import eu.kanade.tachiyomi.extension.ExtensionManager
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.model.FilterList
+import eu.kanade.tachiyomi.source.model.MangasPage
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.LoginSource
 import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
@@ -21,6 +23,7 @@ import rx.subjects.PublishSubject
 import timber.log.Timber
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
+import uy.kohesive.injekt.injectLazy
 
 /**
  * Presenter of [CatalogueSearchController]
@@ -32,6 +35,7 @@ import uy.kohesive.injekt.api.get
  */
 open class CatalogueSearchPresenter(
         val initialQuery: String? = "",
+        val initialExtensionFilter: String? = null,
         val sourceManager: SourceManager = Injekt.get(),
         val db: DatabaseHelper = Injekt.get(),
         val preferencesHelper: PreferencesHelper = Injekt.get()
@@ -40,7 +44,7 @@ open class CatalogueSearchPresenter(
     /**
      * Enabled sources.
      */
-    val sources by lazy { getEnabledSources() }
+    val sources by lazy { getSourcesToQuery() }
 
     /**
      * Query from the view.
@@ -63,9 +67,16 @@ open class CatalogueSearchPresenter(
      */
     private var fetchImageSubscription: Subscription? = null
 
+    private val extensionManager by injectLazy<ExtensionManager>()
+
+    private var extensionFilter: String? = null
+
     override fun onCreate(savedState: Bundle?) {
         super.onCreate(savedState)
 
+        extensionFilter = savedState?.getString(CatalogueSearchPresenter::extensionFilter.name) ?:
+                          initialExtensionFilter
+
         // Perform a search with previous or initial state
         search(savedState?.getString(BrowseCataloguePresenter::query.name) ?: initialQuery.orEmpty())
     }
@@ -78,6 +89,7 @@ open class CatalogueSearchPresenter(
 
     override fun onSave(state: Bundle) {
         state.putString(BrowseCataloguePresenter::query.name, query)
+        state.putString(CatalogueSearchPresenter::extensionFilter.name, extensionFilter)
         super.onSave(state)
     }
 
@@ -97,6 +109,26 @@ open class CatalogueSearchPresenter(
                 .sortedBy { "(${it.lang}) ${it.name}" }
     }
 
+    private fun getSourcesToQuery(): List<CatalogueSource> {
+        val filter = extensionFilter
+        val enabledSources = getEnabledSources()
+        if (filter.isNullOrEmpty()) {
+            return enabledSources
+        }
+
+        val filterSources = extensionManager.installedExtensions
+            .filter { it.pkgName == filter }
+            .flatMap { it.sources }
+            .filter { it in enabledSources }
+            .filterIsInstance<CatalogueSource>()
+
+        if (filterSources.isEmpty()) {
+            return enabledSources
+        }
+
+        return filterSources
+    }
+
     /**
      * Creates a catalogue search item
      */
@@ -126,9 +158,9 @@ open class CatalogueSearchPresenter(
         fetchSourcesSubscription?.unsubscribe()
         fetchSourcesSubscription = Observable.from(sources)
                 .flatMap({ source ->
-                    source.fetchSearchManga(1, query, FilterList())
+                    Observable.defer { source.fetchSearchManga(1, query, FilterList()) }
                             .subscribeOn(Schedulers.io())
-                            .onExceptionResumeNext(Observable.empty()) // Ignore timeouts.
+                            .onErrorReturn { MangasPage(emptyList(), false) } // Ignore timeouts or other exceptions
                             .map { it.mangas.take(10) } // Get at most 10 manga from search result.
                             .map { it.map { networkToLocalManga(it, source.id) } } // Convert to local manga.
                             .doOnNext { fetchImage(it, source) } // Load manga covers.
@@ -208,7 +240,7 @@ open class CatalogueSearchPresenter(
      * @param sManga the manga from the source.
      * @return a manga from the database.
      */
-    private fun networkToLocalManga(sManga: SManga, sourceId: Long): Manga {
+    protected open fun networkToLocalManga(sManga: SManga, sourceId: Long): Manga {
         var localManga = db.getManga(sManga.url, sourceId).executeAsBlocking()
         if (localManga == null) {
             val newManga = Manga.create(sManga.url, sManga.title, sourceId)

app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionController.kt

@@ -1,10 +1,14 @@
 package eu.kanade.tachiyomi.ui.extension
 
 import android.support.v7.widget.LinearLayoutManager
+import android.support.v7.widget.SearchView
 import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
 import android.view.View
 import android.view.ViewGroup
 import com.jakewharton.rxbinding.support.v4.widget.refreshes
+import com.jakewharton.rxbinding.support.v7.widget.queryTextChanges
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.IFlexible
 import eu.kanade.tachiyomi.R
@@ -28,6 +32,10 @@ open class ExtensionController : NucleusController<ExtensionPresenter>(),
      */
     private var adapter: FlexibleAdapter<IFlexible<*>>? = null
 
+    private var extensions: List<ExtensionItem> = emptyList()
+
+    private var query = ""
+
     init {
         setHasOptionsMenu(true)
     }
@@ -84,6 +92,30 @@ open class ExtensionController : NucleusController<ExtensionPresenter>(),
         }
     }
 
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.extension_main, menu)
+
+        val searchItem = menu.findItem(R.id.action_search)
+        val searchView = searchItem.actionView as SearchView
+        searchView.maxWidth = Int.MAX_VALUE
+
+        if (!query.isEmpty()) {
+            searchItem.expandActionView()
+            searchView.setQuery(query, true)
+            searchView.clearFocus()
+        }
+
+        searchView.queryTextChanges()
+            .filter { router.backstack.lastOrNull()?.controller() == this }
+            .subscribeUntilDestroy {
+                query = it.toString()
+                drawExtensions()
+            }
+
+        // Fixes problem with the overflow icon showing up in lieu of search
+        searchItem.fixExpand()
+    }
+
     override fun onItemClick(position: Int): Boolean {
         val extension = (adapter?.getItem(position) as? ExtensionItem)?.extension ?: return false
         if (extension is Extension.Installed) {
@@ -114,8 +146,20 @@ open class ExtensionController : NucleusController<ExtensionPresenter>(),
 
     fun setExtensions(extensions: List<ExtensionItem>) {
         ext_swipe_refresh?.isRefreshing = false
+        this.extensions = extensions
+        drawExtensions()
+    }
+
+    fun drawExtensions() {
+        if (!query.isBlank()) {
+            adapter?.updateDataSet(
+                    extensions.filter {
+                        it.extension.name.contains(query, ignoreCase = true)
+                    })
+        } else {
             adapter?.updateDataSet(extensions)
         }
+    }
 
     fun downloadUpdate(item: ExtensionItem) {
         adapter?.updateItem(item, item.installStep)

app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionDetailsController.kt

@@ -47,7 +47,7 @@ class ExtensionDetailsController(bundle: Bundle? = null) :
     }
 
     override fun createPresenter(): ExtensionDetailsPresenter {
-        return ExtensionDetailsPresenter(args.getString(PKGNAME_KEY))
+        return ExtensionDetailsPresenter(args.getString(PKGNAME_KEY)!!)
     }
 
     override fun getTitle(): String? {

app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionDividerItemDecoration.kt

@@ -13,7 +13,7 @@ class ExtensionDividerItemDecoration(context: Context) : RecyclerView.ItemDecora
 
     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/extension/ExtensionGroupHolder.kt

@@ -3,18 +3,14 @@ package eu.kanade.tachiyomi.ui.extension
 import android.annotation.SuppressLint
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
-import kotlinx.android.synthetic.main.extension_card_header.*
+import kotlinx.android.synthetic.main.extension_card_header.title
 
 class ExtensionGroupHolder(view: View, adapter: FlexibleAdapter<*>) :
         BaseFlexibleViewHolder(view, adapter) {
 
     @SuppressLint("SetTextI18n")
     fun bind(item: ExtensionGroupItem) {
-        title.text = when {
-            item.installed -> itemView.context.getString(R.string.ext_installed)
-            else -> itemView.context.getString(R.string.ext_available)
-        } + " (" + item.size + ")"
+        title.text = item.name
     }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionGroupItem.kt

@@ -6,11 +6,12 @@ import eu.davidea.flexibleadapter.items.AbstractHeaderItem
 import eu.kanade.tachiyomi.R
 
 /**
- * Item that contains the language header.
+ * Item that contains the group header.
  *
- * @param code The lang code.
+ * @param name The header name.
+ * @param size The number of items in the group.
  */
-data class ExtensionGroupItem(val installed: Boolean, val size: Int) : AbstractHeaderItem<ExtensionGroupHolder>() {
+data class ExtensionGroupItem(val name: String, val size: Int) : AbstractHeaderItem<ExtensionGroupHolder>() {
 
     /**
      * Returns the layout resource of this item.
@@ -38,13 +39,13 @@ data class ExtensionGroupItem(val installed: Boolean, val size: Int) : AbstractH
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (other is ExtensionGroupItem) {
-            return installed == other.installed
+            return name == other.name
         }
         return false
     }
 
     override fun hashCode(): Int {
-        return installed.hashCode()
+        return name.hashCode()
     }
 
 }

app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionPresenter.kt

@@ -1,10 +1,13 @@
 package eu.kanade.tachiyomi.ui.extension
 
+import android.app.Application
 import android.os.Bundle
+import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.extension.ExtensionManager
 import eu.kanade.tachiyomi.extension.model.Extension
 import eu.kanade.tachiyomi.extension.model.InstallStep
 import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
+import eu.kanade.tachiyomi.util.LocaleHelper
 import rx.Observable
 import rx.Subscription
 import rx.android.schedulers.AndroidSchedulers
@@ -49,6 +52,8 @@ open class ExtensionPresenter(
 
     @Synchronized
     private fun toItems(tuple: ExtensionTuple): List<ExtensionItem> {
+        val context = Injekt.get<Application>()
+
         val (installed, untrusted, available) = tuple
 
         val items = mutableListOf<ExtensionItem>()
@@ -62,7 +67,7 @@ open class ExtensionPresenter(
                 .sortedBy { it.pkgName }
 
         if (installedSorted.isNotEmpty() || untrustedSorted.isNotEmpty()) {
-            val header = ExtensionGroupItem(true, installedSorted.size + untrustedSorted.size)
+            val header = ExtensionGroupItem(context.getString(R.string.ext_installed), installedSorted.size + untrustedSorted.size)
             items += installedSorted.map { extension ->
                 ExtensionItem(extension, header, currentDownloads[extension.pkgName])
             }
@@ -71,11 +76,18 @@ open class ExtensionPresenter(
             }
         }
         if (availableSorted.isNotEmpty()) {
-            val header = ExtensionGroupItem(false, availableSorted.size)
-            items += availableSorted.map { extension ->
+            val availableGroupedByLang = availableSorted
+                    .groupBy { LocaleHelper.getDisplayName(it.lang, context) }
+                    .toSortedMap()
+
+            availableGroupedByLang
+                    .forEach {
+                        val header = ExtensionGroupItem(it.key, it.value.size)
+                        items += it.value.map { extension ->
                             ExtensionItem(extension, header, currentDownloads[extension.pkgName])
                         }
                     }
+        }
 
         this.extensions = items
         return items

app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionTrustDialog.kt

@@ -24,10 +24,10 @@ class ExtensionTrustDialog<T>(bundle: Bundle? = null) : DialogController(bundle)
                 .positiveText(R.string.ext_trust)
                 .negativeText(R.string.ext_uninstall)
                 .onPositive { _, _ ->
-                    (targetController as? Listener)?.trustSignature(args.getString(SIGNATURE_KEY))
+                    (targetController as? Listener)?.trustSignature(args.getString(SIGNATURE_KEY)!!)
                 }
                 .onNegative { _, _ ->
-                    (targetController as? Listener)?.uninstallExtension(args.getString(PKGNAME_KEY))
+                    (targetController as? Listener)?.uninstallExtension(args.getString(PKGNAME_KEY)!!)
                 }
                 .build()
     }

app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt

@@ -185,7 +185,7 @@ class LibraryPresenter(
 
         val sortFn: (LibraryItem, LibraryItem) -> Int = { i1, i2 ->
             when (sortingMode) {
-                LibrarySort.ALPHA -> i1.manga.title.compareTo(i2.manga.title)
+                LibrarySort.ALPHA -> i1.manga.title.compareTo(i2.manga.title, true)
                 LibrarySort.LAST_READ -> {
                     // Get index of manga, set equal to list if size unknown.
                     val manga1LastRead = lastReadManga[i1.manga.id!!] ?: lastReadManga.size

app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt

@@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi.ui.main
 
 import android.animation.ObjectAnimator
+import android.app.SearchManager
 import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
@@ -15,6 +16,7 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.ui.base.activity.BaseActivity
 import eu.kanade.tachiyomi.ui.base.controller.*
 import eu.kanade.tachiyomi.ui.catalogue.CatalogueController
+import eu.kanade.tachiyomi.ui.catalogue.global_search.CatalogueSearchController
 import eu.kanade.tachiyomi.ui.download.DownloadController
 import eu.kanade.tachiyomi.ui.extension.ExtensionController
 import eu.kanade.tachiyomi.ui.library.LibraryController
@@ -22,6 +24,7 @@ import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.ui.recent_updates.RecentChaptersController
 import eu.kanade.tachiyomi.ui.recently_read.RecentlyReadController
 import eu.kanade.tachiyomi.ui.setting.SettingsMainController
+import eu.kanade.tachiyomi.util.openInBrowser
 import kotlinx.android.synthetic.main.main_activity.*
 import uy.kohesive.injekt.injectLazy
 
@@ -89,6 +92,9 @@ class MainActivity : BaseActivity() {
                     R.id.nav_drawer_settings -> {
                         router.pushController(SettingsMainController().withFadeTransaction())
                     }
+                    R.id.nav_drawer_help -> {
+                        openInBrowser(URL_HELP)
+                    }
                 }
             }
             drawer.closeDrawer(GravityCompat.START)
@@ -158,6 +164,29 @@ class MainActivity : BaseActivity() {
                     setSelectedDrawerItem(R.id.nav_drawer_downloads)
                 }
             }
+            Intent.ACTION_SEARCH, "com.google.android.gms.actions.SEARCH_ACTION" -> {
+                //If the intent match the "standard" Android search intent
+                // or the Google-specific search intent (triggered by saying or typing "search *query* on *Tachiyomi*" in Google Search/Google Assistant)
+
+                //Get the search query provided in extras, and if not null, perform a global search with it.
+                val query = intent.getStringExtra(SearchManager.QUERY)
+                if (query != null && !query.isEmpty()) {
+                    if (router.backstackSize > 1) {
+                        router.popToRoot()
+                    }
+                    router.pushController(CatalogueSearchController(query).withFadeTransaction())
+                }
+            }
+            INTENT_SEARCH -> {
+                val query = intent.getStringExtra(INTENT_SEARCH_QUERY)
+                val filter = intent.getStringExtra(INTENT_SEARCH_FILTER)
+                if (query != null && !query.isEmpty()) {
+                    if (router.backstackSize > 1) {
+                        router.popToRoot()
+                    }
+                    router.pushController(CatalogueSearchController(query, filter).withFadeTransaction())
+                }
+            }
             else -> return false
         }
         return true
@@ -242,6 +271,12 @@ class MainActivity : BaseActivity() {
         const val SHORTCUT_CATALOGUES = "eu.kanade.tachiyomi.SHOW_CATALOGUES"
         const val SHORTCUT_DOWNLOADS = "eu.kanade.tachiyomi.SHOW_DOWNLOADS"
         const val SHORTCUT_MANGA = "eu.kanade.tachiyomi.SHOW_MANGA"
+
+        const val INTENT_SEARCH = "eu.kanade.tachiyomi.SEARCH"
+        const val INTENT_SEARCH_QUERY = "query"
+        const val INTENT_SEARCH_FILTER = "filter"
+
+        private const val URL_HELP = "https://tachiyomi.org/help/"
     }
 
 }

app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt

@@ -179,7 +179,6 @@ class MangaController : RxController, TabbedController {
     }
 
     companion object {
-
         const val FROM_CATALOGUE_EXTRA = "from_catalogue"
         const val MANGA_EXTRA = "manga"
 
@@ -187,9 +186,8 @@ class MangaController : RxController, TabbedController {
         const val CHAPTERS_CONTROLLER = 1
         const val TRACK_CONTROLLER = 2
 
-        private val tabField = TabLayout.Tab::class.java.getDeclaredField("mView")
+        private val tabField = TabLayout.Tab::class.java.getDeclaredField("view")
                 .apply { isAccessible = true }
     }
 
-
 }

app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt

@@ -404,8 +404,12 @@ class ChaptersController : NucleusController<ChaptersPresenter>(),
         presenter.deleteChapters(chapters)
     }
 
-    fun onChaptersDeleted() {
+    fun onChaptersDeleted(chapters: List<ChapterItem>) {
         dismissDeletingDialog()
+        //this is needed so the downloaded text gets removed from the item
+        chapters.forEach {
+            adapter?.updateItem(it)
+        }
         adapter?.notifyDataSetChanged()
     }
 

app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt

@@ -278,7 +278,7 @@ class ChaptersPresenter(
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribeFirst({ view, _ ->
-                    view.onChaptersDeleted()
+                    view.onChaptersDeleted(chapters)
                 }, ChaptersController::onChaptersDeletedError)
     }
 

app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt

@@ -15,12 +15,7 @@ import android.support.customtabs.CustomTabsIntent
 import android.support.v4.content.pm.ShortcutInfoCompat
 import android.support.v4.content.pm.ShortcutManagerCompat
 import android.support.v4.graphics.drawable.IconCompat
-import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
+import android.view.*
 import android.widget.Toast
 import com.afollestad.materialdialogs.MaterialDialog
 import com.bumptech.glide.load.engine.DiskCacheStrategy
@@ -47,6 +42,7 @@ import eu.kanade.tachiyomi.ui.library.ChangeMangaCategoriesDialog
 import eu.kanade.tachiyomi.ui.main.MainActivity
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.util.getResourceColor
+import eu.kanade.tachiyomi.util.openInBrowser
 import eu.kanade.tachiyomi.util.snack
 import eu.kanade.tachiyomi.util.toast
 import eu.kanade.tachiyomi.util.truncateCenter
@@ -92,6 +88,9 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
         // Set onclickListener to toggle favorite when FAB clicked.
         fab_favorite.clicks().subscribeUntilDestroy { onFabClick() }
 
+        // Set onLongClickListener to manage categories when FAB is clicked.
+        fab_favorite.longClicks().subscribeUntilDestroy{ onFabLongClick() }
+
         // Set SwipeRefresh to refresh manga data.
         swipe_refresh.refreshes().subscribeUntilDestroy { fetchMangaFromSource() }
 
@@ -138,6 +137,7 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.action_open_in_browser -> openInBrowser()
+            R.id.action_open_in_web_view -> openInWebView()
             R.id.action_share -> shareManga()
             R.id.action_add_to_home_screen -> addToHomeScreen()
             else -> return super.onOptionsItemSelected(item)
@@ -291,15 +291,20 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
         val context = view?.context ?: return
         val source = presenter.source as? HttpSource ?: return
 
-        try {
-            val url = Uri.parse(source.mangaDetailsRequest(presenter.manga).url().toString())
-            val intent = CustomTabsIntent.Builder()
-                    .setToolbarColor(context.getResourceColor(R.attr.colorPrimary))
-                    .build()
-            intent.launchUrl(activity, url)
-        } catch (e: Exception) {
-            context.toast(e.message)
+        context.openInBrowser(source.mangaDetailsRequest(presenter.manga).url().toString())
     }
+
+    private fun openInWebView() {
+        val source = presenter.source as? HttpSource ?: return
+
+        val url = try {
+            source.mangaDetailsRequest(presenter.manga).url().toString()
+        } catch (e: Exception) {
+            return
+        }
+
+        parentController?.router?.pushController(MangaWebViewController(source.id, url)
+            .withFadeTransaction())
     }
 
     /**
@@ -377,11 +382,12 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
         toggleFavorite()
         if (manga.favorite) {
             val categories = presenter.getCategories()
-            val defaultCategory = categories.find { it.id == preferences.defaultCategory() }
+            val defaultCategoryId = preferences.defaultCategory()
+            val defaultCategory = categories.find { it.id == defaultCategoryId }
             when {
                 defaultCategory != null -> presenter.moveMangaToCategory(manga, defaultCategory)
-                categories.size <= 1 -> // default or the one from the user
-                    presenter.moveMangaToCategory(manga, categories.firstOrNull())
+                defaultCategoryId == 0 || categories.isEmpty() -> // 'Default' or no category
+                    presenter.moveMangaToCategory(manga, null)
                 else -> {
                     val ids = presenter.getMangaCategoryIds(manga)
                     val preselected = ids.mapNotNull { id ->
@@ -398,6 +404,30 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
         }
     }
 
+    /**
+     * Called when the fab is long clicked.
+     */
+    private fun onFabLongClick() {
+        val manga = presenter.manga
+        if (!manga.favorite) {
+            toggleFavorite()
+            activity?.toast(activity?.getString(R.string.manga_added_library))
+        }
+        val categories = presenter.getCategories()
+        if (categories.isEmpty()) {
+            // no categories exist, display a message about adding categories
+            activity?.toast(activity?.getString(R.string.action_add_category))
+        } 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)
+        }
+    }
+
     override fun updateCategoriesForMangas(mangas: List<Manga>, categories: List<Category>) {
         val manga = mangas.firstOrNull() ?: return
         presenter.moveMangaToCategories(manga, categories)

app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoPresenter.kt

@@ -130,9 +130,9 @@ class MangaInfoPresenter(
     }
 
     /**
-     * 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/manga/info/MangaWebViewController.kt

@@ -0,0 +1,94 @@
+package eu.kanade.tachiyomi.ui.manga.info
+
+import android.os.Bundle
+import android.view.*
+import android.webkit.WebView
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.source.SourceManager
+import eu.kanade.tachiyomi.source.online.HttpSource
+import eu.kanade.tachiyomi.ui.base.controller.BaseController
+import eu.kanade.tachiyomi.util.WebViewClientCompat
+import uy.kohesive.injekt.injectLazy
+
+class MangaWebViewController(bundle: Bundle? = null) : BaseController(bundle) {
+
+    private val sourceManager by injectLazy<SourceManager>()
+
+    init {
+        setHasOptionsMenu(true)
+    }
+
+    constructor(sourceId: Long, url: String) : this(Bundle().apply {
+        putLong(SOURCE_KEY, sourceId)
+        putString(URL_KEY, url)
+    })
+
+    override fun inflateView(inflater: LayoutInflater, container: ViewGroup): View {
+        return inflater.inflate(R.layout.manga_info_web_controller, container, false)
+    }
+
+    override fun onViewCreated(view: View) {
+        super.onViewCreated(view)
+        val source = sourceManager.get(args.getLong(SOURCE_KEY)) as? HttpSource ?: return
+        val url = args.getString(URL_KEY) ?: return
+        val headers = source.headers.toMultimap().mapValues { it.value.getOrNull(0) ?: "" }
+
+        val web = view as WebView
+        web.webViewClient = object : WebViewClientCompat() {
+            override fun shouldOverrideUrlCompat(view: WebView, url: String): Boolean {
+                view.loadUrl(url)
+                return true
+            }
+        }
+        web.settings.javaScriptEnabled = true
+        web.settings.userAgentString = source.headers["User-Agent"]
+        web.loadUrl(url, headers)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.web_view, menu)
+    }
+
+    override fun onPrepareOptionsMenu(menu: Menu) {
+        val web = view as WebView
+        menu.findItem(R.id.action_forward).isVisible = web.canGoForward()
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.action_forward -> {
+                val web = view as WebView
+                if (web.canGoForward()) web.goForward()
+            }
+            R.id.action_refresh -> {
+                val web = view as WebView
+                web.reload()
+            }
+            R.id.action_close -> router.popController(this)
+            else -> return super.onOptionsItemSelected(item)
+        }
+        return true
+    }
+
+    override fun handleBack(): Boolean {
+        val web = view as WebView
+        if (web.canGoBack()) {
+            web.goBack()
+            return true
+        }
+        return super.handleBack()
+    }
+
+    override fun onDestroyView(view: View) {
+        val web = view as WebView
+        web.stopLoading()
+        web.destroy()
+        super.onDestroyView(view)
+    }
+
+    private companion object {
+        const val SOURCE_KEY = "source_key"
+        const val URL_KEY = "url_key"
+    }
+
+}

app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt

@@ -52,6 +52,7 @@ class TrackSearchAdapter(context: Context)
                         .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
                         .centerCrop()
                         .into(view.track_search_cover)
+            }
 
             if (track.publishing_status.isNullOrBlank()) {
                 view.track_search_status.gone()
@@ -76,4 +77,3 @@ class TrackSearchAdapter(context: Context)
         }
     }
 }
-}