bump to v0.4.7

protobuf backup support

.github/workflows/build_pull_request.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Cancel previous runs
-        uses: styfle/cancel-workflow-action@0.5.0
+        uses: styfle/cancel-workflow-action@0.9.0
         with:
           access_token: ${{ github.token }}
 
@@ -48,21 +48,14 @@ jobs:
       - name: Download android.jar
         run: |
           cd master
-          curl https://raw.githubusercontent.com/AriaMoradi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
+          curl https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
 
-      - name: Cache node_modules
+      - name: Build Jar
-        uses: actions/cache@v2
-        with:
-          path: |
-            **/react/node_modules
-          key: ${{ runner.os }}-${{ hashFiles('**/react/yarn.lock') }}
-
-      - name: Build and copy webUI, Build Jar
         uses: eskatos/gradle-command-action@v1
         with:
           build-root-directory: master
           wrapper-directory: master
-          arguments: :webUI:copyBuild :server:shadowJar --stacktrace
+          arguments: :server:shadowJar --stacktrace
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true

.github/workflows/build_push.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: Cancel previous runs
-        uses: styfle/cancel-workflow-action@0.5.0
+        uses: styfle/cancel-workflow-action@0.9.0
         with:
           access_token: ${{ github.token }}
 
@@ -50,23 +50,16 @@ jobs:
       - name: Download android.jar
         run: |
           cd master
-          curl https://raw.githubusercontent.com/AriaMoradi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
+          curl https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
 
-      - name: Cache node_modules
+      - name: Build Jar
-        uses: actions/cache@v2
-        with:
-          path: |
-            **/react/node_modules
-          key: ${{ runner.os }}-${{ hashFiles('**/react/yarn.lock') }}
-
-      - name: Build and copy webUI, Build Jar
         uses: eskatos/gradle-command-action@v1
         env:
-          TachideskBuildType: "Preview"
+          ProductBuildType: "Preview"
         with:
           build-root-directory: master
           wrapper-directory: master
-          arguments: :webUI:copyBuild :server:shadowJar --stacktrace
+          arguments: :server:shadowJar --stacktrace
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
@@ -81,7 +74,7 @@ jobs:
         id: GenTagName
         run: |
           cd master/server/build
-          genTag=$(ls *.jar | sed -e's/Tachidesk-\|.jar//g')
+          genTag=$(ls *.jar | sed -e's/Tachidesk-Server-\|.jar//g')
           echo "$genTag"
           echo "::set-output name=value::$genTag"
 
@@ -99,7 +92,7 @@ jobs:
       - name: Checkout preview branch
         uses: actions/checkout@v2
         with:
-          repository: 'Suwayomi/Tachidesk-preview'
+          repository: 'Suwayomi/Tachidesk-Server-preview'
           ref: main
           path: preview
           token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }}
@@ -125,5 +118,9 @@ jobs:
           token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }}
           artifacts: "master/server/build/*.jar,master/server/build/*.zip"
           owner: "Suwayomi"
-          repo: "Tachidesk-preview"
+          repo: "Tachidesk-Server-preview"
           tag: ${{ steps.GenTagName.outputs.value }}
+
+      - name: Run Docker build workflow
+        run: |
+          curl -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: token ${{ secrets.DEPLOY_PREVIEW_TOKEN }}" -d '{"ref":"main", "inputs":{"tachidesk_release_type": "preview"}}' https://api.github.com/repos/suwayomi/docker-tachidesk/actions/workflows/build_container_images.yml/dispatches

.github/workflows/publish.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Cancel previous runs
-        uses: styfle/cancel-workflow-action@0.5.0
+        uses: styfle/cancel-workflow-action@0.9.0
         with:
           access_token: ${{ github.token }}
 
@@ -49,23 +49,23 @@ jobs:
       - name: Download android.jar
         run: |
           cd master
-          curl https://raw.githubusercontent.com/AriaMoradi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
+          curl https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
 
       - name: Cache node_modules
         uses: actions/cache@v2
         with:
           path: |
-            **/react/node_modules
+            **/webUI/node_modules
-          key: ${{ runner.os }}-${{ hashFiles('**/react/yarn.lock') }}
+          key: ${{ runner.os }}-${{ hashFiles('**/webUI/yarn.lock') }}
 
       - name: Build and copy webUI, Build Jar
         uses: eskatos/gradle-command-action@v1
         env:
-          TachideskBuildType: "Stable"
+          ProductBuildType: "Stable"
         with:
           build-root-directory: master
           wrapper-directory: master
-          arguments: :webUI:copyBuild :server:shadowJar --stacktrace
+          arguments: :server:downloadWebUI :server:shadowJar --stacktrace
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
@@ -85,3 +85,8 @@ jobs:
           tags: true
           draft: true
           verbose: true
+
+      - name: Run Docker build workflow
+        run: |
+          curl -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: token ${{ secrets.DEPLOY_PREVIEW_TOKEN }}" -d '{"ref":"main", "inputs":{"tachidesk_release_type": "stable"}}' https://api.github.com/repos/suwayomi/docker-tachidesk/actions/workflows/build_container_images.yml/dispatches
+          

.gitignore

@@ -6,7 +6,7 @@ gradle.properties
 # Ignore Gradle build output directory
 build
 
-server/src/main/resources/react
+server/src/main/resources/WebUI.zip
 server/tmp/
 server/tachiserver-data/
 

AndroidCompat/Config/build.gradle.kts

@@ -1,4 +0,0 @@
-dependencies {
-    // Config API, moved to the global build.gradle
-//    implementation("com.typesafe:config:1.4.0")
-}

AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ApplicationRootDir.kt

@@ -1,7 +1,5 @@
 package xyz.nulldev.ts.config
 
-import net.harawata.appdirs.AppDirsFactory
-
 /*
  * Copyright (C) Contributors to the Suwayomi project
  *
@@ -9,10 +7,13 @@ import net.harawata.appdirs.AppDirsFactory
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+import net.harawata.appdirs.AppDirsFactory
+
+
 val ApplicationRootDir: String
     get(): String {
         return System.getProperty(
-                "suwayomi.server.rootDir",
+                "suwayomi.tachidesk.server.rootDir",
                 AppDirsFactory.getInstance().getUserDataDir("Tachidesk", null, null)
         )
     }

AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigManager.kt

@@ -35,6 +35,7 @@ open class ConfigManager {
     /**
      * Get a config module (Java API)
      */
+    @Suppress("UNCHECKED_CAST")
     fun <T : ConfigModule> module(type: Class<T>): T = loadedModules[type] as T
 
     /**

AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigModule.kt

@@ -1,8 +1,39 @@
 package xyz.nulldev.ts.config
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import com.typesafe.config.Config
+import io.github.config4k.getValue
+import kotlin.reflect.KProperty
 
 /**
  * Abstract config module.
  */
-abstract class ConfigModule(config: Config)
+abstract class ConfigModule(config: Config, moduleName: String = "") {
+    val overridableWithSysProperty = SystemPropertyOverrideDelegate(config, moduleName)
+}
+
+class SystemPropertyOverrideDelegate(val config: Config, val moduleName: String) {
+    inline operator fun <R, reified T> getValue(thisRef: R, property: KProperty<*>): T {
+        val configValue: T = config.getValue(thisRef, property)
+
+        val combined = System.getProperty(
+            "suwayomi.tachidesk.config.$moduleName.${property.name}",
+            configValue.toString()
+        )
+
+        val asT = when(T::class.simpleName) {
+            "Int" -> combined.toInt()
+            "Boolean" -> combined.toBoolean()
+            // add more types as needed
+            else -> combined
+        }
+
+        return asT as T
+    }
+}

AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/Logging.kt

@@ -17,4 +17,4 @@ fun setLogLevel(level: Level) {
 }
 
 fun debugLogsEnabled(config: Config)
-    = System.getProperty("suwayomi.server.debugLogsEnabled", config.getString("server.debugLogsEnabled")).toBoolean()
+    = System.getProperty("suwayomi.tachidesk.config.server.debugLogsEnabled", config.getString("server.debugLogsEnabled")).toBoolean()

AndroidCompat/Config/src/main/resources/META-INF/services/xyz.nulldev.ts.api.v2.java.model.ServerAPI

@@ -1 +0,0 @@
-xyz.nulldev.ts.api.v2.java.impl.ServerAPIImpl

AndroidCompat/Config/src/main/resources/pref-schema.json

@@ -1,22 +0,0 @@
-[
-  {
-    "label": "Sync",
-    "icon": "import_export",
-    "type": "nested",
-    "prefs": []
-  },
-  {
-    "label": "Server",
-    "icon": "dns",
-    "type": "nested",
-    "prefs": [
-      {
-        "label": "Password authentication",
-        "type": "text-password",
-        "default": "",
-        "key": "pref_ts_server_password",
-        "hint": "Enter a password"
-      }
-    ]
-  }
-]

AndroidCompat/build.gradle.kts

@@ -1,6 +1,7 @@
 
 plugins {
     application
+    kotlin("plugin.serialization")
 }
 
 
@@ -19,18 +20,11 @@ dependencies {
     // Android stub library
     implementation(fileTree("lib/"))
 
-
-    // Android JAR libs
-//    compileOnly( fileTree(dir: new File(rootProject.rootDir, "libs/other"), include: "*.jar")
-
     // JSON
-    compileOnly( "com.google.code.gson:gson:2.8.6")
+    compileOnly("com.google.code.gson:gson:2.8.6")
-
-    // Javassist
-    compileOnly( "org.javassist:javassist:3.27.0-GA")
 
     // XML
-    compileOnly( group= "xmlpull", name= "xmlpull", version= "1.1.3.1")
+    compileOnly(group= "xmlpull", name= "xmlpull", version= "1.1.3.1")
 
     // Config API
     implementation(project(":AndroidCompat:Config"))
@@ -39,13 +33,25 @@ dependencies {
     compileOnly("com.android.tools.build:apksig:4.2.0-alpha13")
 
     // AndroidX annotations
-    compileOnly( "androidx.annotation:annotation:1.2.0-alpha01")
+    compileOnly("androidx.annotation:annotation:1.2.0-alpha01")
 
     // substitute for duktape-android
-    // 'org.mozilla:rhino' includes some code that we don't need so use 'org.mozilla:rhino-runtime' instead
+    implementation("org.mozilla:rhino-runtime:1.7.13") // slimmer version of 'org.mozilla:rhino'
-    implementation("org.mozilla:rhino-runtime:1.7.13")
+    implementation("org.mozilla:rhino-engine:1.7.13") // provides the same interface as 'javax.script' a.k.a Nashorn
-    // 'org.mozilla:rhino-engine' provides the same interface as 'javax.script' a.k.a Nashorn
+
-    implementation("org.mozilla:rhino-engine:1.7.13")
+    // Kotlin wrapper around Java Preferences, makes certain things easier
+    val multiplatformSettingsVersion = "0.7.7"
+    implementation("com.russhwolf:multiplatform-settings-jvm:$multiplatformSettingsVersion")
+    implementation("com.russhwolf:multiplatform-settings-serialization-jvm:$multiplatformSettingsVersion")
+
+    // Android version of SimpleDateFormat
+    implementation("com.ibm.icu:icu4j:69.1")
+}
+
+tasks {
+    withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+        kotlinOptions.freeCompilerArgs = listOf("-Xopt-in=kotlin.RequiresOptIn")
+    }
 }
 
 //def fatJarTask = tasks.getByPath(':AndroidCompat:JVMPatch:fatJar')

AndroidCompat/getAndroid.ps1

@@ -15,7 +15,7 @@ Write-Output "Getting required Android.jar..."
 Remove-Item -Recurse -Force "tmp" -ErrorAction SilentlyContinue | Out-Null
 New-Item -ItemType Directory -Force -Path "tmp" | Out-Null
 
-$androidEncoded = (Invoke-WebRequest -Uri "https://android.googlesource.com/platform/prebuilts/sdk/+/3b8a524d25fa6c3d795afb1eece3f24870c60988/27/public/android.jar?format=TEXT" -UseBasicParsing).content
+$androidEncoded = (Invoke-WebRequest -Uri "https://android.googlesource.com/platform/prebuilts/sdk/+/6cd31be5e4e25901aadf838120d71a79b46d9add/30/public/android.jar?format=TEXT" -UseBasicParsing).content
 
 $android_jar = (Get-Location).Path + "\tmp\android.jar"
 
@@ -24,7 +24,7 @@ $android_jar = (Get-Location).Path + "\tmp\android.jar"
 # We need to remove any stub classes that we have implementations for
 Write-Output "Patching JAR..."
 
-function Remove-Files-Zip($zipfile, $path)
+function Remove-Files-Zip($zipfile, $paths)
 {
     [Reflection.Assembly]::LoadWithPartialName('System.IO.Compression') | Out-Null
 
@@ -32,7 +32,18 @@ function Remove-Files-Zip($zipfile, $path)
     $mode   = [IO.Compression.ZipArchiveMode]::Update
     $zip    = New-Object IO.Compression.ZipArchive($stream, $mode)
 
-    ($zip.Entries | Where-Object { $_.FullName -like $path }) | ForEach-Object { Write-Output "Deleting: $($_.FullName)"; $_.Delete() }
+    if ($paths.getType().Name -eq "Object[]")
+    {
+        $paths | ForEach-Object {
+            $path = $_
+            ($zip.Entries | Where-Object { $_.FullName -like $path }) | ForEach-Object { Write-Output "Deleting: $($_.FullName)"; $_.Delete() }
+        }
+    }
+    else
+    {
+        ($zip.Entries | Where-Object { $_.FullName -like $paths }) | ForEach-Object { Write-Output "Deleting: $($_.FullName)"; $_.Delete() }
+    }
+
 
     $zip.Dispose()
     $stream.Close()
@@ -78,10 +89,7 @@ function Dedupe($path)
     $classes = Get-ChildItem . *.* -Recurse | Where-Object { !$_.PSIsContainer }
     $classes | ForEach-Object {
         "Processing class: $($_.FullName)"
-        Remove-Files-Zip $android_jar "$($_.Name).class" | Out-Null
+        Remove-Files-Zip $android_jar ("$($_.Name).class","$($_.Name)$*.class","$($_.Name)Kt.class","$($_.Name)Kt$*.class") | Out-Null
-        Remove-Files-Zip $android_jar "$($_.Name)$*.class" | Out-Null
-        Remove-Files-Zip $android_jar "$($_.Name)Kt.class" | Out-Null
-        Remove-Files-Zip $android_jar "$($_.Name)Kt$*.class" | Out-Null
     }
     Pop-Location
 }

AndroidCompat/getAndroid.sh

@@ -13,7 +13,7 @@ do
   which $dep >/dev/null 2>&1 || { echo >&2 "Error: This script needs $dep installed."; abort=yes; }
 done
 
-if [ $abort = yes ]; then
+if [ "$abort" = yes ]; then
   echo "Some of the dependencies didn't exist. Aborting."
   exit 1
 fi
@@ -30,7 +30,7 @@ rm -rf "tmp"
 mkdir -p "tmp"
 pushd "tmp"
 
-curl "https://android.googlesource.com/platform/prebuilts/sdk/+/3b8a524d25fa6c3d795afb1eece3f24870c60988/27/public/android.jar?format=TEXT" | base64 --decode > android.jar
+curl "https://android.googlesource.com/platform/prebuilts/sdk/+/6cd31be5e4e25901aadf838120d71a79b46d9add/30/public/android.jar?format=TEXT" | base64 --decode > android.jar
 
 # We need to remove any stub classes that we have implementations for
 echo "Patching JAR..."

AndroidCompat/src/main/java/android/support/v4/content/ContextCompat.java

@@ -1,291 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.support.v4.content;
-
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.os.StatFs;
-import android.support.v4.os.EnvironmentCompat;
-
-import java.io.File;
-
-/**
- * Helper for accessing features in {@link android.content.Context}
- * introduced after API level 4 in a backwards compatible fashion.
- */
-public class ContextCompat {
-    /**
-     * Start a set of activities as a synthesized task stack, if able.
-     *
-     * <p>In API level 11 (Android 3.0/Honeycomb) the recommended conventions for
-     * app navigation using the back key changed. The back key's behavior is local
-     * to the current task and does not capture navigation across different tasks.
-     * Navigating across tasks and easily reaching the previous task is accomplished
-     * through the "recents" UI, accessible through the software-provided Recents key
-     * on the navigation or system bar. On devices with the older hardware button configuration
-     * the recents UI can be accessed with a long press on the Home key.</p>
-     *
-     * <p>When crossing from one task stack to another post-Android 3.0,
-     * the application should synthesize a back stack/history for the new task so that
-     * the user may navigate out of the new task and back to the Launcher by repeated
-     * presses of the back key. Back key presses should not navigate across task stacks.</p>
-     *
-     * <p>startActivities provides a mechanism for constructing a synthetic task stack of
-     * multiple activities. If the underlying API is not available on the system this method
-     * will return false.</p>
-     *
-     * @param context Start activities using this activity as the starting context
-     * @param intents Array of intents defining the activities that will be started. The element
-     *                length-1 will correspond to the top activity on the resulting task stack.
-     * @return true if the underlying API was available and the call was successful, false otherwise
-     */
-    public static boolean startActivities(Context context, Intent[] intents) {
-        return startActivities(context, intents, null);
-    }
-
-    /**
-     * Start a set of activities as a synthesized task stack, if able.
-     *
-     * <p>In API level 11 (Android 3.0/Honeycomb) the recommended conventions for
-     * app navigation using the back key changed. The back key's behavior is local
-     * to the current task and does not capture navigation across different tasks.
-     * Navigating across tasks and easily reaching the previous task is accomplished
-     * through the "recents" UI, accessible through the software-provided Recents key
-     * on the navigation or system bar. On devices with the older hardware button configuration
-     * the recents UI can be accessed with a long press on the Home key.</p>
-     *
-     * <p>When crossing from one task stack to another post-Android 3.0,
-     * the application should synthesize a back stack/history for the new task so that
-     * the user may navigate out of the new task and back to the Launcher by repeated
-     * presses of the back key. Back key presses should not navigate across task stacks.</p>
-     *
-     * <p>startActivities provides a mechanism for constructing a synthetic task stack of
-     * multiple activities. If the underlying API is not available on the system this method
-     * will return false.</p>
-     *
-     * @param context Start activities using this activity as the starting context
-     * @param intents Array of intents defining the activities that will be started. The element
-     *                length-1 will correspond to the top activity on the resulting task stack.
-     * @param options Additional options for how the Activity should be started.
-     * See {@link android.content.Context#startActivity(Intent, Bundle)
-     * @return true if the underlying API was available and the call was successful, false otherwise
-     */
-    public static boolean startActivities(Context context, Intent[] intents,
-            Bundle options) {
-        context.startActivities(intents, options);
-        return true;
-    }
-
-    /**
-     * Returns absolute paths to application-specific directories on all
-     * external storage devices where the application's OBB files (if there are
-     * any) can be found. Note if the application does not have any OBB files,
-     * these directories may not exist.
-     * <p>
-     * This is like {@link Context#getFilesDir()} in that these files will be
-     * deleted when the application is uninstalled, however there are some
-     * important differences:
-     * <ul>
-     * <li>External files are not always available: they will disappear if the
-     * user mounts the external storage on a computer or removes it.
-     * <li>There is no security enforced with these files.
-     * </ul>
-     * <p>
-     * External storage devices returned here are considered a permanent part of
-     * the device, including both emulated external storage and physical media
-     * slots, such as SD cards in a battery compartment. The returned paths do
-     * not include transient devices, such as USB flash drives.
-     * <p>
-     * An application may store data on any or all of the returned devices. For
-     * example, an app may choose to store large files on the device with the
-     * most available space, as measured by {@link StatFs}.
-     * <p>
-     * Starting in {@link android.os.Build.VERSION_CODES#KITKAT}, no permissions
-     * are required to write to the returned paths; they're always accessible to
-     * the calling app. Before then,
-     * {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} is required to
-     * write. Write access outside of these paths on secondary external storage
-     * devices is not available. To request external storage access in a
-     * backwards compatible way, consider using {@code android:maxSdkVersion}
-     * like this:
-     *
-     * <pre class="prettyprint">&lt;uses-permission
-     *     android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-     *     android:maxSdkVersion="18" /&gt;</pre>
-     * <p>
-     * The first path returned is the same as {@link Context#getObbDir()}.
-     * Returned paths may be {@code null} if a storage device is unavailable.
-     *
-     * @see Context#getObbDir()
-     * @see EnvironmentCompat#getStorageState(File)
-     */
-    public static File[] getObbDirs(Context context) {
-        return context.getObbDirs();
-    }
-
-    /**
-     * Returns absolute paths to application-specific directories on all
-     * external storage devices where the application can place persistent files
-     * it owns. These files are internal to the application, and not typically
-     * visible to the user as media.
-     * <p>
-     * This is like {@link Context#getFilesDir()} in that these files will be
-     * deleted when the application is uninstalled, however there are some
-     * important differences:
-     * <ul>
-     * <li>External files are not always available: they will disappear if the
-     * user mounts the external storage on a computer or removes it.
-     * <li>There is no security enforced with these files.
-     * </ul>
-     * <p>
-     * External storage devices returned here are considered a permanent part of
-     * the device, including both emulated external storage and physical media
-     * slots, such as SD cards in a battery compartment. The returned paths do
-     * not include transient devices, such as USB flash drives.
-     * <p>
-     * An application may store data on any or all of the returned devices. For
-     * example, an app may choose to store large files on the device with the
-     * most available space, as measured by {@link StatFs}.
-     * <p>
-     * Starting in {@link android.os.Build.VERSION_CODES#KITKAT}, no permissions
-     * are required to write to the returned paths; they're always accessible to
-     * the calling app. Before then,
-     * {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} is required to
-     * write. Write access outside of these paths on secondary external storage
-     * devices is not available. To request external storage access in a
-     * backwards compatible way, consider using {@code android:maxSdkVersion}
-     * like this:
-     *
-     * <pre class="prettyprint">&lt;uses-permission
-     *     android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-     *     android:maxSdkVersion="18" /&gt;</pre>
-     * <p>
-     * The first path returned is the same as
-     * {@link Context#getExternalFilesDir(String)}. Returned paths may be
-     * {@code null} if a storage device is unavailable.
-     *
-     * @see Context#getExternalFilesDir(String)
-     * @see EnvironmentCompat#getStorageState(File)
-     */
-    public static File[] getExternalFilesDirs(Context context, String type) {
-        return context.getExternalFilesDirs(type);
-   }
-
-    /**
-     * Returns absolute paths to application-specific directories on all
-     * external storage devices where the application can place cache files it
-     * owns. These files are internal to the application, and not typically
-     * visible to the user as media.
-     * <p>
-     * This is like {@link Context#getCacheDir()} in that these files will be
-     * deleted when the application is uninstalled, however there are some
-     * important differences:
-     * <ul>
-     * <li>External files are not always available: they will disappear if the
-     * user mounts the external storage on a computer or removes it.
-     * <li>There is no security enforced with these files.
-     * </ul>
-     * <p>
-     * External storage devices returned here are considered a permanent part of
-     * the device, including both emulated external storage and physical media
-     * slots, such as SD cards in a battery compartment. The returned paths do
-     * not include transient devices, such as USB flash drives.
-     * <p>
-     * An application may store data on any or all of the returned devices. For
-     * example, an app may choose to store large files on the device with the
-     * most available space, as measured by {@link StatFs}.
-     * <p>
-     * Starting in {@link android.os.Build.VERSION_CODES#KITKAT}, no permissions
-     * are required to write to the returned paths; they're always accessible to
-     * the calling app. Before then,
-     * {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} is required to
-     * write. Write access outside of these paths on secondary external storage
-     * devices is not available. To request external storage access in a
-     * backwards compatible way, consider using {@code android:maxSdkVersion}
-     * like this:
-     *
-     * <pre class="prettyprint">&lt;uses-permission
-     *     android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-     *     android:maxSdkVersion="18" /&gt;</pre>
-     * <p>
-     * The first path returned is the same as
-     * {@link Context#getExternalCacheDir()}. Returned paths may be {@code null}
-     * if a storage device is unavailable.
-     *
-     * @see Context#getExternalCacheDir()
-     * @see EnvironmentCompat#getStorageState(File)
-     */
-    public static File[] getExternalCacheDirs(Context context) {
-        return context.getExternalCacheDirs();
-    }
-
-    /**
-     * Return a drawable object associated with a particular resource ID.
-     * <p>
-     * Starting in {@link android.os.Build.VERSION_CODES#LOLLIPOP}, the returned
-     * drawable will be styled for the specified Context's theme.
-     *
-     * @param id The desired resource identifier, as generated by the aapt tool.
-     *            This integer encodes the package, type, and resource entry.
-     *            The value 0 is an invalid identifier.
-     * @return Drawable An object that can be used to draw this resource.
-     */
-    public static final Drawable getDrawable(Context context, int id) {
-        return context.getDrawable(id);
-    }
-
-    /**
-     * Returns the absolute path to the directory on the filesystem similar to
-     * {@link Context#getFilesDir()}.  The difference is that files placed under this
-     * directory will be excluded from automatic backup to remote storage on
-     * devices running {@link android.os.Build.VERSION_CODES#LOLLIPOP} or later.  See
-     * {@link android.app.backup.BackupAgent BackupAgent} for a full discussion
-     * of the automatic backup mechanism in Android.
-     *
-     * <p>No permissions are required to read or write to the returned path, since this
-     * path is internal storage.
-     *
-     * @return The path of the directory holding application files that will not be
-     *         automatically backed up to remote storage.
-     *
-     * @see android.content.Context.getFilesDir
-     */
-    public final File getNoBackupFilesDir(Context context) {
-        return context.getNoBackupFilesDir();
-    }
-
-    /**
-     * Returns the absolute path to the application specific cache directory on
-     * the filesystem designed for storing cached code. On devices running
-     * {@link android.os.Build.VERSION_CODES#LOLLIPOP} or later, the system will delete
-     * any files stored in this location both when your specific application is
-     * upgraded, and when the entire platform is upgraded.
-     * <p>
-     * This location is optimal for storing compiled or optimized code generated
-     * by your application at runtime.
-     * <p>
-     * Apps require no extra permissions to read or write to the returned path,
-     * since this path lives in their private storage.
-     *
-     * @return The path of the directory holding application code cache files.
-     */
-    public final File getCodeCacheDir(Context context) {
-        return context.getCodeCacheDir();
-    }
-}

AndroidCompat/src/main/java/android/support/v4/os/EnvironmentCompat.java

@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.support.v4.os;
-
-import android.os.Environment;
-
-import java.io.File;
-
-/**
- * Helper for accessing features in {@link Environment} introduced after API
- * level 4 in a backwards compatible fashion.
- */
-public class EnvironmentCompat {
-    /**
-     * Unknown storage state, such as when a path isn't backed by known storage
-     * media.
-     *
-     * @see #getStorageState(File)
-     */
-    public static final String MEDIA_UNKNOWN = "unknown";
-
-    /**
-     * Returns the current state of the storage device that provides the given
-     * path.
-     *
-     * @return one of {@link #MEDIA_UNKNOWN}, {@link Environment#MEDIA_REMOVED},
-     *         {@link Environment#MEDIA_UNMOUNTED},
-     *         {@link Environment#MEDIA_CHECKING},
-     *         {@link Environment#MEDIA_NOFS},
-     *         {@link Environment#MEDIA_MOUNTED},
-     *         {@link Environment#MEDIA_MOUNTED_READ_ONLY},
-     *         {@link Environment#MEDIA_SHARED},
-     *         {@link Environment#MEDIA_BAD_REMOVAL}, or
-     *         {@link Environment#MEDIA_UNMOUNTABLE}.
-     */
-    public static String getStorageState(File path) {
-        return Environment.getStorageState(path);
-    }
-}

AndroidCompat/src/main/java/android/support/v7/preference/PreferenceDataStore.java

@@ -1,193 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.support.v7.preference;
-
-import android.support.annotation.Nullable;
-
-import java.util.Set;
-
-/**
- * A data store interface to be implemented and provided to the Preferences framework. This can be
- * used to replace the default {@link android.content.SharedPreferences}, if needed.
- *
- * <p>In most cases you want to use {@link android.content.SharedPreferences} as it is automatically
- * backed up and migrated to new devices. However, providing custom data store to preferences can be
- * useful if your app stores its preferences in a local db, cloud or they are device specific like
- * "Developer settings". It might be also useful when you want to use the preferences UI but
- * the data are not supposed to be stored at all because they are valid per session only.
- *
- * <p>Once a put method is called it is full responsibility of the data store implementation to
- * safely store the given values. Time expensive operations need to be done in the background to
- * prevent from blocking the UI. You also need to have a plan on how to serialize the data in case
- * the activity holding this object gets destroyed.
- *
- * <p>By default, all "put" methods throw {@link UnsupportedOperationException}.
- */
-public abstract class PreferenceDataStore {
-
-    /**
-     * Sets a {@link String} value to the data store.
-     *
-     * <p>Once the value is set the data store is responsible for holding it.
-     *
-     * @param key the name of the preference to modify
-     * @param value the new value for the preference
-     * @see #getString(String, String)
-     */
-    public void putString(String key, @Nullable String value) {
-        throw new UnsupportedOperationException("Not implemented on this data store");
-    }
-
-    /**
-     * Sets a set of Strings to the data store.
-     *
-     * <p>Once the value is set the data store is responsible for holding it.
-     *
-     * @param key the name of the preference to modify
-     * @param values the set of new values for the preference
-     * @see #getStringSet(String, Set<String>)
-     */
-    public void putStringSet(String key, @Nullable Set<String> values) {
-        throw new UnsupportedOperationException("Not implemented on this data store");
-    }
-
-    /**
-     * Sets an {@link Integer} value to the data store.
-     *
-     * <p>Once the value is set the data store is responsible for holding it.
-     *
-     * @param key the name of the preference to modify
-     * @param value the new value for the preference
-     * @see #getInt(String, int)
-     */
-    public void putInt(String key, int value) {
-        throw new UnsupportedOperationException("Not implemented on this data store");
-    }
-
-    /**
-     * Sets a {@link Long} value to the data store.
-     *
-     * <p>Once the value is set the data store is responsible for holding it.
-     *
-     * @param key the name of the preference to modify
-     * @param value the new value for the preference
-     * @see #getLong(String, long)
-     */
-    public void putLong(String key, long value) {
-        throw new UnsupportedOperationException("Not implemented on this data store");
-    }
-
-    /**
-     * Sets a {@link Float} value to the data store.
-     *
-     * <p>Once the value is set the data store is responsible for holding it.
-     *
-     * @param key the name of the preference to modify
-     * @param value the new value for the preference
-     * @see #getFloat(String, float)
-     */
-    public void putFloat(String key, float value) {
-        throw new UnsupportedOperationException("Not implemented on this data store");
-    }
-
-    /**
-     * Sets a {@link Boolean} value to the data store.
-     *
-     * <p>Once the value is set the data store is responsible for holding it.
-     *
-     * @param key the name of the preference to modify
-     * @param value the new value for the preference
-     * @see #getBoolean(String, boolean)
-     */
-    public void putBoolean(String key, boolean value) {
-        throw new UnsupportedOperationException("Not implemented on this data store");
-    }
-
-    /**
-     * Retrieves a {@link String} value from the data store.
-     *
-     * @param key the name of the preference to retrieve
-     * @param defValue value to return if this preference does not exist in the storage
-     * @return the value from the data store or the default return value
-     * @see #putString(String, String)
-     */
-    @Nullable
-    public String getString(String key, @Nullable String defValue) {
-        return defValue;
-    }
-
-    /**
-     * Retrieves a set of Strings from the data store.
-     *
-     * @param key the name of the preference to retrieve
-     * @param defValues values to return if this preference does not exist in the storage
-     * @return the values from the data store or the default return values
-     * @see #putStringSet(String, Set<String>)
-     */
-    @Nullable
-    public Set<String> getStringSet(String key, @Nullable Set<String> defValues) {
-        return defValues;
-    }
-
-    /**
-     * Retrieves an {@link Integer} value from the data store.
-     *
-     * @param key the name of the preference to retrieve
-     * @param defValue value to return if this preference does not exist in the storage
-     * @return the value from the data store or the default return value
-     * @see #putInt(String, int)
-     */
-    public int getInt(String key, int defValue) {
-        return defValue;
-    }
-
-    /**
-     * Retrieves a {@link Long} value from the data store.
-     *
-     * @param key the name of the preference to retrieve
-     * @param defValue value to return if this preference does not exist in the storage
-     * @return the value from the data store or the default return value
-     * @see #putLong(String, long)
-     */
-    public long getLong(String key, long defValue) {
-        return defValue;
-    }
-
-    /**
-     * Retrieves a {@link Float} value from the data store.
-     *
-     * @param key the name of the preference to retrieve
-     * @param defValue value to return if this preference does not exist in the storage
-     * @return the value from the data store or the default return value
-     * @see #putFloat(String, float)
-     */
-    public float getFloat(String key, float defValue) {
-        return defValue;
-    }
-
-    /**
-     * Retrieves a {@link Boolean} value from the data store.
-     *
-     * @param key the name of the preference to retrieve
-     * @param defValue value to return if this preference does not exist in the storage
-     * @return the value from the data store or the default return value
-     * @see #getBoolean(String, boolean)
-     */
-    public boolean getBoolean(String key, boolean defValue) {
-        return defValue;
-    }
-}

AndroidCompat/src/main/java/android/support/v7/preference/PreferenceScreen.java

@@ -1,4 +0,0 @@
-package android.support.v7.preference;
-
-public class PreferenceScreen {
-}

AndroidCompat/src/main/java/android/widget/EditText.java

@@ -0,0 +1,40 @@
+package android.widget;
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+public class EditText {
+    public EditText(android.content.Context context) { throw new RuntimeException("Stub!"); }
+
+    public EditText(android.content.Context context, android.util.AttributeSet attrs) { throw new RuntimeException("Stub!"); }
+
+    public EditText(android.content.Context context, android.util.AttributeSet attrs, int defStyleAttr) { throw new RuntimeException("Stub!"); }
+
+    public EditText(android.content.Context context, android.util.AttributeSet attrs, int defStyleAttr, int defStyleRes) { throw new RuntimeException("Stub!"); }
+
+    public boolean getFreezesText() { throw new RuntimeException("Stub!"); }
+
+    protected boolean getDefaultEditable() { throw new RuntimeException("Stub!"); }
+
+    protected android.text.method.MovementMethod getDefaultMovementMethod() { throw new RuntimeException("Stub!"); }
+
+    public android.text.Editable getText() { throw new RuntimeException("Stub!"); }
+
+    public void setText(java.lang.CharSequence text, android.widget.TextView.BufferType type) { throw new RuntimeException("Stub!"); }
+
+    public void setSelection(int start, int stop) { throw new RuntimeException("Stub!"); }
+
+    public void setSelection(int index) { throw new RuntimeException("Stub!"); }
+
+    public void selectAll() { throw new RuntimeException("Stub!"); }
+
+    public void extendSelection(int index) { throw new RuntimeException("Stub!"); }
+
+    public void setEllipsize(android.text.TextUtils.TruncateAt ellipsis) { throw new RuntimeException("Stub!"); }
+
+    public java.lang.CharSequence getAccessibilityClassName() { throw new RuntimeException("Stub!"); }
+}

AndroidCompat/src/main/java/android/widget/Toast.java

@@ -0,0 +1,91 @@
+package android.widget;
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+public class Toast {
+    public static final int LENGTH_LONG = 1;
+    public static final int LENGTH_SHORT = 0;
+
+    private CharSequence text;
+
+    private Toast(CharSequence text) {
+        this.text = text;
+    }
+
+    public Toast(android.content.Context context) {
+        throw new RuntimeException("Stub!");
+    }
+
+    public void show() {
+        System.out.printf("made a Toast: \"%s\"\n", text.toString());
+    }
+
+    public void cancel() {
+        throw new RuntimeException("Stub!");
+    }
+
+    public void setView(android.view.View view) {
+        throw new RuntimeException("Stub!");
+    }
+
+    public android.view.View getView() {
+        throw new RuntimeException("Stub!");
+    }
+
+    public void setDuration(int duration) {
+        throw new RuntimeException("Stub!");
+    }
+
+    public int getDuration() {
+        throw new RuntimeException("Stub!");
+    }
+
+    public void setMargin(float horizontalMargin, float verticalMargin) {
+        throw new RuntimeException("Stub!");
+    }
+
+    public float getHorizontalMargin() {
+        throw new RuntimeException("Stub!");
+    }
+
+    public float getVerticalMargin() {
+        throw new RuntimeException("Stub!");
+    }
+
+    public void setGravity(int gravity, int xOffset, int yOffset) {
+        throw new RuntimeException("Stub!");
+    }
+
+    public int getGravity() {
+        throw new RuntimeException("Stub!");
+    }
+
+    public int getXOffset() {
+        throw new RuntimeException("Stub!");
+    }
+
+    public int getYOffset() {
+        throw new RuntimeException("Stub!");
+    }
+
+    public static Toast makeText(android.content.Context context, java.lang.CharSequence text, int duration) {
+        return new Toast(text);
+    }
+
+    public static android.widget.Toast makeText(android.content.Context context, int resId, int duration) throws android.content.res.Resources.NotFoundException {
+        throw new RuntimeException("Stub!");
+    }
+
+    public void setText(int resId) {
+        throw new RuntimeException("Stub!");
+    }
+
+    public void setText(java.lang.CharSequence s) {
+        throw new RuntimeException("Stub!");
+    }
+}

AndroidCompat/src/main/java/androidx/preference/CheckBoxPreference.java

@@ -0,0 +1,18 @@
+package androidx.preference;
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import android.content.Context;
+
+public class CheckBoxPreference extends TwoStatePreference {
+    // reference: https://android.googlesource.com/platform/frameworks/support/+/996971f962fcd554339a7cb2859cef9ca89dbcb7/preference/preference/src/main/java/androidx/preference/CheckBoxPreference.java
+
+    public CheckBoxPreference(Context context) {
+        super(context);
+    }
+}

AndroidCompat/src/main/java/androidx/preference/DialogPreference.java

@@ -0,0 +1,33 @@
+package androidx.preference;
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import android.content.Context;
+
+public abstract class DialogPreference extends Preference {
+    private CharSequence dialogTitle;
+    private CharSequence dialogMessage;
+
+    public DialogPreference(Context context) { super(context); }
+
+    public CharSequence getDialogTitle() {
+        return dialogTitle;
+    }
+
+    public void setDialogTitle(CharSequence dialogTitle) {
+        this.dialogTitle = dialogTitle;
+    }
+
+    public CharSequence getDialogMessage() {
+        return dialogMessage;
+    }
+
+    public void setDialogMessage(CharSequence dialogMessage) {
+        this.dialogMessage = dialogMessage;
+    }
+}

AndroidCompat/src/main/java/androidx/preference/EditTextPreference.java

@@ -0,0 +1,53 @@
+package androidx.preference;
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.content.Context;
+import android.widget.EditText;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+public class EditTextPreference extends DialogPreference {
+    // reference: https://android.googlesource.com/platform/frameworks/support/+/996971f962fcd554339a7cb2859cef9ca89dbcb7/preference/preference/src/main/java/androidx/preference/EditTextPreference.java
+
+    private String text;
+
+    @JsonIgnore
+    private OnBindEditTextListener onBindEditTextListener;
+
+    public EditTextPreference(Context context) {
+        super(context);
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public OnBindEditTextListener getOnBindEditTextListener() {
+        return onBindEditTextListener;
+    }
+
+    public void setOnBindEditTextListener(@Nullable OnBindEditTextListener onBindEditTextListener) {
+        this.onBindEditTextListener = onBindEditTextListener;
+    }
+
+    public interface OnBindEditTextListener {
+        void onBindEditText(@NonNull EditText editText);
+    }
+
+    /** Tachidesk specific API */
+    @Override
+    public String getDefaultValueType() {
+        return "String";
+    }
+}

AndroidCompat/src/main/java/androidx/preference/ListPreference.java

@@ -0,0 +1,66 @@
+package androidx.preference;
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import android.content.Context;
+import android.text.TextUtils;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+public class ListPreference extends Preference {
+    // reference: https://android.googlesource.com/platform/frameworks/support/+/996971f962fcd554339a7cb2859cef9ca89dbcb7/preference/preference/src/main/java/androidx/preference/ListPreference.java
+    // Note: remove @JsonIgnore and implement methods if any extension ever uses these methods or the variables behind them
+
+    private CharSequence[] entries;
+    private CharSequence[] entryValues;
+
+    public ListPreference(Context context) {
+        super(context);
+    }
+
+    public CharSequence[] getEntries() {
+        return entries;
+    }
+
+    public void setEntries(CharSequence[] entries) {
+        this.entries = entries;
+    }
+
+    public int findIndexOfValue(String value) {
+        if (value != null && entryValues != null) {
+            for (int i = entryValues.length - 1; i >= 0; i--) {
+                if (TextUtils.equals(entryValues[i].toString(), value)) {
+                    return i;
+                }
+            }
+        }
+        return -1;
+    }
+
+    public CharSequence[] getEntryValues() {
+        return entryValues;
+    }
+
+    public void setEntryValues(CharSequence[] entryValues) {
+        this.entryValues = entryValues;
+    }
+
+    @JsonIgnore
+    public void setValueIndex(int index) { throw new RuntimeException("Stub!"); }
+
+    @JsonIgnore
+    public String getValue() { throw new RuntimeException("Stub!"); }
+
+    @JsonIgnore
+    public void setValue(String value) { throw new RuntimeException("Stub!"); }
+
+    /** Tachidesk specific API */
+    @Override
+    public String getDefaultValueType() {
+        return "String";
+    }
+}

AndroidCompat/src/main/java/androidx/preference/MultiSelectListPreference.java

@@ -0,0 +1,45 @@
+package androidx.preference;
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import android.content.Context;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import java.util.Set;
+
+public class MultiSelectListPreference extends DialogPreference {
+    // Note: remove @JsonIgnore and implement methods if any extension ever uses these methods or the variables behind them
+
+    public MultiSelectListPreference(Context context) { super(context); }
+
+    @JsonIgnore
+    public void setEntries(CharSequence[] entries) { throw new RuntimeException("Stub!"); }
+
+    @JsonIgnore
+    public CharSequence[] getEntries() { throw new RuntimeException("Stub!"); }
+
+    @JsonIgnore
+    public void setEntryValues(CharSequence[] entryValues) { throw new RuntimeException("Stub!"); }
+
+    @JsonIgnore
+    public CharSequence[] getEntryValues() { throw new RuntimeException("Stub!"); }
+
+    @JsonIgnore
+    public void setValues(Set<String> values) { throw new RuntimeException("Stub!"); }
+
+    @JsonIgnore
+    public Set<String> getValues() { throw new RuntimeException("Stub!"); }
+
+    public int findIndexOfValue(String value) { throw new RuntimeException("Stub!"); }
+
+    /** Tachidesk specific API */
+    @Override
+    public String getDefaultValueType() {
+        return "Set";
+    }
+}

AndroidCompat/src/main/java/androidx/preference/Preference.java

@@ -0,0 +1,140 @@
+package androidx.preference;
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+/**
+ * A minimal implementation of androidx.preference.Preference
+ */
+public class Preference {
+    // reference: https://android.googlesource.com/platform/frameworks/support/+/996971f962fcd554339a7cb2859cef9ca89dbcb7/preference/preference/src/main/java/androidx/preference/Preference.java
+    // Note: `Preference` doesn't actually hold or persist the value, `OnPreferenceChangeListener` is called and it's up to the extension to persist it.
+
+    @JsonIgnore
+    protected Context context;
+
+    private String key;
+    private CharSequence title;
+    private CharSequence summary;
+    private Object defaultValue;
+
+    /** Tachidesk specific API */
+    @JsonIgnore
+    private SharedPreferences sharedPreferences;
+
+    @JsonIgnore
+    public OnPreferenceChangeListener onChangeListener;
+
+    public Preference(Context context) {
+        this.context = context;
+    }
+
+    public Context getContext() {
+        return context;
+    }
+
+    public void setOnPreferenceChangeListener(OnPreferenceChangeListener onPreferenceChangeListener) {
+        this.onChangeListener = onPreferenceChangeListener;
+    }
+
+    public void setOnPreferenceClickListener(OnPreferenceClickListener onPreferenceClickListener) {
+        throw new RuntimeException("Stub!");
+    }
+
+    public CharSequence getTitle() {
+        return title;
+    }
+
+    public void setTitle(CharSequence title) {
+        this.title = title;
+    }
+
+    public CharSequence getSummary() {
+        return summary;
+    }
+
+    public void setSummary(CharSequence summary) {
+        this.summary = summary;
+    }
+
+    public void setEnabled(boolean enabled) {
+        throw new RuntimeException("Stub!");
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public void setDefaultValue(Object defaultValue) {
+        this.defaultValue = defaultValue;
+    }
+
+    public boolean callChangeListener(Object newValue) {
+        return onChangeListener == null || onChangeListener.onPreferenceChange(this, newValue);
+    }
+
+    public Object getDefaultValue() {
+        return defaultValue;
+    }
+
+    /** Tachidesk specific API */
+    public String getDefaultValueType() {
+        return defaultValue.getClass().getSimpleName();
+    }
+
+    /** Tachidesk specific API */
+    public SharedPreferences getSharedPreferences() {
+        return sharedPreferences;
+    }
+
+    /** Tachidesk specific API */
+    public void setSharedPreferences(SharedPreferences sharedPreferences) {
+        this.sharedPreferences = sharedPreferences;
+    }
+
+    public interface OnPreferenceChangeListener {
+        boolean onPreferenceChange(Preference preference, Object newValue);
+    }
+
+    public interface OnPreferenceClickListener {
+        boolean onPreferenceClick(Preference preference);
+    }
+
+    /** Tachidesk specific API */
+    public Object getCurrentValue() {
+        switch (getDefaultValueType()) {
+            case "String":
+                return sharedPreferences.getString(key, (String)defaultValue);
+            case "Boolean":
+                return sharedPreferences.getBoolean(key, (Boolean)defaultValue);
+            default:
+                throw new RuntimeException("Unsupported type");
+        }
+    }
+
+    /** Tachidesk specific API */
+    public void saveNewValue(Object value) {
+        switch (getDefaultValueType()) {
+            case "String":
+                sharedPreferences.edit().putString(key, (String)value).apply();
+                break;
+            case "Boolean":
+                sharedPreferences.edit().putBoolean(key, (Boolean)value).apply();
+                break;
+            default:
+                throw new RuntimeException("Unsupported type");
+        }
+    }
+}

AndroidCompat/src/main/java/androidx/preference/PreferenceScreen.java

@@ -0,0 +1,36 @@
+package androidx.preference;
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import android.content.Context;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class PreferenceScreen extends Preference {
+    /** Tachidesk specific API */
+    private List<Preference> preferences = new LinkedList<>();
+
+    public PreferenceScreen(Context context) {
+        super(context);
+    }
+
+    public boolean addPreference(Preference preference) {
+        // propagate own shared preferences
+        preference.setSharedPreferences(getSharedPreferences());
+
+        preferences.add(preference);
+
+        return true;
+    }
+
+    /** Tachidesk specific API */
+    public List<Preference> getPreferences(){
+        return preferences;
+    }
+}

AndroidCompat/src/main/java/androidx/preference/SwitchPreferenceCompat.java

@@ -0,0 +1,18 @@
+package androidx.preference;
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import android.content.Context;
+
+public class SwitchPreferenceCompat extends TwoStatePreference {
+    // reference: https://android.googlesource.com/platform/frameworks/support/+/996971f962fcd554339a7cb2859cef9ca89dbcb7/preference/preference/src/main/java/androidx/preference/CheckBoxPreference.java
+
+    public SwitchPreferenceCompat(Context context) {
+        super(context);
+    }
+}

AndroidCompat/src/main/java/androidx/preference/TwoStatePreference.java

@@ -0,0 +1,47 @@
+package androidx.preference;
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import android.content.Context;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+public class TwoStatePreference extends Preference {
+    // Note: remove @JsonIgnore and implement methods if any extension ever uses these methods or the variables behind them
+
+    public TwoStatePreference(Context context) { super(context); }
+
+    @JsonIgnore
+    public boolean isChecked() { throw new RuntimeException("Stub!"); }
+
+    @JsonIgnore
+    public void setChecked(boolean checked) { throw new RuntimeException("Stub!"); }
+
+    @JsonIgnore
+    public CharSequence getSummaryOn() { throw new RuntimeException("Stub!"); }
+
+    @JsonIgnore
+    public void setSummaryOn(CharSequence summary) { throw new RuntimeException("Stub!"); }
+
+    @JsonIgnore
+    public CharSequence getSummaryOff() { throw new RuntimeException("Stub!"); }
+
+    @JsonIgnore
+    public void setSummaryOff(CharSequence summary) { throw new RuntimeException("Stub!"); }
+
+    @JsonIgnore
+    public boolean getDisableDependentsState() { throw new RuntimeException("Stub!"); }
+
+    @JsonIgnore
+    public void setDisableDependentsState(boolean disableDependentsState) { throw new RuntimeException("Stub!"); }
+
+    /** Tachidesk specific API */
+    @Override
+    public String getDefaultValueType() {
+        return "Boolean";
+    }
+}

AndroidCompat/src/main/java/com/f2prateek/package-info.java

@@ -1,2 +0,0 @@
-package com.f2prateek;
-//TODO Consider if we can change this package into an Android dependency

AndroidCompat/src/main/java/com/f2prateek/rx/preferences/BooleanAdapter.java

@@ -1,34 +0,0 @@
-/*
-Copyright 2014 Prateek Srivastava
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-This file may have been modified after being copied from it's original source.
- */
-package com.f2prateek.rx.preferences;
-
-import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
-
-final class BooleanAdapter implements Preference.Adapter<Boolean> {
-  static final BooleanAdapter INSTANCE = new BooleanAdapter();
-
-  @Override public Boolean get(@NonNull String key, @NonNull SharedPreferences preferences) {
-    return preferences.getBoolean(key, false);
-  }
-
-  @Override public void set(@NonNull String key, @NonNull Boolean value,
-      @NonNull SharedPreferences.Editor editor) {
-    editor.putBoolean(key, value);
-  }
-}

AndroidCompat/src/main/java/com/f2prateek/rx/preferences/EnumAdapter.java

@@ -1,40 +0,0 @@
-/*
-Copyright 2014 Prateek Srivastava
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-This file may have been modified after being copied from it's original source.
- */
-package com.f2prateek.rx.preferences;
-
-import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
-
-final class EnumAdapter<T extends Enum<T>> implements Preference.Adapter<T> {
-  private final Class<T> enumClass;
-
-  EnumAdapter(Class<T> enumClass) {
-    this.enumClass = enumClass;
-  }
-
-  @Override public T get(@NonNull String key, @NonNull SharedPreferences preferences) {
-    String value = preferences.getString(key, null);
-    assert value != null; // Not called unless key is present.
-    return Enum.valueOf(enumClass, value);
-  }
-
-  @Override
-  public void set(@NonNull String key, @NonNull T value, @NonNull SharedPreferences.Editor editor) {
-    editor.putString(key, value.name());
-  }
-}

AndroidCompat/src/main/java/com/f2prateek/rx/preferences/FloatAdapter.java

@@ -1,34 +0,0 @@
-/*
-Copyright 2014 Prateek Srivastava
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-This file may have been modified after being copied from it's original source.
- */
-package com.f2prateek.rx.preferences;
-
-import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
-
-final class FloatAdapter implements Preference.Adapter<Float> {
-  static final FloatAdapter INSTANCE = new FloatAdapter();
-
-  @Override public Float get(@NonNull String key, @NonNull SharedPreferences preferences) {
-    return preferences.getFloat(key, 0f);
-  }
-
-  @Override public void set(@NonNull String key, @NonNull Float value,
-      @NonNull SharedPreferences.Editor editor) {
-    editor.putFloat(key, value);
-  }
-}

AndroidCompat/src/main/java/com/f2prateek/rx/preferences/IntegerAdapter.java

@@ -1,34 +0,0 @@
-/*
-Copyright 2014 Prateek Srivastava
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-This file may have been modified after being copied from it's original source.
- */
-package com.f2prateek.rx.preferences;
-
-import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
-
-final class IntegerAdapter implements Preference.Adapter<Integer> {
-  static final IntegerAdapter INSTANCE = new IntegerAdapter();
-
-  @Override public Integer get(@NonNull String key, @NonNull SharedPreferences preferences) {
-    return preferences.getInt(key, 0);
-  }
-
-  @Override public void set(@NonNull String key, @NonNull Integer value,
-      @NonNull SharedPreferences.Editor editor) {
-    editor.putInt(key, value);
-  }
-}

AndroidCompat/src/main/java/com/f2prateek/rx/preferences/LongAdapter.java

@@ -1,34 +0,0 @@
-/*
-Copyright 2014 Prateek Srivastava
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-This file may have been modified after being copied from it's original source.
- */
-package com.f2prateek.rx.preferences;
-
-import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
-
-final class LongAdapter implements Preference.Adapter<Long> {
-  static final LongAdapter INSTANCE = new LongAdapter();
-
-  @Override public Long get(@NonNull String key, @NonNull SharedPreferences preferences) {
-    return preferences.getLong(key, 0L);
-  }
-
-  @Override public void set(@NonNull String key, @NonNull Long value,
-      @NonNull SharedPreferences.Editor editor) {
-    editor.putLong(key, value);
-  }
-}

AndroidCompat/src/main/java/com/f2prateek/rx/preferences/Preference.java

@@ -1,127 +0,0 @@
-/*
-Copyright 2014 Prateek Srivastava
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-This file has been modified after being copied from it's original source.
- */
-package com.f2prateek.rx.preferences;
-
-import android.content.SharedPreferences;
-import android.support.annotation.CheckResult;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import rx.Observable;
-import rx.functions.Action1;
-
-/** A preference of type {@link T}. Instances can be created from {@link RxSharedPreferences}. */
-public final class Preference<T> {
-  /** Stores and retrieves instances of {@code T} in {@link SharedPreferences}. */
-  public interface Adapter<T> {
-    /** Retrieve the value for {@code key} from {@code preferences}. */
-    T get(@NonNull String key, @NonNull SharedPreferences preferences);
-
-    /**
-     * Store non-null {@code value} for {@code key} in {@code editor}.
-     * <p>
-     * Note: Implementations <b>must not</b> call {@code commit()} or {@code apply()} on
-     * {@code editor}.
-     */
-    void set(@NonNull String key, @NonNull T value, @NonNull SharedPreferences.Editor editor);
-  }
-
-  private final SharedPreferences preferences;
-  private final String key;
-  private final T defaultValue;
-  private final Adapter<T> adapter;
-  private final Observable<T> values;
-
-  Preference(SharedPreferences preferences, final String key, T defaultValue, Adapter<T> adapter,
-      Observable<String> keyChanges) {
-    this.preferences = preferences;
-    this.key = key;
-    this.defaultValue = defaultValue;
-    this.adapter = adapter;
-    this.values = keyChanges
-        .filter(key::equals)
-        .startWith("<init>") // Dummy value to trigger initial load.
-        .onBackpressureLatest()
-        .map(ignored -> get());
-  }
-
-  /** The key for which this preference will store and retrieve values. */
-  @NonNull
-  public String key() {
-    return key;
-  }
-
-  /** The value used if none is stored. May be {@code null}. */
-  @Nullable
-  public T defaultValue() {
-    return defaultValue;
-  }
-
-  /**
-   * Retrieve the current value for this preference. Returns {@link #defaultValue()} if no value is
-   * set.
-   */
-  @Nullable
-  public T get() {
-    if (!preferences.contains(key)) {
-      return defaultValue;
-    }
-    return adapter.get(key, preferences);
-  }
-
-  /**
-   * Change this preference's stored value to {@code value}. A value of {@code null} will delete the
-   * preference.
-   */
-  public void set(@Nullable T value) {
-    SharedPreferences.Editor editor = preferences.edit();
-    if (value == null) {
-      editor.remove(key);
-    } else {
-      adapter.set(key, value, editor);
-    }
-    editor.apply();
-  }
-
-  /** Returns true if this preference has a stored value. */
-  public boolean isSet() {
-    return preferences.contains(key);
-  }
-
-  /** Delete the stored value for this preference, if any. */
-  public void delete() {
-    set(null);
-  }
-
-  /**
-   * Observe changes to this preference. The current value or {@link #defaultValue()} will be
-   * emitted on first subscribe.
-   */
-  @CheckResult @NonNull
-  public Observable<T> asObservable() {
-    return values;
-  }
-
-  /**
-   * An action which stores a new value for this preference. Passing {@code null} will delete the
-   * preference.
-   */
-  @CheckResult @NonNull
-  public Action1<? super T> asAction() {
-    return (Action1<T>) this::set;
-  }
-}

AndroidCompat/src/main/java/com/f2prateek/rx/preferences/RxSharedPreferences.java

@@ -1,178 +0,0 @@
-/*
-Copyright 2014 Prateek Srivastava
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-This file has been modified after being copied from it's original source.
- */
-package com.f2prateek.rx.preferences;
-
-import android.annotation.TargetApi;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import android.support.annotation.CheckResult;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import java.util.Collections;
-import java.util.Set;
-import rx.Observable;
-import rx.subscriptions.Subscriptions;
-
-import static android.os.Build.VERSION_CODES.HONEYCOMB;
-import static com.f2prateek.rx.preferences.Preconditions.checkNotNull;
-
-/** A factory for reactive {@link Preference} objects. */
-public final class RxSharedPreferences {
-  private static final Float DEFAULT_FLOAT = 0f;
-  private static final Integer DEFAULT_INTEGER = 0;
-  private static final Boolean DEFAULT_BOOLEAN = Boolean.FALSE;
-  private static final Long DEFAULT_LONG = 0L;
-
-  /** Create an instance of {@link RxSharedPreferences} for {@code preferences}. */
-  @CheckResult @NonNull
-  public static RxSharedPreferences create(@NonNull SharedPreferences preferences) {
-    checkNotNull(preferences, "preferences == null");
-    return new RxSharedPreferences(preferences);
-  }
-
-  private final SharedPreferences preferences;
-  private final Observable<String> keyChanges;
-
-  private RxSharedPreferences(final SharedPreferences preferences) {
-    this.preferences = preferences;
-    this.keyChanges = Observable.create((Observable.OnSubscribe<String>) subscriber -> {
-      final OnSharedPreferenceChangeListener listener = (preferences1, key) -> subscriber.onNext(key);
-
-      preferences.registerOnSharedPreferenceChangeListener(listener);
-
-      subscriber.add(Subscriptions.create(() -> preferences.unregisterOnSharedPreferenceChangeListener(listener)));
-    }).share();
-  }
-
-  /** Create a boolean preference for {@code key}. Default is {@code false}. */
-  @CheckResult @NonNull
-  public Preference<Boolean> getBoolean(@NonNull String key) {
-    return getBoolean(key, DEFAULT_BOOLEAN);
-  }
-
-  /** Create a boolean preference for {@code key} with a default of {@code defaultValue}. */
-  @CheckResult @NonNull
-  public Preference<Boolean> getBoolean(@NonNull String key, @Nullable Boolean defaultValue) {
-    checkNotNull(key, "key == null");
-    return new Preference<>(preferences, key, defaultValue, BooleanAdapter.INSTANCE, keyChanges);
-  }
-
-  /** Create an enum preference for {@code key}. Default is {@code null}. */
-  @CheckResult @NonNull
-  public <T extends Enum<T>> Preference<T> getEnum(@NonNull String key,
-      @NonNull Class<T> enumClass) {
-    return getEnum(key, null, enumClass);
-  }
-
-  /** Create an enum preference for {@code key} with a default of {@code defaultValue}. */
-  @CheckResult @NonNull
-  public <T extends Enum<T>> Preference<T> getEnum(@NonNull String key, @Nullable T defaultValue,
-      @NonNull Class<T> enumClass) {
-    checkNotNull(key, "key == null");
-    checkNotNull(enumClass, "enumClass == null");
-    Preference.Adapter<T> adapter = new EnumAdapter<>(enumClass);
-    return new Preference<>(preferences, key, defaultValue, adapter, keyChanges);
-  }
-
-  /** Create a float preference for {@code key}. Default is {@code 0}. */
-  @CheckResult @NonNull
-  public Preference<Float> getFloat(@NonNull String key) {
-    return getFloat(key, DEFAULT_FLOAT);
-  }
-
-  /** Create a float preference for {@code key} with a default of {@code defaultValue}. */
-  @CheckResult @NonNull
-  public Preference<Float> getFloat(@NonNull String key, @Nullable Float defaultValue) {
-    checkNotNull(key, "key == null");
-    return new Preference<>(preferences, key, defaultValue, FloatAdapter.INSTANCE, keyChanges);
-  }
-
-  /** Create an integer preference for {@code key}. Default is {@code 0}. */
-  @CheckResult @NonNull
-  public Preference<Integer> getInteger(@NonNull String key) {
-    //noinspection UnnecessaryBoxing
-    return getInteger(key, DEFAULT_INTEGER);
-  }
-
-  /** Create an integer preference for {@code key} with a default of {@code defaultValue}. */
-  @CheckResult @NonNull
-  public Preference<Integer> getInteger(@NonNull String key, @Nullable Integer defaultValue) {
-    checkNotNull(key, "key == null");
-    return new Preference<>(preferences, key, defaultValue, IntegerAdapter.INSTANCE, keyChanges);
-  }
-
-  /** Create a long preference for {@code key}. Default is {@code 0}. */
-  @CheckResult @NonNull
-  public Preference<Long> getLong(@NonNull String key) {
-    //noinspection UnnecessaryBoxing
-    return getLong(key, DEFAULT_LONG);
-  }
-
-  /** Create a long preference for {@code key} with a default of {@code defaultValue}. */
-  @CheckResult @NonNull
-  public Preference<Long> getLong(@NonNull String key, @Nullable Long defaultValue) {
-    checkNotNull(key, "key == null");
-    return new Preference<>(preferences, key, defaultValue, LongAdapter.INSTANCE, keyChanges);
-  }
-
-  /** Create a preference of type {@code T} for {@code key}. Default is {@code null}. */
-  @CheckResult @NonNull
-  public <T> Preference<T> getObject(@NonNull String key, @NonNull Preference.Adapter<T> adapter) {
-    return getObject(key, null, adapter);
-  }
-
-  /**
-   * Create a preference for type {@code T} for {@code key} with a default of {@code defaultValue}.
-   */
-  @CheckResult @NonNull
-  public <T> Preference<T> getObject(@NonNull String key, @Nullable T defaultValue,
-      @NonNull Preference.Adapter<T> adapter) {
-    checkNotNull(key, "key == null");
-    checkNotNull(adapter, "adapter == null");
-    return new Preference<>(preferences, key, defaultValue, adapter, keyChanges);
-  }
-
-  /** Create a string preference for {@code key}. Default is {@code null}. */
-  @CheckResult @NonNull
-  public Preference<String> getString(@NonNull String key) {
-    return getString(key, null);
-  }
-
-  /** Create a string preference for {@code key} with a default of {@code defaultValue}. */
-  @CheckResult @NonNull
-  public Preference<String> getString(@NonNull String key, @Nullable String defaultValue) {
-    checkNotNull(key, "key == null");
-    return new Preference<>(preferences, key, defaultValue, StringAdapter.INSTANCE, keyChanges);
-  }
-
-  /** Create a string set preference for {@code key}. Default is an empty set. */
-  @TargetApi(HONEYCOMB)
-  @CheckResult @NonNull
-  public Preference<Set<String>> getStringSet(@NonNull String key) {
-    return getStringSet(key, Collections.emptySet());
-  }
-
-  /** Create a string set preference for {@code key} with a default of {@code defaultValue}. */
-  @TargetApi(HONEYCOMB)
-  @CheckResult @NonNull
-  public Preference<Set<String>> getStringSet(@NonNull String key,
-      @NonNull Set<String> defaultValue) {
-    checkNotNull(key, "key == null");
-    return new Preference<>(preferences, key, defaultValue, StringSetAdapter.INSTANCE, keyChanges);
-  }
-}

AndroidCompat/src/main/java/com/f2prateek/rx/preferences/StringAdapter.java

@@ -1,17 +0,0 @@
-package com.f2prateek.rx.preferences;
-
-import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
-
-final class StringAdapter implements Preference.Adapter<String> {
-  static final StringAdapter INSTANCE = new StringAdapter();
-
-  @Override public String get(@NonNull String key, @NonNull SharedPreferences preferences) {
-    return preferences.getString(key, null);
-  }
-
-  @Override public void set(@NonNull String key, @NonNull String value,
-      @NonNull SharedPreferences.Editor editor) {
-    editor.putString(key, value);
-  }
-}

AndroidCompat/src/main/java/com/f2prateek/rx/preferences/StringSetAdapter.java

@@ -1,22 +0,0 @@
-package com.f2prateek.rx.preferences;
-
-import android.annotation.TargetApi;
-import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
-import java.util.Set;
-
-import static android.os.Build.VERSION_CODES.HONEYCOMB;
-
-@TargetApi(HONEYCOMB)
-final class StringSetAdapter implements Preference.Adapter<Set<String>> {
-  static final StringSetAdapter INSTANCE = new StringSetAdapter();
-
-  @Override public Set<String> get(@NonNull String key, @NonNull SharedPreferences preferences) {
-    return preferences.getStringSet(key, null);
-  }
-
-  @Override public void set(@NonNull String key, @NonNull Set<String> value,
-      @NonNull SharedPreferences.Editor editor) {
-    editor.putStringSet(key, value);
-  }
-}

AndroidCompat/src/main/java/com/github/pwittchen/reactivenetwork/library/Connectivity.kt

@@ -1,7 +0,0 @@
-package com.github.pwittchen.reactivenetwork.library
-
-import android.net.NetworkInfo
-
-class Connectivity {
-    val state = NetworkInfo.State.CONNECTED
-}

AndroidCompat/src/main/java/com/github/pwittchen/reactivenetwork/library/ReactiveNetwork.kt

@@ -1,14 +0,0 @@
-package com.github.pwittchen.reactivenetwork.library
-
-import android.content.Context
-import rx.Observable
-
-/**
- * Created by nulldev on 12/29/16.
- */
-
-class ReactiveNetwork {
-    companion object {
-        fun observeNetworkConnectivity(context: Context) = Observable.just(Connectivity())!!
-    }
-}

AndroidCompat/src/main/java/kotlinx/coroutines/experimental/android/HandlerContext.kt

@@ -1,5 +0,0 @@
-package kotlinx.coroutines.experimental.android
-
-import kotlinx.coroutines.GlobalScope
-
-val UI = GlobalScope.coroutineContext

AndroidCompat/src/main/java/rx.android.schedulers/AndroidSchedulers.kt

@@ -1,5 +1,6 @@
 package rx.android.schedulers
 
+import rx.Scheduler
 import rx.internal.schedulers.ImmediateScheduler
 
 class AndroidSchedulers {
@@ -11,6 +12,7 @@ class AndroidSchedulers {
         /**
          * Simulated main thread scheduler
          */
-        fun mainThread() = mainThreadScheduler
+        @JvmStatic
+        fun mainThread(): Scheduler = mainThreadScheduler
     }
 }

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/AndroidCompatInitializer.kt

@@ -2,7 +2,6 @@ package xyz.nulldev.androidcompat
 
 import org.kodein.di.DI
 import org.kodein.di.conf.global
-import xyz.nulldev.androidcompat.bytecode.ModApplier
 import xyz.nulldev.androidcompat.config.ApplicationInfoConfigModule
 import xyz.nulldev.androidcompat.config.FilesConfigModule
 import xyz.nulldev.androidcompat.config.SystemConfigModule
@@ -12,12 +11,7 @@ import xyz.nulldev.ts.config.GlobalConfigManager
  * Initializes the Android compatibility module
  */
 class AndroidCompatInitializer {
-
-    val modApplier by lazy { ModApplier() }
-
     fun init() {
-        modApplier.apply()
-
         DI.global.addImport(AndroidCompatModule().create())
 
         //Register config modules
@@ -26,5 +20,8 @@ class AndroidCompatInitializer {
             ApplicationInfoConfigModule.register(GlobalConfigManager.config),
             SystemConfigModule.register(GlobalConfigManager.config)
         )
+
+        // Set some properties extensions use
+        System.setProperty("http.agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36")
     }
 }

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/androidimpl/CustomContext.java

@@ -38,7 +38,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import xyz.nulldev.androidcompat.info.ApplicationInfoImpl;
 import xyz.nulldev.androidcompat.io.AndroidFiles;
-import xyz.nulldev.androidcompat.io.sharedprefs.JsonSharedPreferences;
+import xyz.nulldev.androidcompat.io.sharedprefs.JavaSharedPreferences;
 import xyz.nulldev.androidcompat.service.ServiceSupport;
 import xyz.nulldev.androidcompat.util.KodeinGlobalHelper;
 
@@ -50,10 +50,9 @@ import java.util.Map;
 /**
  * Custom context implementation.
  *
- * TODO Deal with packagemanager for extension sources
  */
 public class CustomContext extends Context implements DIAware {
-    private DI kodein;
+    private final DI kodein;
     public CustomContext() {
         this(KodeinGlobalHelper.kodein());
     }
@@ -165,23 +164,22 @@ public class CustomContext extends Context implements DIAware {
     /** Fake shared prefs! **/
     private Map<String, SharedPreferences> prefs = new HashMap<>(); //Cache
 
-    private File sharedPrefsFileFromString(String s) {
-        return new File(androidFiles.getPrefsDir(), s + ".json");
-    }
-
     @Override
     public synchronized SharedPreferences getSharedPreferences(String s, int i) {
         SharedPreferences preferences = prefs.get(s);
         //Create new shared preferences if one does not exist
         if(preferences == null) {
-            preferences = getSharedPreferences(sharedPrefsFileFromString(s), i);
+            preferences = new JavaSharedPreferences(s);
             prefs.put(s, preferences);
         }
         return preferences;
     }
 
-    public SharedPreferences getSharedPreferences(File file, int mode) {
+    @Override
-        return new JsonSharedPreferences(file);
+    public SharedPreferences getSharedPreferences(@NotNull File file, int mode) {
+        String path = file.getAbsolutePath().replace('\\', '/');
+        int firstSlash = path.indexOf("/");
+        return new JavaSharedPreferences(path.substring(firstSlash));
     }
 
     @Override
@@ -191,8 +189,8 @@ public class CustomContext extends Context implements DIAware {
 
     @Override
     public boolean deleteSharedPreferences(String name) {
-        prefs.remove(name);
+        JavaSharedPreferences item = (JavaSharedPreferences) prefs.remove(name);
-        return sharedPrefsFileFromString(name).delete();
+        return item.deleteAll();
     }
 
     @Override
@@ -735,4 +733,3 @@ public class CustomContext extends Context implements DIAware {
     }
 }
 
-

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/bytecode/ModApplier.kt

@@ -1,22 +0,0 @@
-package xyz.nulldev.androidcompat.bytecode
-
-import javassist.CtClass
-import mu.KotlinLogging
-
-/**
- * Applies Javassist modifications
- */
-
-class ModApplier {
-
-    val logger = KotlinLogging.logger {}
-
-    fun apply() {
-        logger.info { "Applying Javassist mods..." }
-        val modifiedClasses = mutableListOf<CtClass>()
-
-        modifiedClasses.forEach {
-            it.toClass()
-        }
-    }
-}

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/db/ScrollableResultSet.kt

@@ -4,11 +4,21 @@ import java.io.InputStream
 import java.io.Reader
 import java.math.BigDecimal
 import java.net.URL
-import java.sql.*
 import java.sql.Array
+import java.sql.Blob
+import java.sql.Clob
 import java.sql.Date
-import java.util.*
+import java.sql.NClob
+import java.sql.Ref
+import java.sql.ResultSet
+import java.sql.ResultSetMetaData
+import java.sql.RowId
+import java.sql.SQLXML
+import java.sql.Time
+import java.sql.Timestamp
+import java.util.Calendar
 
+@Suppress("UNCHECKED_CAST")
 class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent {
 
     private val cachedContent = mutableListOf<ResultSetEntry>()

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/io/sharedprefs/JavaSharedPreferences.kt

@@ -0,0 +1,177 @@
+package xyz.nulldev.androidcompat.io.sharedprefs
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import android.content.SharedPreferences
+import com.russhwolf.settings.ExperimentalSettingsApi
+import com.russhwolf.settings.ExperimentalSettingsImplementation
+import com.russhwolf.settings.JvmPreferencesSettings
+import com.russhwolf.settings.serialization.decodeValue
+import com.russhwolf.settings.serialization.encodeValue
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.SerializationException
+import kotlinx.serialization.builtins.SetSerializer
+import kotlinx.serialization.builtins.nullable
+import kotlinx.serialization.builtins.serializer
+import java.util.prefs.PreferenceChangeListener
+import java.util.prefs.Preferences
+
+@OptIn(ExperimentalSettingsImplementation::class, ExperimentalSerializationApi::class, ExperimentalSettingsApi::class)
+class JavaSharedPreferences(key: String) : SharedPreferences {
+    private val javaPreferences = Preferences.userRoot().node("suwayomi/tachidesk/$key")
+    private val preferences = JvmPreferencesSettings(javaPreferences)
+    private val listeners = mutableMapOf<SharedPreferences.OnSharedPreferenceChangeListener, PreferenceChangeListener>()
+
+    // TODO: 2021-05-29 Need to find a way to get this working with all pref types
+    override fun getAll(): MutableMap<String, *> {
+        return preferences.keys.associateWith { preferences.getStringOrNull(it) }.toMutableMap()
+    }
+
+    override fun getString(key: String, defValue: String?): String? {
+        return if (defValue != null) {
+            preferences.getString(key, defValue)
+        } else {
+            preferences.getStringOrNull(key)
+        }
+    }
+
+    override fun getStringSet(key: String, defValues: MutableSet<String>?): MutableSet<String>? {
+        try {
+            return if (defValues != null) {
+                preferences.decodeValue(SetSerializer(String.serializer()).nullable, key, defValues)
+            } else {
+                preferences.decodeValue(SetSerializer(String.serializer()).nullable, key, null)
+            }?.toMutableSet()
+        } catch (e: SerializationException) {
+            throw ClassCastException("$key was not a StringSet")
+        }
+    }
+
+    override fun getInt(key: String, defValue: Int): Int {
+        return preferences.getInt(key, defValue)
+    }
+
+    override fun getLong(key: String, defValue: Long): Long {
+        return preferences.getLong(key, defValue)
+    }
+
+    override fun getFloat(key: String, defValue: Float): Float {
+        return preferences.getFloat(key, defValue)
+    }
+
+    override fun getBoolean(key: String, defValue: Boolean): Boolean {
+        return preferences.getBoolean(key, defValue)
+    }
+
+    override fun contains(key: String): Boolean {
+        return key in preferences.keys
+    }
+
+    override fun edit(): SharedPreferences.Editor {
+        return Editor(preferences)
+    }
+
+    class Editor(private val preferences: JvmPreferencesSettings) : SharedPreferences.Editor {
+        val itemsToAdd = mutableMapOf<String, Any>()
+
+        override fun putString(key: String, value: String?): SharedPreferences.Editor {
+            if (value != null) {
+                itemsToAdd[key] = value
+            } else {
+                remove(key)
+            }
+            return this
+        }
+
+        override fun putStringSet(
+            key: String,
+            values: MutableSet<String>?
+        ): SharedPreferences.Editor {
+            if (values != null) {
+                itemsToAdd[key] = values
+            } else {
+                remove(key)
+            }
+            return this
+        }
+
+        override fun putInt(key: String, value: Int): SharedPreferences.Editor {
+            itemsToAdd[key] = value
+            return this
+        }
+
+        override fun putLong(key: String, value: Long): SharedPreferences.Editor {
+            itemsToAdd[key] = value
+            return this
+        }
+
+        override fun putFloat(key: String, value: Float): SharedPreferences.Editor {
+            itemsToAdd[key] = value
+            return this
+        }
+
+        override fun putBoolean(key: String, value: Boolean): SharedPreferences.Editor {
+            itemsToAdd[key] = value
+            return this
+        }
+
+        override fun remove(key: String): SharedPreferences.Editor {
+            itemsToAdd.remove(key)
+            return this
+        }
+
+        override fun clear(): SharedPreferences.Editor {
+            itemsToAdd.clear()
+            return this
+        }
+
+        override fun commit(): Boolean {
+            addToPreferences()
+            return true
+        }
+
+        override fun apply() {
+            addToPreferences()
+        }
+
+        private fun addToPreferences() {
+            itemsToAdd.forEach { (key, value) ->
+                @Suppress("UNCHECKED_CAST")
+                when (value) {
+                    is Set<*> -> preferences.encodeValue(SetSerializer(String.serializer()), key, value as Set<String>)
+                    is String -> preferences.putString(key, value)
+                    is Int -> preferences.putInt(key, value)
+                    is Long -> preferences.putLong(key, value)
+                    is Float -> preferences.putFloat(key, value)
+                    is Double -> preferences.putDouble(key, value)
+                    is Boolean -> preferences.putBoolean(key, value)
+                }
+            }
+        }
+    }
+
+    override fun registerOnSharedPreferenceChangeListener(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
+        val javaListener = PreferenceChangeListener {
+            listener.onSharedPreferenceChanged(this, it.key)
+        }
+        listeners[listener] = javaListener
+        javaPreferences.addPreferenceChangeListener(javaListener)
+    }
+
+    override fun unregisterOnSharedPreferenceChangeListener(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
+        val registeredListener = listeners.remove(listener)
+        if (registeredListener != null) {
+            javaPreferences.removePreferenceChangeListener(registeredListener)
+        }
+    }
+
+    fun deleteAll(): Boolean {
+        javaPreferences.removeNode()
+        return true
+    }
+}

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/io/sharedprefs/JsonSharedPreferences.java

@@ -233,7 +233,7 @@ public class JsonSharedPreferences implements SharedPreferences {
         private JsonSharedPreferencesEditor() {
         }
 
-        private void recordChange(String key) {
+        private void  recordChange(String key) {
             if (!affectedKeys.contains(key)) {
                 affectedKeys.add(key);
             }

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/replace/java/text/NumberFormat.java

@@ -0,0 +1,249 @@
+package xyz.nulldev.androidcompat.replace.java.text;
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import com.ibm.icu.text.DisplayContext;
+import com.ibm.icu.util.Currency;
+import com.ibm.icu.util.CurrencyAmount;
+import com.ibm.icu.util.ULocale;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.text.AttributedCharacterIterator;
+import java.text.FieldPosition;
+import java.text.ParseException;
+import java.text.ParsePosition;
+import java.util.Locale;
+
+public class NumberFormat extends java.text.NumberFormat {
+    private com.ibm.icu.text.NumberFormat delegate;
+
+    public NumberFormat(com.ibm.icu.text.NumberFormat delegate) {
+        this.delegate = delegate;
+    }
+
+    public StringBuffer format(Object number, StringBuffer toAppendTo, FieldPosition pos) {
+        return delegate.format(number, toAppendTo, pos);
+    }
+
+    public String format(BigInteger number) {
+        return delegate.format(number);
+    }
+
+    public String format(BigDecimal number) {
+        return delegate.format(number);
+    }
+
+    public String format(com.ibm.icu.math.BigDecimal number) {
+        return delegate.format(number);
+    }
+
+    public String format(CurrencyAmount currAmt) {
+        return delegate.format(currAmt);
+    }
+
+    public StringBuffer format(double number, StringBuffer toAppendTo, FieldPosition pos) {
+        return delegate.format(number, toAppendTo, pos);
+    }
+
+    public StringBuffer format(long number, StringBuffer toAppendTo, FieldPosition pos) {
+        return delegate.format(number, toAppendTo, pos);
+    }
+
+    public StringBuffer format(BigInteger number, StringBuffer toAppendTo, FieldPosition pos) {
+        return delegate.format(number, toAppendTo, pos);
+    }
+
+    public StringBuffer format(BigDecimal number, StringBuffer toAppendTo, FieldPosition pos) {
+        return delegate.format(number, toAppendTo, pos);
+    }
+
+    public StringBuffer format(com.ibm.icu.math.BigDecimal number, StringBuffer toAppendTo, FieldPosition pos) {
+        return delegate.format(number, toAppendTo, pos);
+    }
+
+    public StringBuffer format(CurrencyAmount currAmt, StringBuffer toAppendTo, FieldPosition pos) {
+        return delegate.format(currAmt, toAppendTo, pos);
+    }
+
+    public Number parse(String text, ParsePosition parsePosition) {
+        return delegate.parse(text, parsePosition);
+    }
+
+    public Number parse(String text) throws ParseException {
+        return delegate.parse(text);
+    }
+
+    public CurrencyAmount parseCurrency(CharSequence text, ParsePosition pos) {
+        return delegate.parseCurrency(text, pos);
+    }
+
+    public boolean isParseIntegerOnly() {
+        return delegate.isParseIntegerOnly();
+    }
+
+    public void setParseIntegerOnly(boolean value) {
+        delegate.setParseIntegerOnly(value);
+    }
+
+    public void setParseStrict(boolean value) {
+        delegate.setParseStrict(value);
+    }
+
+    public boolean isParseStrict() {
+        return delegate.isParseStrict();
+    }
+
+    public void setContext(DisplayContext context) {
+        delegate.setContext(context);
+    }
+
+    public DisplayContext getContext(DisplayContext.Type type) {
+        return delegate.getContext(type);
+    }
+
+    public static java.text.NumberFormat getInstance(Locale inLocale) {
+        return new NumberFormat(com.ibm.icu.text.NumberFormat.getInstance(inLocale));
+    }
+
+    public static com.ibm.icu.text.NumberFormat getInstance(ULocale inLocale) {
+        return com.ibm.icu.text.NumberFormat.getInstance(inLocale);
+    }
+
+    public static com.ibm.icu.text.NumberFormat getInstance(int style) {
+        return com.ibm.icu.text.NumberFormat.getInstance(style);
+    }
+
+    public static com.ibm.icu.text.NumberFormat getInstance(Locale inLocale, int style) {
+        return com.ibm.icu.text.NumberFormat.getInstance(inLocale, style);
+    }
+
+    public static com.ibm.icu.text.NumberFormat getNumberInstance(ULocale inLocale) {
+        return com.ibm.icu.text.NumberFormat.getNumberInstance(inLocale);
+    }
+
+    public static com.ibm.icu.text.NumberFormat getIntegerInstance(ULocale inLocale) {
+        return com.ibm.icu.text.NumberFormat.getIntegerInstance(inLocale);
+    }
+
+    public static com.ibm.icu.text.NumberFormat getCurrencyInstance(ULocale inLocale) {
+        return com.ibm.icu.text.NumberFormat.getCurrencyInstance(inLocale);
+    }
+
+    public static com.ibm.icu.text.NumberFormat getPercentInstance(ULocale inLocale) {
+        return com.ibm.icu.text.NumberFormat.getPercentInstance(inLocale);
+    }
+
+    public static com.ibm.icu.text.NumberFormat getScientificInstance(ULocale inLocale) {
+        return com.ibm.icu.text.NumberFormat.getScientificInstance(inLocale);
+    }
+
+    public static Locale[] getAvailableLocales() {
+        return com.ibm.icu.text.NumberFormat.getAvailableLocales();
+    }
+
+    public static ULocale[] getAvailableULocales() {
+        return com.ibm.icu.text.NumberFormat.getAvailableULocales();
+    }
+
+    public static Object registerFactory(com.ibm.icu.text.NumberFormat.NumberFormatFactory factory) {
+        return com.ibm.icu.text.NumberFormat.registerFactory(factory);
+    }
+
+    public static boolean unregister(Object registryKey) {
+        return com.ibm.icu.text.NumberFormat.unregister(registryKey);
+    }
+
+    @Override
+    public int hashCode() {
+        return delegate.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return delegate.equals(obj);
+    }
+
+    @Override
+    public Object clone() {
+        return delegate.clone();
+    }
+
+    public boolean isGroupingUsed() {
+        return delegate.isGroupingUsed();
+    }
+
+    public void setGroupingUsed(boolean newValue) {
+        delegate.setGroupingUsed(newValue);
+    }
+
+    public int getMaximumIntegerDigits() {
+        return delegate.getMaximumIntegerDigits();
+    }
+
+    public void setMaximumIntegerDigits(int newValue) {
+        delegate.setMaximumIntegerDigits(newValue);
+    }
+
+    public int getMinimumIntegerDigits() {
+        return delegate.getMinimumIntegerDigits();
+    }
+
+    public void setMinimumIntegerDigits(int newValue) {
+        delegate.setMinimumIntegerDigits(newValue);
+    }
+
+    public int getMaximumFractionDigits() {
+        return delegate.getMaximumFractionDigits();
+    }
+
+    public void setMaximumFractionDigits(int newValue) {
+        delegate.setMaximumFractionDigits(newValue);
+    }
+
+    public int getMinimumFractionDigits() {
+        return delegate.getMinimumFractionDigits();
+    }
+
+    public void setMinimumFractionDigits(int newValue) {
+        delegate.setMinimumFractionDigits(newValue);
+    }
+
+    public void setCurrency(Currency theCurrency) {
+        delegate.setCurrency(theCurrency);
+    }
+
+    public java.util.Currency getCurrency() {
+        return java.util.Currency.getInstance(delegate.getCurrency().getCurrencyCode());
+    }
+
+    public void setRoundingMode(int roundingMode) {
+        delegate.setRoundingMode(roundingMode);
+    }
+
+    public static com.ibm.icu.text.NumberFormat getInstance(ULocale desiredLocale, int choice) {
+        return com.ibm.icu.text.NumberFormat.getInstance(desiredLocale, choice);
+    }
+
+    @Deprecated
+    public static String getPatternForStyle(ULocale forLocale, int choice) {
+        return com.ibm.icu.text.NumberFormat.getPatternForStyle(forLocale, choice);
+    }
+
+    public ULocale getLocale(ULocale.Type type) {
+        return delegate.getLocale(type);
+    }
+
+    public AttributedCharacterIterator formatToCharacterIterator(Object obj) {
+        return delegate.formatToCharacterIterator(obj);
+    }
+
+    public Object parseObject(String source) throws ParseException {
+        return delegate.parseObject(source);
+    }
+}

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/replace/java/text/SimpleDateFormat.java

@@ -0,0 +1,346 @@
+package xyz.nulldev.androidcompat.replace.java.text;
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import com.ibm.icu.text.DateFormatSymbols;
+import com.ibm.icu.text.DisplayContext;
+import com.ibm.icu.text.TimeZoneFormat;
+import com.ibm.icu.util.ULocale;
+import xyz.nulldev.androidcompat.replace.java.util.Calendar;
+import xyz.nulldev.androidcompat.replace.java.util.TimeZone;
+
+import java.text.*;
+import java.util.Date;
+import java.util.Locale;
+
+/**
+ * Overridden to switch to Android implementation
+ */
+public class SimpleDateFormat extends java.text.DateFormat {
+    private com.ibm.icu.text.SimpleDateFormat delegate;
+
+    public SimpleDateFormat() {
+        delegate = new com.ibm.icu.text.SimpleDateFormat();
+    }
+
+    private SimpleDateFormat(com.ibm.icu.text.SimpleDateFormat delegate) {
+        this.delegate = delegate;
+    }
+
+    public SimpleDateFormat(String pattern) {
+        delegate = new com.ibm.icu.text.SimpleDateFormat(pattern);
+    }
+
+    public SimpleDateFormat(String pattern, Locale loc) {
+        delegate = new com.ibm.icu.text.SimpleDateFormat(pattern, loc);
+    }
+
+    public SimpleDateFormat(String pattern, ULocale loc) {
+        delegate = new com.ibm.icu.text.SimpleDateFormat(pattern, loc);
+    }
+
+    public SimpleDateFormat(String pattern, String override, ULocale loc) {
+        delegate = new com.ibm.icu.text.SimpleDateFormat(pattern, override, loc);
+    }
+
+    public SimpleDateFormat(String pattern, DateFormatSymbols formatData) {
+        delegate = new com.ibm.icu.text.SimpleDateFormat(pattern, formatData);
+    }
+
+    public SimpleDateFormat(String pattern, DateFormatSymbols formatData, ULocale loc) {
+        delegate = new com.ibm.icu.text.SimpleDateFormat(pattern, formatData, loc);
+    }
+
+    @Deprecated
+    public static SimpleDateFormat getInstance(com.ibm.icu.util.Calendar.FormatConfiguration formatConfig) {
+        return new SimpleDateFormat(com.ibm.icu.text.SimpleDateFormat.getInstance(formatConfig));
+    }
+
+    public void set2DigitYearStart(Date startDate) {
+        delegate.set2DigitYearStart(startDate);
+    }
+
+    public Date get2DigitYearStart() {
+        return delegate.get2DigitYearStart();
+    }
+
+    public void setContext(DisplayContext context) {
+        delegate.setContext(context);
+    }
+
+    public StringBuffer format(com.ibm.icu.util.Calendar cal, StringBuffer toAppendTo, FieldPosition pos) {
+        return delegate.format(cal, toAppendTo, pos);
+    }
+
+    public void setNumberFormat(com.ibm.icu.text.NumberFormat newNumberFormat) {
+        delegate.setNumberFormat(newNumberFormat);
+    }
+
+    public void parse(String text, com.ibm.icu.util.Calendar cal, ParsePosition parsePos) {
+        delegate.parse(text, cal, parsePos);
+    }
+
+    public String toPattern() {
+        return delegate.toPattern();
+    }
+
+    public String toLocalizedPattern() {
+        return delegate.toLocalizedPattern();
+    }
+
+    public void applyPattern(String pat) {
+        delegate.applyPattern(pat);
+    }
+
+    public void applyLocalizedPattern(String pat) {
+        delegate.applyLocalizedPattern(pat);
+    }
+
+    public DateFormatSymbols getDateFormatSymbols() {
+        return delegate.getDateFormatSymbols();
+    }
+
+    public void setDateFormatSymbols(DateFormatSymbols newFormatSymbols) {
+        delegate.setDateFormatSymbols(newFormatSymbols);
+    }
+
+    public TimeZoneFormat getTimeZoneFormat() {
+        return delegate.getTimeZoneFormat();
+    }
+
+    public void setTimeZoneFormat(TimeZoneFormat tzfmt) {
+        delegate.setTimeZoneFormat(tzfmt);
+    }
+
+    @Override
+    public Object clone() {
+        return delegate.clone();
+    }
+
+    @Override
+    public int hashCode() {
+        return delegate.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return delegate.equals(obj);
+    }
+
+    @Override
+    public AttributedCharacterIterator formatToCharacterIterator(Object obj) {
+        return delegate.formatToCharacterIterator(obj);
+    }
+
+    @Deprecated
+    public StringBuffer intervalFormatByAlgorithm(com.ibm.icu.util.Calendar fromCalendar, com.ibm.icu.util.Calendar toCalendar, StringBuffer appendTo, FieldPosition pos) throws IllegalArgumentException {
+        return delegate.intervalFormatByAlgorithm(fromCalendar, toCalendar, appendTo, pos);
+    }
+
+    public void setNumberFormat(String fields, com.ibm.icu.text.NumberFormat overrideNF) {
+        delegate.setNumberFormat(fields, overrideNF);
+    }
+
+    public com.ibm.icu.text.NumberFormat getNumberFormat(char field) {
+        return delegate.getNumberFormat(field);
+    }
+
+    @Override
+    public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
+        return delegate.format(date, toAppendTo, fieldPosition);
+    }
+
+    @Override
+    public Date parse(String text) throws ParseException {
+        return delegate.parse(text);
+    }
+
+    @Override
+    public Date parse(String text, ParsePosition pos) {
+        return delegate.parse(text, pos);
+    }
+
+    @Override
+    public Object parseObject(String source, ParsePosition pos) {
+        return delegate.parseObject(source, pos);
+    }
+
+    public static com.ibm.icu.text.DateFormat getTimeInstance(int style, ULocale locale) {
+        return com.ibm.icu.text.DateFormat.getTimeInstance(style, locale);
+    }
+
+    public static com.ibm.icu.text.DateFormat getDateInstance(int style, ULocale locale) {
+        return com.ibm.icu.text.DateFormat.getDateInstance(style, locale);
+    }
+
+    public static com.ibm.icu.text.DateFormat getDateTimeInstance(int dateStyle, int timeStyle, ULocale locale) {
+        return com.ibm.icu.text.DateFormat.getDateTimeInstance(dateStyle, timeStyle, locale);
+    }
+
+    public static Locale[] getAvailableLocales() {
+        return com.ibm.icu.text.DateFormat.getAvailableLocales();
+    }
+
+    public static ULocale[] getAvailableULocales() {
+        return com.ibm.icu.text.DateFormat.getAvailableULocales();
+    }
+
+    @Override
+    public void setCalendar(java.util.Calendar newCalendar) {
+        com.ibm.icu.util.Calendar cal = com.ibm.icu.util.Calendar.getInstance(com.ibm.icu.util.TimeZone.getTimeZone(newCalendar.getTimeZone().getID()));
+        cal.setTimeInMillis(newCalendar.getTimeInMillis());
+        delegate.setCalendar(cal);
+    }
+
+    @Override
+    public java.util.Calendar getCalendar() {
+        return new Calendar(delegate.getCalendar());
+    }
+
+    @Override
+    public java.text.NumberFormat getNumberFormat() {
+        return new NumberFormat(delegate.getNumberFormat());
+    }
+
+    @Override
+    public void setTimeZone(java.util.TimeZone zone) {
+        delegate.setTimeZone(com.ibm.icu.util.TimeZone.getTimeZone(zone.getID()));
+    }
+
+    @Override
+    public java.util.TimeZone getTimeZone() {
+        return new TimeZone(delegate.getTimeZone());
+    }
+
+    @Override
+    public void setLenient(boolean lenient) {
+        delegate.setLenient(lenient);
+    }
+
+    @Override
+    public boolean isLenient() {
+        return delegate.isLenient();
+    }
+
+    public void setCalendarLenient(boolean lenient) {
+        delegate.setCalendarLenient(lenient);
+    }
+
+    public boolean isCalendarLenient() {
+        return delegate.isCalendarLenient();
+    }
+
+    public com.ibm.icu.text.DateFormat setBooleanAttribute(com.ibm.icu.text.DateFormat.BooleanAttribute key, boolean value) {
+        return delegate.setBooleanAttribute(key, value);
+    }
+
+    public boolean getBooleanAttribute(com.ibm.icu.text.DateFormat.BooleanAttribute key) {
+        return delegate.getBooleanAttribute(key);
+    }
+
+    public DisplayContext getContext(DisplayContext.Type type) {
+        return delegate.getContext(type);
+    }
+
+    public static com.ibm.icu.text.DateFormat getDateInstance(com.ibm.icu.util.Calendar cal, int dateStyle, Locale locale) {
+        return com.ibm.icu.text.DateFormat.getDateInstance(cal, dateStyle, locale);
+    }
+
+    public static com.ibm.icu.text.DateFormat getDateInstance(com.ibm.icu.util.Calendar cal, int dateStyle, ULocale locale) {
+        return com.ibm.icu.text.DateFormat.getDateInstance(cal, dateStyle, locale);
+    }
+
+    public static com.ibm.icu.text.DateFormat getTimeInstance(com.ibm.icu.util.Calendar cal, int timeStyle, Locale locale) {
+        return com.ibm.icu.text.DateFormat.getTimeInstance(cal, timeStyle, locale);
+    }
+
+    public static com.ibm.icu.text.DateFormat getTimeInstance(com.ibm.icu.util.Calendar cal, int timeStyle, ULocale locale) {
+        return com.ibm.icu.text.DateFormat.getTimeInstance(cal, timeStyle, locale);
+    }
+
+    public static com.ibm.icu.text.DateFormat getDateTimeInstance(com.ibm.icu.util.Calendar cal, int dateStyle, int timeStyle, Locale locale) {
+        return com.ibm.icu.text.DateFormat.getDateTimeInstance(cal, dateStyle, timeStyle, locale);
+    }
+
+    public static com.ibm.icu.text.DateFormat getDateTimeInstance(com.ibm.icu.util.Calendar cal, int dateStyle, int timeStyle, ULocale locale) {
+        return com.ibm.icu.text.DateFormat.getDateTimeInstance(cal, dateStyle, timeStyle, locale);
+    }
+
+    public static com.ibm.icu.text.DateFormat getInstance(com.ibm.icu.util.Calendar cal, Locale locale) {
+        return com.ibm.icu.text.DateFormat.getInstance(cal, locale);
+    }
+
+    public static com.ibm.icu.text.DateFormat getInstance(com.ibm.icu.util.Calendar cal, ULocale locale) {
+        return com.ibm.icu.text.DateFormat.getInstance(cal, locale);
+    }
+
+    public static com.ibm.icu.text.DateFormat getInstance(com.ibm.icu.util.Calendar cal) {
+        return com.ibm.icu.text.DateFormat.getInstance(cal);
+    }
+
+    public static com.ibm.icu.text.DateFormat getDateInstance(com.ibm.icu.util.Calendar cal, int dateStyle) {
+        return com.ibm.icu.text.DateFormat.getDateInstance(cal, dateStyle);
+    }
+
+    public static com.ibm.icu.text.DateFormat getTimeInstance(com.ibm.icu.util.Calendar cal, int timeStyle) {
+        return com.ibm.icu.text.DateFormat.getTimeInstance(cal, timeStyle);
+    }
+
+    public static com.ibm.icu.text.DateFormat getDateTimeInstance(com.ibm.icu.util.Calendar cal, int dateStyle, int timeStyle) {
+        return com.ibm.icu.text.DateFormat.getDateTimeInstance(cal, dateStyle, timeStyle);
+    }
+
+    public static com.ibm.icu.text.DateFormat getInstanceForSkeleton(String skeleton) {
+        return com.ibm.icu.text.DateFormat.getInstanceForSkeleton(skeleton);
+    }
+
+    public static com.ibm.icu.text.DateFormat getInstanceForSkeleton(String skeleton, Locale locale) {
+        return com.ibm.icu.text.DateFormat.getInstanceForSkeleton(skeleton, locale);
+    }
+
+    public static com.ibm.icu.text.DateFormat getInstanceForSkeleton(String skeleton, ULocale locale) {
+        return com.ibm.icu.text.DateFormat.getInstanceForSkeleton(skeleton, locale);
+    }
+
+    public static com.ibm.icu.text.DateFormat getInstanceForSkeleton(com.ibm.icu.util.Calendar cal, String skeleton, Locale locale) {
+        return com.ibm.icu.text.DateFormat.getInstanceForSkeleton(cal, skeleton, locale);
+    }
+
+    public static com.ibm.icu.text.DateFormat getInstanceForSkeleton(com.ibm.icu.util.Calendar cal, String skeleton, ULocale locale) {
+        return com.ibm.icu.text.DateFormat.getInstanceForSkeleton(cal, skeleton, locale);
+    }
+
+    public static com.ibm.icu.text.DateFormat getPatternInstance(String skeleton) {
+        return com.ibm.icu.text.DateFormat.getPatternInstance(skeleton);
+    }
+
+    public static com.ibm.icu.text.DateFormat getPatternInstance(String skeleton, Locale locale) {
+        return com.ibm.icu.text.DateFormat.getPatternInstance(skeleton, locale);
+    }
+
+    public static com.ibm.icu.text.DateFormat getPatternInstance(String skeleton, ULocale locale) {
+        return com.ibm.icu.text.DateFormat.getPatternInstance(skeleton, locale);
+    }
+
+    public static com.ibm.icu.text.DateFormat getPatternInstance(com.ibm.icu.util.Calendar cal, String skeleton, Locale locale) {
+        return com.ibm.icu.text.DateFormat.getPatternInstance(cal, skeleton, locale);
+    }
+
+    public static com.ibm.icu.text.DateFormat getPatternInstance(com.ibm.icu.util.Calendar cal, String skeleton, ULocale locale) {
+        return com.ibm.icu.text.DateFormat.getPatternInstance(cal, skeleton, locale);
+    }
+
+    public ULocale getLocale(ULocale.Type type) {
+        return delegate.getLocale(type);
+    }
+
+    @Override
+    public Object parseObject(String source) throws ParseException {
+        return delegate.parseObject(source);
+    }
+}

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/replace/java/util/Calendar.java

@@ -0,0 +1,294 @@
+package xyz.nulldev.androidcompat.replace.java.util;
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import com.ibm.icu.text.DateFormat;
+import com.ibm.icu.util.ULocale;
+
+import java.util.Date;
+import java.util.Locale;
+
+public class Calendar extends java.util.Calendar {
+    private com.ibm.icu.util.Calendar delegate;
+
+    public Calendar(com.ibm.icu.util.Calendar delegate) {
+        this.delegate = delegate;
+    }
+
+    public static java.util.Calendar getInstance() {
+        return new Calendar(com.ibm.icu.util.Calendar.getInstance());
+    }
+
+    public static com.ibm.icu.util.Calendar getInstance(com.ibm.icu.util.TimeZone zone) {
+        return com.ibm.icu.util.Calendar.getInstance(zone);
+    }
+
+    public static java.util.Calendar getInstance(Locale aLocale) {
+        return new Calendar(com.ibm.icu.util.Calendar.getInstance(aLocale));
+    }
+
+    public static com.ibm.icu.util.Calendar getInstance(ULocale locale) {
+        return com.ibm.icu.util.Calendar.getInstance(locale);
+    }
+
+    public static com.ibm.icu.util.Calendar getInstance(com.ibm.icu.util.TimeZone zone, Locale aLocale) {
+        return com.ibm.icu.util.Calendar.getInstance(zone, aLocale);
+    }
+
+    public static com.ibm.icu.util.Calendar getInstance(com.ibm.icu.util.TimeZone zone, ULocale locale) {
+        return com.ibm.icu.util.Calendar.getInstance(zone, locale);
+    }
+
+    public static Locale[] getAvailableLocales() {
+        return com.ibm.icu.util.Calendar.getAvailableLocales();
+    }
+
+    @Override
+    protected void computeTime() {}
+
+    @Override
+    protected void computeFields() {}
+
+    public static ULocale[] getAvailableULocales() {
+        return com.ibm.icu.util.Calendar.getAvailableULocales();
+    }
+
+    public static String[] getKeywordValuesForLocale(String key, ULocale locale, boolean commonlyUsed) {
+        return com.ibm.icu.util.Calendar.getKeywordValuesForLocale(key, locale, commonlyUsed);
+    }
+
+    @Override
+    public long getTimeInMillis() {
+        return delegate.getTimeInMillis();
+    }
+
+    @Override
+    public void setTimeInMillis(long millis) {
+        delegate.setTimeInMillis(millis);
+    }
+
+    @Deprecated
+    public int getRelatedYear() {
+        return delegate.getRelatedYear();
+    }
+
+    @Deprecated
+    public void setRelatedYear(int year) {
+        delegate.setRelatedYear(year);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return delegate.equals(obj);
+    }
+
+    public boolean isEquivalentTo(com.ibm.icu.util.Calendar other) {
+        return delegate.isEquivalentTo(other);
+    }
+
+    @Override
+    public int hashCode() {
+        return delegate.hashCode();
+    }
+
+    @Override
+    public boolean before(Object when) {
+        return delegate.before(when);
+    }
+
+    @Override
+    public boolean after(Object when) {
+        return delegate.after(when);
+    }
+
+    @Override
+    public int getActualMaximum(int field) {
+        return delegate.getActualMaximum(field);
+    }
+
+    @Override
+    public int getActualMinimum(int field) {
+        return delegate.getActualMinimum(field);
+    }
+
+    @Override
+    public void roll(int field, int amount) {
+        delegate.roll(field, amount);
+    }
+
+    @Override
+    public void add(int field, int amount) {
+        delegate.add(field, amount);
+    }
+
+    @Override
+    public void roll(int field, boolean up) {
+        roll(field, up ? 1 : -1);
+    }
+
+    public String getDisplayName(Locale loc) {
+        return delegate.getDisplayName(loc);
+    }
+
+    public String getDisplayName(ULocale loc) {
+        return delegate.getDisplayName(loc);
+    }
+
+    public int compareTo(com.ibm.icu.util.Calendar that) {
+        return delegate.compareTo(that);
+    }
+
+    public DateFormat getDateTimeFormat(int dateStyle, int timeStyle, Locale loc) {
+        return delegate.getDateTimeFormat(dateStyle, timeStyle, loc);
+    }
+
+    public DateFormat getDateTimeFormat(int dateStyle, int timeStyle, ULocale loc) {
+        return delegate.getDateTimeFormat(dateStyle, timeStyle, loc);
+    }
+
+    @Deprecated
+    public static String getDateTimePattern(com.ibm.icu.util.Calendar cal, ULocale uLocale, int dateStyle) {
+        return com.ibm.icu.util.Calendar.getDateTimePattern(cal, uLocale, dateStyle);
+    }
+
+    public int fieldDifference(Date when, int field) {
+        return delegate.fieldDifference(when, field);
+    }
+
+    public void setTimeZone(com.ibm.icu.util.TimeZone value) {
+        delegate.setTimeZone(value);
+    }
+
+    @Override
+    public java.util.TimeZone getTimeZone() {
+        return new TimeZone(delegate.getTimeZone());
+    }
+
+    @Override
+    public void setLenient(boolean lenient) {
+        delegate.setLenient(lenient);
+    }
+
+    @Override
+    public boolean isLenient() {
+        return delegate.isLenient();
+    }
+
+    public void setRepeatedWallTimeOption(int option) {
+        delegate.setRepeatedWallTimeOption(option);
+    }
+
+    public int getRepeatedWallTimeOption() {
+        return delegate.getRepeatedWallTimeOption();
+    }
+
+    public void setSkippedWallTimeOption(int option) {
+        delegate.setSkippedWallTimeOption(option);
+    }
+
+    public int getSkippedWallTimeOption() {
+        return delegate.getSkippedWallTimeOption();
+    }
+
+    @Override
+    public void setFirstDayOfWeek(int value) {
+        delegate.setFirstDayOfWeek(value);
+    }
+
+    @Override
+    public int getFirstDayOfWeek() {
+        return delegate.getFirstDayOfWeek();
+    }
+
+    @Override
+    public void setMinimalDaysInFirstWeek(int value) {
+        delegate.setMinimalDaysInFirstWeek(value);
+    }
+
+    @Override
+    public int getMinimalDaysInFirstWeek() {
+        return delegate.getMinimalDaysInFirstWeek();
+    }
+
+    @Override
+    public int getMinimum(int field) {
+        return delegate.getMinimum(field);
+    }
+
+    @Override
+    public int getMaximum(int field) {
+        return delegate.getMaximum(field);
+    }
+
+    @Override
+    public int getGreatestMinimum(int field) {
+        return delegate.getGreatestMinimum(field);
+    }
+
+    @Override
+    public int getLeastMaximum(int field) {
+        return delegate.getLeastMaximum(field);
+    }
+
+    @Deprecated
+    public int getDayOfWeekType(int dayOfWeek) {
+        return delegate.getDayOfWeekType(dayOfWeek);
+    }
+
+    @Deprecated
+    public int getWeekendTransition(int dayOfWeek) {
+        return delegate.getWeekendTransition(dayOfWeek);
+    }
+
+    public boolean isWeekend(Date date) {
+        return delegate.isWeekend(date);
+    }
+
+    public boolean isWeekend() {
+        return delegate.isWeekend();
+    }
+
+    @Override
+    public Object clone() {
+        return delegate.clone();
+    }
+
+    @Override
+    public String toString() {
+        return delegate.toString();
+    }
+
+    public static com.ibm.icu.util.Calendar.WeekData getWeekDataForRegion(String region) {
+        return com.ibm.icu.util.Calendar.getWeekDataForRegion(region);
+    }
+
+    public com.ibm.icu.util.Calendar.WeekData getWeekData() {
+        return delegate.getWeekData();
+    }
+
+    public com.ibm.icu.util.Calendar setWeekData(com.ibm.icu.util.Calendar.WeekData wdata) {
+        return delegate.setWeekData(wdata);
+    }
+
+    public int getFieldCount() {
+        return delegate.getFieldCount();
+    }
+
+    public String getType() {
+        return delegate.getType();
+    }
+
+    @Deprecated
+    public boolean haveDefaultCentury() {
+        return delegate.haveDefaultCentury();
+    }
+
+    public ULocale getLocale(ULocale.Type type) {
+        return delegate.getLocale(type);
+    }
+}

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/replace/java/util/TimeZone.java

@@ -0,0 +1,196 @@
+package xyz.nulldev.androidcompat.replace.java.util;
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import com.ibm.icu.util.ULocale;
+
+import java.util.Date;
+import java.util.Locale;
+import java.util.Set;
+
+public class TimeZone extends java.util.TimeZone {
+    private com.ibm.icu.util.TimeZone delegate;
+
+    public TimeZone(com.ibm.icu.util.TimeZone delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public int getOffset(int era, int year, int month, int day, int dayOfWeek, int milliseconds) {
+        return delegate.getOffset(era, year, month, day, dayOfWeek, milliseconds);
+    }
+
+    @Override
+    public int getOffset(long date) {
+        return delegate.getOffset(date);
+    }
+
+    public void getOffset(long date, boolean local, int[] offsets) {
+        delegate.getOffset(date, local, offsets);
+    }
+
+    @Override
+    public void setRawOffset(int offsetMillis) {
+        delegate.setRawOffset(offsetMillis);
+    }
+
+    @Override
+    public int getRawOffset() {
+        return delegate.getRawOffset();
+    }
+
+    @Override
+    public String getID() {
+        return delegate.getID();
+    }
+
+    @Override
+    public void setID(String ID) {
+        delegate.setID(ID);
+    }
+
+    public String getDisplayName(ULocale locale) {
+        return delegate.getDisplayName(locale);
+    }
+
+    @Override
+    public String getDisplayName(boolean daylight, int style, Locale locale) {
+        return delegate.getDisplayName(daylight, style, locale);
+    }
+
+    public String getDisplayName(boolean daylight, int style, ULocale locale) {
+        return delegate.getDisplayName(daylight, style, locale);
+    }
+
+    @Override
+    public int getDSTSavings() {
+        return delegate.getDSTSavings();
+    }
+
+    @Override
+    public boolean useDaylightTime() {
+        return delegate.useDaylightTime();
+    }
+
+    @Override
+    public boolean observesDaylightTime() {
+        return delegate.observesDaylightTime();
+    }
+
+    @Override
+    public boolean inDaylightTime(Date date) {
+        return delegate.inDaylightTime(date);
+    }
+
+    public static java.util.TimeZone getTimeZone(String ID) {
+        return new TimeZone(com.ibm.icu.util.TimeZone.getTimeZone(ID));
+    }
+
+    public static com.ibm.icu.util.TimeZone getFrozenTimeZone(String ID) {
+        return com.ibm.icu.util.TimeZone.getFrozenTimeZone(ID);
+    }
+
+    public static com.ibm.icu.util.TimeZone getTimeZone(String ID, int type) {
+        return com.ibm.icu.util.TimeZone.getTimeZone(ID, type);
+    }
+
+    public static void setDefaultTimeZoneType(int type) {
+        com.ibm.icu.util.TimeZone.setDefaultTimeZoneType(type);
+    }
+
+    public static int getDefaultTimeZoneType() {
+        return com.ibm.icu.util.TimeZone.getDefaultTimeZoneType();
+    }
+
+    public static Set<String> getAvailableIDs(com.ibm.icu.util.TimeZone.SystemTimeZoneType zoneType, String region, Integer rawOffset) {
+        return com.ibm.icu.util.TimeZone.getAvailableIDs(zoneType, region, rawOffset);
+    }
+
+    public static String[] getAvailableIDs(int rawOffset) {
+        return com.ibm.icu.util.TimeZone.getAvailableIDs(rawOffset);
+    }
+
+    public static String[] getAvailableIDs(String country) {
+        return com.ibm.icu.util.TimeZone.getAvailableIDs(country);
+    }
+
+    public static String[] getAvailableIDs() {
+        return com.ibm.icu.util.TimeZone.getAvailableIDs();
+    }
+
+    public static int countEquivalentIDs(String id) {
+        return com.ibm.icu.util.TimeZone.countEquivalentIDs(id);
+    }
+
+    public static String getEquivalentID(String id, int index) {
+        return com.ibm.icu.util.TimeZone.getEquivalentID(id, index);
+    }
+
+    public static java.util.TimeZone getDefault() {
+        return new TimeZone(com.ibm.icu.util.TimeZone.getDefault());
+    }
+
+    public static void setDefault(com.ibm.icu.util.TimeZone tz) {
+        com.ibm.icu.util.TimeZone.setDefault(tz);
+    }
+
+    public boolean hasSameRules(com.ibm.icu.util.TimeZone other) {
+        return delegate.hasSameRules(other);
+    }
+
+    @Override
+    public Object clone() {
+        return delegate.clone();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return delegate.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return delegate.hashCode();
+    }
+
+    public static String getTZDataVersion() {
+        return com.ibm.icu.util.TimeZone.getTZDataVersion();
+    }
+
+    public static String getCanonicalID(String id) {
+        return com.ibm.icu.util.TimeZone.getCanonicalID(id);
+    }
+
+    public static String getCanonicalID(String id, boolean[] isSystemID) {
+        return com.ibm.icu.util.TimeZone.getCanonicalID(id, isSystemID);
+    }
+
+    public static String getRegion(String id) {
+        return com.ibm.icu.util.TimeZone.getRegion(id);
+    }
+
+    public static String getWindowsID(String id) {
+        return com.ibm.icu.util.TimeZone.getWindowsID(id);
+    }
+
+    public static String getIDForWindowsID(String winid, String region) {
+        return com.ibm.icu.util.TimeZone.getIDForWindowsID(winid, region);
+    }
+
+    public boolean isFrozen() {
+        return delegate.isFrozen();
+    }
+
+    public com.ibm.icu.util.TimeZone freeze() {
+        return delegate.freeze();
+    }
+
+    public com.ibm.icu.util.TimeZone cloneAsThawed() {
+        return delegate.cloneAsThawed();
+    }
+}

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/service/ServiceSupport.kt

@@ -18,7 +18,7 @@ class ServiceSupport {
 
     private val logger = KotlinLogging.logger {}
 
-    fun startService(context: Context, intent: Intent) {
+    fun startService(@Suppress("UNUSED_PARAMETER") context: Context, intent: Intent) {
         val name = intentToClassName(intent)
 
         logger.debug { "Starting service: $name" }
@@ -35,7 +35,7 @@ class ServiceSupport {
         }
     }
 
-    fun stopService(context: Context, intent: Intent) {
+    fun stopService(@Suppress("UNUSED_PARAMETER") context: Context, intent: Intent) {
         val name = intentToClassName(intent)
         stopService(name)
     }

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/util/KodeinGlobalHelper.kt

@@ -25,6 +25,7 @@ object KodeinGlobalHelper {
      * Get a dependency
      */
     @JvmStatic
+    @Suppress("UNCHECKED_CAST")
     fun <T : Any> instance(type: Class<T>, kodein: DI? = null): T {
         return when(type) {
             AndroidFiles::class.java -> {

CONTRIBUTING.md

@@ -2,51 +2,36 @@
 ## Where should I start?
 Checkout [This Kanban Board](https://github.com/Suwayomi/Tachidesk/projects/1) to see the rough development roadmap.
 
-**Note to potential contributors:** Notify the developers on Suwayomi discord (#programming channel) or open a WIP pull request before starting if you decide to take on working on anything from/not from the roadmap in order to avoid parallel efforts on the same issue/feature.
+**Note to potential contributors:** Notify the developers on [Suwayomi discord](https://discord.gg/DDZdqZWaHA) (#programming channel) or open a WIP pull request before starting if you decide to take on working on anything from/not from the roadmap in order to avoid parallel efforts on the same issue/feature.
 
-## How does Tachidesk work?
+## How does Tachidesk-Server work?
 This project has two components: 
-1. **server:** contains the implementation of [tachiyomi's extensions library](https://github.com/tachiyomiorg/extensions-lib) and uses an Android compatibility library to run apk extensions. All this concludes to serving a REST API to `webUI`.
+1. **Server:** contains the implementation of [tachiyomi's extensions library](https://github.com/tachiyomiorg/extensions-lib) and uses an Android compatibility library to run jar libraries converted from apk extensions. All this concludes to serving a REST API.
-2. **webUI:** A react SPA(`create-react-app`) project that works with the server to do the presentation.
+2. **WebUI:** A react SPA(`create-react-app`) project that works with the server to do the presentation located at https://github.com/Suwayomi/Tachidesk-WebUI
 
-## Why a web app?
+## Why a web server app?
 This structure is chosen to
 - Achieve the maximum multi-platform-ness
-- Gives the ability to acces Tachidesk from a remote web browser e.g. your phone, tablet or smart TV
+- Gives the ability to acces Tachidesk-Server from a remote client e.g. your phone, tablet or smart TV
-- Eaise development of alternative user intefaces for Tachidesk
+- Eaise development of user intefaces for Tachidesk
-
-## User Interfaces for Tachidesk server
-Currently, there are three known interfaces for Tachidesk:
-1. [webUI](https://github.com/Suwayomi/Tachidesk/tree/master/webUI/react): The react SPA that Tachidesk is traditionally shipped with.
-2. [TachideskJUI](https://github.com/Suwayomi/TachideskJUI): A Jetbrains Compose Native app, re-uses components made for the upcoming Tachiyomi 1.x
-3. [Equinox](https://github.com/Suwayomi/Equinox): A web user interface made with Vue.js, in super early stages of development.
 
 ## Building from source
 ### Prerequisites
 You need these software packages installed in order to build the project
-### Server
+
 - Java Development Kit and Java Runtime Environment version 8 or newer(both Oracle JDK and OpenJDK works)
 - Android stubs jar
-    - Manual download: Download [android.jar](https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar) and put it under `AndroidCompat/lib`.
+    - **Manual download:** Download [android.jar](https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar) and put it under `AndroidCompat/lib`.
-    - Automated download: Run `AndroidCompat/getAndroid.sh`(MacOS/Linux) or `AndroidCompat/getAndroid.ps1`(Windows) from project's root directory to download and rebuild the jar file from Google's repository.
+    - **Automated download:** Run `AndroidCompat/getAndroid.sh`(MacOS/Linux) or `AndroidCompat/getAndroid.ps1`(Windows) from project's root directory to download and rebuild the jar file from Google's repository.
-### webUI
-- Nodejs LTS or latest
-- Yarn
-- Git
-### building the full-blown jar
-Run `./gradlew :webUI:copyBuild server:shadowJar`, the resulting built jar file will be `server/build/Tachidesk-vX.Y.Z-rxxx.jar`.
-### building without `webUI` bundled(server only)
-Delete the `server/src/main/resources/react` directory if exists from previous runs, then run `./gradlew server:shadowJar`, the resulting built jar file will be `server/build/Tachidesk-vX.Y.Z-rxxx.jar`.
-### building the Windows package
-First Build the jar, then cd into the `scripts` directory and run `./windows<bits>-bundler.sh` (or `./windows<bits>-bundler.ps1` if you are on windows), the resulting built zip package file will be `server/build/Tachidesk-vX.Y.Z-rxxx-win64.zip`.
-## Running in development mode
-First satisfy [the prerequisites](#prerequisites)
-### server
-run `./gradlew :server:run --stacktrace` to run the server
-### webUI
-How to do it is described in `webUI/react/README.md` but for short,
- first cd into `webUI/react` then run `yarn` to install the node modules(do this only once)
- then `yarn start` to start the development server, if a new browser window doesn't get opened automatically,
- then open `http://127.0.0.1:3000` in a modern browser. This is a `create-react-app` project
- and supports HMR and all the other goodies you'll need.
 
+### building the full-blown jar (Tachidesk-Server + Tachidesk-WebUI bundle)
+Run `./gradlew server:downloadWebUI server:shadowJar`, the resulting built jar file will be `server/build/Tachidesk-Server-vX.Y.Z-rxxx.jar`.
+
+### building without `webUI` bundled (server only)
+Delete `server/src/main/resources/WebUI.zip` if exists from previous runs, then run `./gradlew server:shadowJar`, the resulting built jar file will be `server/build/Tachidesk-Server-vX.Y.Z-rxxx.jar`.
+
+### building the Windows package
+First Build the jar, then cd into the `scripts` directory and run `./windows-bundler.sh win32` or `./windows-bundler.sh win64` depending on the target architecture, the resulting built zip package file will be `server/build/Tachidesk-Server-vX.Y.Z-rxxx-winXX.zip`.
+
+## Running in development mode
+run `./gradlew :server:run --stacktrace` to run the server

README.md

@@ -3,30 +3,43 @@
 |-------|----------|---------|---------|
 | ![CI](https://github.com/Suwayomi/Tachidesk/actions/workflows/build_push.yml/badge.svg) | [![stable release](https://img.shields.io/github/release/Suwayomi/Tachidesk.svg?maxAge=3600&label=download)](https://github.com/Suwayomi/Tachidesk/releases) | [![preview](https://img.shields.io/badge/dynamic/json?url=https://github.com/Suwayomi/Tachidesk-preview/raw/main/index.json&label=download&query=$.latest&color=blue)](https://github.com/Suwayomi/Tachidesk-preview/releases/latest) | [![Discord](https://img.shields.io/discord/801021177333940224.svg?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/DDZdqZWaHA) |
 
-# Tachidesk
+# Tachidesk-Server is a server app! You may not want to Download Tachidesk-Server directly.
+Yes, you need a client/user interface app as a front-end for Tachidesk-Server, if you Directly Download Tachidesk-Server you'll get a bundled version of [Tachodesk-WebUI](https://github.com/Suwayomi/Tachidesk-WebUI) with it.
+
+Here's a list of known clients/user interfaces for Tachidesk-Server:
+- [Tachidesk-JUI](https://github.com/Suwayomi/Tachidesk-JUI): The "official" front-end for Tachidesk-Server, A native desktop Application.
+- [Tachidesk-WebUI](https://github.com/Suwayomi/Tachidesk-WebUI): The web/electrion front-end that Tachidesk is traditionally shipped with.
+- [Tachidesk-qtui](https://github.com/Suwayomi/Tachidesk-qtui): A C++/Qt front-end for mobile devices(Android/linux), in super early stage of development.
+- [Equinox](https://github.com/Suwayomi/Equinox): A web user interface made with Vue.js, in super early stage of development.
+
+# What is Tachidesk then?
 <img src="https://github.com/Suwayomi/Tachidesk/raw/master/server/src/main/resources/icon/faviconlogo.png" alt="drawing" width="200"/>
 
-A free and open source manga reader that runs extensions built for [Tachiyomi](https://tachiyomi.org/). 
+A free and open source manga reader server that runs extensions built for [Tachiyomi](https://tachiyomi.org/). 
 
 Tachidesk is an independent Tachiyomi compatible software and is **not a Fork of** Tachiyomi.
 
-Tachidesk is as multi-platform as you can get. Any platform that runs java and/or has a modern browser can run it. This includes Windows, Linux, macOS, chrome OS, etc. Follow [Downloading and Running the app](#downloading-and-running-the-app) for installation instructions.
+Tachidesk-Server is as multi-platform as you can get. Any platform that runs java and/or has a modern browser can run it. This includes Windows, Linux, macOS, chrome OS, etc. Follow [Downloading and Running the app](#downloading-and-running-the-app) for installation instructions.
 
 Ability to read and write Tachiyomi compatible backups and syncing is a planned feature.
 
-**Tachidesk needs serious front-end dev help for it's reader and other parts, if you like the app and want to see it become better please don't hesitate to contribute some code!**
-
 ## Is this application usable? Should I test it?
 Here is a list of current features:
 
-- Installing and executing Tachiyomi's Extensions, So you'll get the same sources.
+- From Tachiyomi
-- A library to save your mangas and categories to put them into.
+    - Installing and executing Tachiyomi's Extensions, So you'll get the same sources
-- Searching and browsing installed sources.
+    - A library to save your mangas and categories to put them into
-- A decent chapter reader.
+    - Searching and browsing installed sources
-- Ability to download Mangas for offline read(This partially works)
+    - Ability to download Manga for offline read
-- Backup and restore support powered by Tachiyomi Legacy Backups
+    - Backup and restore support powered by Tachiyomi Legacy Backups
+- From Aniyomi
+    - Installing and executing Aniyomi's Extensions
+    - Searching and browsing installed sources.
+    - Viewing an anime and it's episodes
 
-**Note:** Keep in mind that Tachidesk is alpha software and can break rarely and/or with each update. See [Troubleshooting](https://github.com/Suwayomi/Tachidesk/wiki/Troubleshooting) if it happens.
+**Note:** These are capabilities of Tachidesk-Server, the actual working support is provided by each front-end app, checkout their respective readme for more info.
+
+**Note:** Tachidesk-Server is alpha software and can break rarely and/or with each update. See [Troubleshooting](https://github.com/Suwayomi/Tachidesk-Server/wiki/Troubleshooting) if it happens.
 
 ## Downloading and Running the app
 ### All Operating Systems

build.gradle.kts

@@ -1,7 +1,8 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.4.32"
+    kotlin("jvm") version kotlinVersion
+    kotlin("plugin.serialization") version kotlinVersion
 }
 
 allprojects {
@@ -42,14 +43,18 @@ configure(projects) {
         // Kotlin
         implementation(kotlin("stdlib-jdk8"))
         implementation(kotlin("reflect"))
-        testImplementation(kotlin("test"))
+        testImplementation(kotlin("test-junit5"))
 
         // coroutines
-        val coroutinesVersion = "1.4.3"
+        val coroutinesVersion = "1.5.0"
         implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
         implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$coroutinesVersion")
         implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion")
 
+        val kotlinSerializationVersion = "1.2.1"
+        implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinSerializationVersion")
+        implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$kotlinSerializationVersion")
+
 
         // Dependency Injection
         implementation("org.kodein.di:kodein-di-conf-jvm:7.5.0")
@@ -75,9 +80,13 @@ configure(projects) {
         implementation("net.harawata:appdirs:1.2.1")
 
         // dex2jar: https://github.com/DexPatcher/dex2jar/releases/tag/v2.1-20190905-lanchon
+        // note: watch https://github.com/ThexXTURBOXx/dex2jar for future developments
         implementation("com.github.DexPatcher.dex2jar:dex-tools:v2.1-20190905-lanchon")
 
         // APK parser
         implementation("net.dongliu:apk-parser:2.6.10")
+
+        // Jackson
+        implementation("com.fasterxml.jackson.core:jackson-annotations:2.10.3")
     }
 }

buildSrc/build.gradle.kts

@@ -0,0 +1,11 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation("net.lingala.zip4j:zip4j:2.9.0")
+}

buildSrc/src/main/kotlin/Constants.kt

@@ -0,0 +1,33 @@
+import java.io.BufferedReader
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+const val kotlinVersion = "1.5.21"
+
+const val MainClass = "suwayomi.tachidesk.MainKt"
+
+// should be bumped with each stable release
+val tachideskVersion = System.getenv("ProductVersion") ?: "v0.4.7"
+
+val webUIRevisionTag = System.getenv("WebUIRevision") ?: "r36"
+
+// counts commits on the the master branch
+val tachideskRevision = runCatching {
+    System.getenv("ProductRevision") ?: Runtime
+        .getRuntime()
+        .exec("git rev-list HEAD --count")
+        .let { process ->
+            process.waitFor()
+            val output = process.inputStream.use {
+                it.bufferedReader().use(BufferedReader::readText)
+            }
+            process.destroy()
+            "r" + output.trim()
+        }
+}.getOrDefault("r0")
+

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

scripts/resources/Tachidesk Debug Launcher.bat

@@ -1 +1,7 @@
-jre\bin\java -Dsuwayomi.server.debugLogsEnabled=true -jar  Tachidesk.jar
+:: cleaner output
+@echo off
+
+jre\bin\java -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true -jar  Tachidesk.jar
+
+:: Prevent cmd from closing when Tachidesk crashes
+pause

scripts/resources/Tachidesk Electron Launcher.bat

@@ -1 +1 @@
-jre\bin\javaw "-Dsuwayomi.server.webInterface=electron" "-Dsuwayomi.server.electronPath=electron/electron.exe" -jar Tachidesk.jar
+jre\bin\javaw "-Dsuwayomi.tachidesk.config.server.webUIInterface=electron" "-Dsuwayomi.tachidesk.config.server.electronPath=electron/electron.exe" -jar Tachidesk.jar

scripts/resources/Tachidesk Launcher.c

@@ -1,5 +0,0 @@
-#include <stdlib.h>
-
-int main() {
-    system("start jre\\bin\\javaw -jar  Tachidesk.jar");
-}

scripts/resources/readme.md

@@ -1,3 +0,0 @@
-# Building `Tachidesk Launcher.exe`
-1. compile `Tachidesk Launcher.c` statically with MSVC compiler.
-2. Add `server/src/main/resources/icon/faviconlogo.ico` into the exe with `rcedit` from the electron project: `rcedit "Tachidesk Launcher.exe" --set-icon faviconlogo.ico`

scripts/windows-bundler.sh

@@ -22,9 +22,9 @@ jre_dir="jdk8u292-b10-jre"
 
 echo "creating windows bundle"
 
-jar=$(ls ../server/build/Tachidesk-*.jar)
+jar=$(ls ../server/build/*.jar | tail -n1)
 jar_name=$(echo $jar | cut -d'/' -f4)
-release_name=$(echo $jar_name | cut -d'.' -f4 --complement)-$arch
+release_name=$(echo $jar_name | sed 's/.jar//')-$arch
 
 
 # make release dir
@@ -65,7 +65,6 @@ WINEARCH=win32 wine $rcedit $release_name/electron/electron.exe --set-icon ../se
 
 # copy artifacts
 cp $jar $release_name/Tachidesk.jar
-#cp "resources/Tachidesk Launcher-$arch.exe" "$release_name/Tachidesk Launcher.exe"
 cp "resources/Tachidesk Browser Launcher.bat" $release_name
 cp "resources/Tachidesk Debug Launcher.bat" $release_name
 cp "resources/Tachidesk Electron Launcher.bat" $release_name

server/build.gradle.kts

@@ -1,15 +1,16 @@
+
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jmailen.gradle.kotlinter.tasks.FormatTask
 import org.jmailen.gradle.kotlinter.tasks.LintTask
-import java.io.BufferedReader
 import java.time.Instant
 
 plugins {
     application
+    kotlin("plugin.serialization")
     id("com.github.johnrengelman.shadow") version "7.0.0"
     id("org.jmailen.kotlinter") version "3.4.3"
-    id("de.fuerstenau.buildconfig") version "1.1.8"
+    id("com.github.gmazzo.buildconfig") version "3.0.2"
 }
 
 repositories {
@@ -44,6 +45,10 @@ dependencies {
     // current database driver
     implementation("com.h2database:h2:1.4.200")
 
+    // Exposed Migrations
+    val exposedMigrationsVersion = "3.1.0"
+    implementation("com.github.Suwayomi:exposed-migrations:$exposedMigrationsVersion")
+
     // tray icon
     implementation("com.dorkbox:SystemTray:4.1")
     implementation("com.dorkbox:Utilities:1.9")
@@ -58,6 +63,12 @@ dependencies {
     implementation("com.github.salomonbrys.kotson:kotson:2.5.0")
 
 
+    // asm for fixing SimpleDateFormat (must match Dex2Jar version)
+    implementation("org.ow2.asm:asm-debug-all:5.0.3")
+
+    // extracting zip files
+    implementation("net.lingala.zip4j:zip4j:2.9.0")
+
     // Source models and interfaces from Tachiyomi 1.x
     // using source class from tachiyomi commit 9493577de27c40ce8b2b6122cc447d025e34c477 to not depend on tachiyomi.sourceapi
 //    implementation("tachiyomi.sourceapi:source-api:1.1")
@@ -68,19 +79,15 @@ dependencies {
 
     // uncomment to test extensions directly
 //    implementation(fileTree("lib/"))
-
-    // Testing
-    testImplementation(kotlin("test-junit5"))
 }
 
-val MainClass = "suwayomi.MainKt"
 application {
     mainClass.set(MainClass)
 
-    // for testing electron
+    // uncomment for testing electron
 //    applicationDefaultJvmArgs = listOf(
-//            "-Dsuwayomi.tachidesk.webInterface=electron",
+//            "-Dsuwayomi.tachidesk.config.server.webUIInterface=electron",
-//            "-Dsuwayomi.tachidesk.electronPath=/usr/bin/electron"
+//            "-Dsuwayomi.tachidesk.config.server.electronPath=/usr/bin/electron"
 //    )
 }
 
@@ -92,51 +99,40 @@ sourceSets {
     }
 }
 
-// should be bumped with each stable release
-val tachideskVersion = "v0.4.1"
-
-// counts commit count on master
-val tachideskRevision = runCatching {
-    Runtime
-        .getRuntime()
-        .exec("git rev-list HEAD --count")
-        .let { process ->
-            process.waitFor()
-            val output = process.inputStream.use {
-                it.bufferedReader().use(BufferedReader::readText)
-            }
-            process.destroy()
-            "r" + output.trim()
-
-        }
-}.getOrDefault("r0")
-
 buildConfig {
-    clsName = "BuildConfig"
+    className("BuildConfig")
-    packageName = "suwayomi.server"
+    packageName("suwayomi.tachidesk.server")
 
+    useKotlinOutput()
 
-    buildConfigField("String", "NAME", rootProject.name)
+    fun quoteWrap(obj: Any): String = """"$obj""""
-    buildConfigField("String", "VERSION", tachideskVersion)
+
-    buildConfigField("String", "REVISION", tachideskRevision)
+    buildConfigField("String", "NAME", quoteWrap(rootProject.name))
-    buildConfigField("String", "BUILD_TYPE", if (System.getenv("TachideskBuildType") == "Stable") "Stable" else "Preview")
+    buildConfigField("String", "VERSION", quoteWrap(tachideskVersion))
+    buildConfigField("String", "REVISION", quoteWrap(tachideskRevision))
+    buildConfigField("String", "BUILD_TYPE", quoteWrap(if (System.getenv("ProductBuildType") == "Stable") "Stable" else "Preview"))
     buildConfigField("long", "BUILD_TIME", Instant.now().epochSecond.toString())
 
-    buildConfigField("String", "GITHUB", "https://github.com/Suwayomi/Tachidesk")
+
-    buildConfigField("String", "DISCORD", "https://discord.gg/DDZdqZWaHA")
+    buildConfigField("String", "WEBUI_REPO", quoteWrap("https://github.com/Suwayomi/Tachidesk-WebUI-preview"))
+    buildConfigField("String", "WEBUI_TAG", quoteWrap(webUIRevisionTag))
+
+
+    buildConfigField("String", "GITHUB", quoteWrap("https://github.com/Suwayomi/Tachidesk"))
+    buildConfigField("String", "DISCORD", quoteWrap("https://discord.gg/DDZdqZWaHA"))
 }
 
 tasks {
     shadowJar {
         manifest {
             attributes(
-                    mapOf(
+                mapOf(
-                            "Main-Class" to MainClass,
+                    "Main-Class" to MainClass,
-                            "Implementation-Title" to rootProject.name,
+                    "Implementation-Title" to rootProject.name,
-                            "Implementation-Vendor" to "The Suwayomi Project",
+                    "Implementation-Vendor" to "The Suwayomi Project",
-                            "Specification-Version" to tachideskVersion,
+                    "Specification-Version" to tachideskVersion,
-                            "Implementation-Version" to tachideskRevision
+                    "Implementation-Version" to tachideskRevision
-                    )
+                )
             )
         }
         archiveBaseName.set(rootProject.name)
@@ -146,9 +142,10 @@ tasks {
     withType<KotlinCompile> {
         kotlinOptions {
             freeCompilerArgs = listOf(
-                    "-Xopt-in=kotlin.RequiresOptIn",
+                "-Xopt-in=kotlin.RequiresOptIn",
-                    "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+                "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-                    "-Xopt-in=kotlinx.coroutines.InternalCoroutinesApi"
+                "-Xopt-in=kotlinx.coroutines.InternalCoroutinesApi",
+                "-Xopt-in=kotlinx.serialization.ExperimentalSerializationApi",
             )
         }
     }
@@ -159,16 +156,40 @@ tasks {
 
     withType<ShadowJar> {
         destinationDirectory.set(File("$rootDir/server/build"))
-        dependsOn("formatKotlin", "lintKotlin")
     }
 
     named("run") {
-        dependsOn("formatKotlin", "lintKotlin")
+        dependsOn("formatKotlin", "lintKotlin", "downloadWebUI")
     }
 
     named<Copy>("processResources") {
         duplicatesStrategy = DuplicatesStrategy.INCLUDE
-        mustRunAfter(":webUI:copyBuild")
+        mustRunAfter("downloadWebUI")
+    }
+
+    register<de.undercouch.gradle.tasks.download.Download>("downloadWebUI") {
+        src("https://github.com/Suwayomi/Tachidesk-WebUI-preview/releases/download/$webUIRevisionTag/Tachidesk-WebUI-$webUIRevisionTag.zip")
+        dest("src/main/resources/WebUI.zip")
+
+
+        fun shouldOverwrite(): Boolean {
+            val zipPath = project.projectDir.absolutePath + "/src/main/resources/WebUI.zip"
+            val zipFile =  net.lingala.zip4j.ZipFile(zipPath)
+
+            var shouldOverwrite = true
+            if (zipFile.isValidZipFile) {
+                val zipRevision = zipFile.getInputStream(zipFile.getFileHeader("revision")).bufferedReader().use {
+                    it.readText().trim()
+                }
+
+                if (zipRevision == webUIRevisionTag)
+                    shouldOverwrite = false
+            }
+
+            return shouldOverwrite
+        }
+
+        overwrite(shouldOverwrite())
     }
 
     withType<LintTask> {

server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt

@@ -18,6 +18,7 @@ import com.google.gson.Gson
 // import eu.kanade.tachiyomi.data.track.TrackManager
 // import eu.kanade.tachiyomi.extension.ExtensionManager
 import eu.kanade.tachiyomi.network.NetworkHelper
+import kotlinx.serialization.json.Json
 import rx.Observable
 import rx.schedulers.Schedulers
 import uy.kohesive.injekt.api.InjektModule
@@ -54,6 +55,8 @@ class AppModule(val app: Application) : InjektModule {
 
         addSingletonFactory { Gson() }
 
+        addSingletonFactory { Json { ignoreUnknownKeys = true } }
+
         // Asynchronously init expensive components for a faster cold start
 
 //        rxAsync { get<PreferencesHelper>() }

server/src/main/kotlin/eu/kanade/tachiyomi/LICENSE

@@ -1,30 +1,13 @@
-/*
+Copyright 2015 Javier Tomás
-Copyright 2014 Prateek Srivastava
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-   http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-
-This file may have been modified after being copied from it's original source.
- */
-package com.f2prateek.rx.preferences;
-
-final class Preconditions {
-  static void checkNotNull(Object o, String message) {
-    if (o == null) {
-      throw new NullPointerException(message);
-    }
-  }
-
-  private Preconditions() {
-    throw new AssertionError("No instances");
-  }
-}

server/src/main/kotlin/eu/kanade/tachiyomi/animesource/AnimeCatalogueSource.kt

@@ -9,7 +9,7 @@ interface AnimeCatalogueSource : AnimeSource {
     /**
      * An ISO 639-1 compliant language code (two letters in lower case).
      */
-    val lang: String
+    override val lang: String
 
     /**
      * Whether the source has support for latest updates.

server/src/main/kotlin/eu/kanade/tachiyomi/animesource/AnimeSource.kt

@@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.animesource
 
 import eu.kanade.tachiyomi.animesource.model.SAnime
 import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
 import rx.Observable
 
 /**
@@ -19,6 +20,9 @@ interface AnimeSource {
      */
     val name: String
 
+    val lang: String
+        get() = ""
+
     /**
      * Returns an observable with the updated details for a anime.
      *
@@ -36,12 +40,12 @@ interface AnimeSource {
     fun fetchEpisodeList(anime: SAnime): Observable<List<SEpisode>>
 
     /**
-     * Returns an observable with a link for the episode of an anime.
+     * Returns an observable with a list of video for the episode of an anime.
      *
      * @param episode the episode to get the link for.
      */
 //    @Deprecated("Use getEpisodeList instead")
-    fun fetchEpisodeLink(episode: SEpisode): Observable<String>
+    fun fetchVideoList(episode: SEpisode): Observable<List<Video>>
 
 //    /**
 //     * [1.x API] Get the updated details for a anime.
@@ -74,4 +78,4 @@ interface AnimeSource {
 
 // fun AnimeSource.icon(): Drawable? = Injekt.get<AnimeExtensionManager>().getAppIconForSource(this)
 
-// fun AnimeSource.getPreferenceKey(): String = "source_$id"
+fun AnimeSource.getPreferenceKey(): String = "source_$id"

server/src/main/kotlin/eu/kanade/tachiyomi/animesource/AnimeSourceManager.kt

@@ -1,76 +0,0 @@
-package eu.kanade.tachiyomi.animesource
-
-import android.content.Context
-import eu.kanade.tachiyomi.animesource.model.SAnime
-import eu.kanade.tachiyomi.animesource.model.SEpisode
-import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
-import rx.Observable
-
-open class AnimeSourceManager(private val context: Context) {
-
-    private val sourcesMap = mutableMapOf<Long, AnimeSource>()
-
-    private val stubSourcesMap = mutableMapOf<Long, StubSource>()
-
-    init {
-        createInternalSources().forEach { registerSource(it) }
-    }
-
-    open fun get(sourceKey: Long): AnimeSource? {
-        return sourcesMap[sourceKey]
-    }
-
-    fun getOrStub(sourceKey: Long): AnimeSource {
-        return sourcesMap[sourceKey] ?: stubSourcesMap.getOrPut(sourceKey) {
-            StubSource(sourceKey)
-        }
-    }
-
-    fun getOnlineSources() = sourcesMap.values.filterIsInstance<AnimeHttpSource>()
-
-    fun getCatalogueSources() = sourcesMap.values.filterIsInstance<AnimeCatalogueSource>()
-
-    internal fun registerSource(source: AnimeSource) {
-        if (!sourcesMap.containsKey(source.id)) {
-            sourcesMap[source.id] = source
-        }
-        if (!stubSourcesMap.containsKey(source.id)) {
-            stubSourcesMap[source.id] = StubSource(source.id)
-        }
-    }
-
-    internal fun unregisterSource(source: AnimeSource) {
-        sourcesMap.remove(source.id)
-    }
-
-    private fun createInternalSources(): List<AnimeSource> = listOf(
-//        LocalAnimeSource(context)
-    )
-
-    inner class StubSource(override val id: Long) : AnimeSource {
-
-        override val name: String
-            get() = id.toString()
-
-        override fun fetchAnimeDetails(anime: SAnime): Observable<SAnime> {
-            return Observable.error(getSourceNotInstalledException())
-        }
-
-        override fun fetchEpisodeList(anime: SAnime): Observable<List<SEpisode>> {
-            return Observable.error(getSourceNotInstalledException())
-        }
-
-        override fun fetchEpisodeLink(episode: SEpisode): Observable<String> {
-            return Observable.error(getSourceNotInstalledException())
-        }
-
-        override fun toString(): String {
-            return name
-        }
-
-        private fun getSourceNotInstalledException(): Exception {
-//            return Exception(context.getString(R.string.source_not_installed, id.toString()))
-            return Exception("source not found")
-        }
-    }
-}

server/src/main/kotlin/eu/kanade/tachiyomi/animesource/ConfigurableAnimeSource.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.animesource
 
-import android.support.v7.preference.PreferenceScreen
+import androidx.preference.PreferenceScreen
 
 interface ConfigurableAnimeSource : AnimeSource {
 

server/src/main/kotlin/eu/kanade/tachiyomi/animesource/model/SAnime.kt

@@ -1,5 +1,6 @@
 package eu.kanade.tachiyomi.animesource.model
 
+// import tachiyomi.animesource.model.AnimeInfo
 import java.io.Serializable
 
 interface SAnime : Serializable {
@@ -23,9 +24,7 @@ interface SAnime : Serializable {
     var initialized: Boolean
 
     fun copyFrom(other: SAnime) {
-        if (other.title != null) {
+        title = other.title
-            title = other.title
-        }
 
         if (other.author != null) {
             author = other.author
@@ -65,3 +64,30 @@ interface SAnime : Serializable {
         }
     }
 }
+
+// fun SAnime.toAnimeInfo(): AnimeInfo {
+//    return AnimeInfo(
+//        key = this.url,
+//        title = this.title,
+//        artist = this.artist ?: "",
+//        author = this.author ?: "",
+//        description = this.description ?: "",
+//        genres = this.genre?.split(", ") ?: emptyList(),
+//        status = this.status,
+//        cover = this.thumbnail_url ?: ""
+//    )
+// }
+
+// fun AnimeInfo.toSAnime(): SAnime {
+//    val animeInfo = this
+//    return SAnime.create().apply {
+//        url = animeInfo.key
+//        title = animeInfo.title
+//        artist = animeInfo.artist
+//        author = animeInfo.author
+//        description = animeInfo.description
+//        genre = animeInfo.genres.joinToString(", ")
+//        status = animeInfo.status
+//        thumbnail_url = animeInfo.cover
+//    }
+// }

server/src/main/kotlin/eu/kanade/tachiyomi/animesource/model/SEpisode.kt

@@ -1,5 +1,6 @@
 package eu.kanade.tachiyomi.animesource.model
 
+// import tachiyomi.animesource.model.EpisodeInfo
 import java.io.Serializable
 
 interface SEpisode : Serializable {
@@ -28,3 +29,24 @@ interface SEpisode : Serializable {
         }
     }
 }
+
+// fun SEpisode.toEpisodeInfo(): EpisodeInfo {
+//    return EpisodeInfo(
+//        dateUpload = this.date_upload,
+//        key = this.url,
+//        name = this.name,
+//        number = this.episode_number,
+//        scanlator = this.scanlator ?: ""
+//    )
+// }
+//
+// fun EpisodeInfo.toSEpisode(): SEpisode {
+//    val episode = this
+//    return SEpisode.create().apply {
+//        url = episode.key
+//        name = episode.name
+//        date_upload = episode.dateUpload
+//        episode_number = episode.number
+//        scanlator = episode.scanlator
+//    }
+// }

server/src/main/kotlin/eu/kanade/tachiyomi/animesource/model/Video.kt

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

server/src/main/kotlin/eu/kanade/tachiyomi/animesource/online/AnimeHttpSource.kt

@@ -5,11 +5,11 @@ import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
 import eu.kanade.tachiyomi.animesource.model.AnimesPage
 import eu.kanade.tachiyomi.animesource.model.SAnime
 import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.network.asObservableSuccess
 import eu.kanade.tachiyomi.network.newCallWithProgress
-import eu.kanade.tachiyomi.source.model.Page
 import okhttp3.Headers
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -54,7 +54,7 @@ abstract class AnimeHttpSource : AnimeCatalogueSource {
      * Note the generated id sets the sign bit to 0.
      */
     override val id by lazy {
-        val key = "${name.toLowerCase()}/$lang/$versionId"
+        val key = "${name.lowercase()}/$lang/$versionId"
         val bytes = MessageDigest.getInstance("MD5").digest(key.toByteArray())
         (0..7).map { bytes[it].toLong() and 0xff shl 8 * (7 - it) }.reduce(Long::or) and Long.MAX_VALUE
     }
@@ -80,7 +80,7 @@ abstract class AnimeHttpSource : AnimeCatalogueSource {
     /**
      * Visible name of the source.
      */
-    override fun toString() = "$name (${lang.toUpperCase()})"
+    override fun toString() = "$name (${lang.uppercase()})"
 
     /**
      * Returns an observable containing a page with a list of anime. Normally it's not needed to
@@ -218,14 +218,6 @@ abstract class AnimeHttpSource : AnimeCatalogueSource {
         }
     }
 
-    override fun fetchEpisodeLink(episode: SEpisode): Observable<String> {
-        return client.newCall(episodeLinkRequest(episode))
-            .asObservableSuccess()
-            .map { response ->
-                episodeLinkParse(response)
-            }
-    }
-
     /**
      * Returns the request for updating the episode list. Override only if it's needed to override
      * the url, send different headers or request method like POST.
@@ -236,16 +228,6 @@ abstract class AnimeHttpSource : AnimeCatalogueSource {
         return GET(baseUrl + anime.url, headers)
     }
 
-    /**
-     * Returns the request for getting the episode link. Override only if it's needed to override
-     * the url, send different headers or request method like POST.
-     *
-     * @param episode the episode to look for links.
-     */
-    protected open fun episodeLinkRequest(episode: SEpisode): Request {
-        return GET(baseUrl + episode.url, headers)
-    }
-
     /**
      * Parses the response from the site and returns a list of episodes.
      *
@@ -254,19 +236,25 @@ abstract class AnimeHttpSource : AnimeCatalogueSource {
     protected abstract fun episodeListParse(response: Response): List<SEpisode>
 
     /**
-     * Parses the response from the site and returns a list of episodes.
+     * Returns an observable with the page list for a chapter.
      *
-     * @param response the response from the site.
+     * @param chapter the chapter whose page list has to be fetched.
      */
-    protected abstract fun episodeLinkParse(response: Response): String
+    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+        return client.newCall(videoListRequest(episode))
+            .asObservableSuccess()
+            .map { response ->
+                videoListParse(response)
+            }
+    }
 
     /**
-     * Returns the request for getting the page list. Override only if it's needed to override the
+     * Returns the request for getting the episode link. Override only if it's needed to override
-     * url, send different headers or request method like POST.
+     * the url, send different headers or request method like POST.
      *
-     * @param episode the episode whose page list has to be fetched.
+     * @param episode the episode to look for links.
      */
-    protected open fun pageListRequest(episode: SEpisode): Request {
+    protected open fun videoListRequest(episode: SEpisode): Request {
         return GET(baseUrl + episode.url, headers)
     }
 
@@ -275,7 +263,7 @@ abstract class AnimeHttpSource : AnimeCatalogueSource {
      *
      * @param response the response from the site.
      */
-    protected abstract fun pageListParse(response: Response): List<Page>
+    protected abstract fun videoListParse(response: Response): List<Video>
 
     /**
      * Returns an observable with the page containing the source url of the image. If there's any
@@ -283,20 +271,20 @@ abstract class AnimeHttpSource : AnimeCatalogueSource {
      *
      * @param page the page whose source image has to be fetched.
      */
-    open fun fetchImageUrl(page: Page): Observable<String> {
+    open fun fetchVideoUrl(video: Video): Observable<String> {
-        return client.newCall(imageUrlRequest(page))
+        return client.newCall(videoUrlRequest(video))
             .asObservableSuccess()
-            .map { imageUrlParse(it) }
+            .map { videoUrlParse(it) }
     }
 
     /**
      * Returns the request for getting the url to the source image. Override only if it's needed to
      * override the url, send different headers or request method like POST.
      *
-     * @param page the episode whose page list has to be fetched
+     * @param page the chapter whose page list has to be fetched
      */
-    protected open fun imageUrlRequest(page: Page): Request {
+    protected open fun videoUrlRequest(video: Video): Request {
-        return GET(page.url, headers)
+        return GET(video.url, headers)
     }
 
     /**
@@ -304,15 +292,15 @@ abstract class AnimeHttpSource : AnimeCatalogueSource {
      *
      * @param response the response from the site.
      */
-    protected abstract fun imageUrlParse(response: Response): String
+    protected abstract fun videoUrlParse(response: Response): String
 
     /**
      * Returns an observable with the response of the source image.
      *
      * @param page the page whose source image has to be downloaded.
      */
-    fun fetchImage(page: Page): Observable<Response> {
+    fun fetchVideo(video: Video): Observable<Response> {
-        return client.newCallWithProgress(imageRequest(page), page)
+        return client.newCallWithProgress(videoRequest(video), video)
             .asObservableSuccess()
     }
 
@@ -320,10 +308,10 @@ abstract class AnimeHttpSource : AnimeCatalogueSource {
      * Returns the request for getting the source image. Override only if it's needed to override
      * the url, send different headers or request method like POST.
      *
-     * @param page the episode whose page list has to be fetched
+     * @param video the video whose link has to be fetched
      */
-    protected open fun imageRequest(page: Page): Request {
+    protected open fun videoRequest(video: Video): Request {
-        return GET(page.imageUrl!!, headers)
+        return GET(video.videoUrl!!, headers)
     }
 
     /**

server/src/main/kotlin/eu/kanade/tachiyomi/animesource/online/AnimeHttpSourceFetcher.kt

@@ -1,26 +1,25 @@
-package eu.kanade.tachiyomi.source.online
+package eu.kanade.tachiyomi.animesource.online
 
-import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
+import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.source.model.Page
 import rx.Observable
 
-fun AnimeHttpSource.getImageUrl(page: Page): Observable<Page> {
+fun AnimeHttpSource.getVideoUrl(video: Video): Observable<Video> {
-    page.status = Page.LOAD_PAGE
+    video.status = Video.LOAD_VIDEO
-    return fetchImageUrl(page)
+    return fetchVideoUrl(video)
-        .doOnError { page.status = Page.ERROR }
+        .doOnError { video.status = Video.ERROR }
         .onErrorReturn { null }
-        .doOnNext { page.imageUrl = it }
+        .doOnNext { video.videoUrl = it }
-        .map { page }
+        .map { video }
 }
 
-fun AnimeHttpSource.fetchAllImageUrlsFromPageList(pages: List<Page>): Observable<Page> {
+fun AnimeHttpSource.fetchUrlFromVideo(video: Video): Observable<Video> {
-    return Observable.from(pages)
+    return Observable.just(video)
-        .filter { !it.imageUrl.isNullOrEmpty() }
+        .filter { !it.videoUrl.isNullOrEmpty() }
-        .mergeWith(fetchRemainingImageUrlsFromPageList(pages))
+        .mergeWith(fetchRemainingVideoUrlsFromVideoList(video))
 }
 
-fun AnimeHttpSource.fetchRemainingImageUrlsFromPageList(pages: List<Page>): Observable<Page> {
+fun AnimeHttpSource.fetchRemainingVideoUrlsFromVideoList(video: Video): Observable<Video> {
-    return Observable.from(pages)
+    return Observable.just(video)
-        .filter { it.imageUrl.isNullOrEmpty() }
+        .filter { it.videoUrl.isNullOrEmpty() }
-        .concatMap { getImageUrl(it) }
+        .concatMap { getVideoUrl(it) }
 }

server/src/main/kotlin/eu/kanade/tachiyomi/animesource/online/ParsedAnimeHttpSource.kt

@@ -3,7 +3,7 @@ package eu.kanade.tachiyomi.animesource.online
 import eu.kanade.tachiyomi.animesource.model.AnimesPage
 import eu.kanade.tachiyomi.animesource.model.SAnime
 import eu.kanade.tachiyomi.animesource.model.SEpisode
-import eu.kanade.tachiyomi.source.model.Page
+import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -159,21 +159,6 @@ abstract class ParsedAnimeHttpSource : AnimeHttpSource() {
      */
     protected abstract fun episodeListSelector(): String
 
-    /**
-     * Parses the response from the site and returns a list of episodes.
-     *
-     * @param response the response from the site.
-     */
-    override fun episodeLinkParse(response: Response): String {
-        val document = response.asJsoup()
-        return linkFromElement(document.select(episodeLinkSelector()).first())
-    }
-
-    /**
-     * Returns the Jsoup selector that returns a list of [Element] corresponding to each episode.
-     */
-    protected abstract fun episodeLinkSelector(): String
-
     /**
      * Returns a episode from the given element.
      *
@@ -181,36 +166,35 @@ abstract class ParsedAnimeHttpSource : AnimeHttpSource() {
      */
     protected abstract fun episodeFromElement(element: Element): SEpisode
 
-    /**
-     * Returns a episode from the given element.
-     *
-     * @param element an element obtained from [episodeListSelector].
-     */
-    protected abstract fun linkFromElement(element: Element): String
-
     /**
      * Parses the response from the site and returns the page list.
      *
      * @param response the response from the site.
      */
-    override fun pageListParse(response: Response): List<Page> {
+    override fun videoListParse(response: Response): List<Video> {
-        return pageListParse(response.asJsoup())
+        val document = response.asJsoup()
+        return document.select(videoListSelector()).map { videoFromElement(it) }
     }
 
     /**
-     * Returns a page list from the given document.
+     * Returns the Jsoup selector that returns a list of [Element] corresponding to each video.
-     *
-     * @param document the parsed document.
      */
-    protected abstract fun pageListParse(document: Document): List<Page>
+    protected abstract fun videoListSelector(): String
 
     /**
-     * Parse the response from the site and returns the absolute url to the source image.
+     * Returns a video from the given element.
+     *
+     * @param element an element obtained from [videoListSelector].
+     */
+    protected abstract fun videoFromElement(element: Element): Video
+
+    /**
+     * Parse the response from the site and returns the absolute url to the source video.
      *
      * @param response the response from the site.
      */
-    override fun imageUrlParse(response: Response): String {
+    override fun videoUrlParse(response: Response): String {
-        return imageUrlParse(response.asJsoup())
+        return videoUrlParse(response.asJsoup())
     }
 
     /**
@@ -218,5 +202,5 @@ abstract class ParsedAnimeHttpSource : AnimeHttpSource() {
      *
      * @param document the parsed document.
      */
-    protected abstract fun imageUrlParse(document: Document): String
+    protected abstract fun videoUrlParse(document: Document): String
 }

server/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt

@@ -18,6 +18,7 @@ import okhttp3.OkHttpClient
 // import uy.kohesive.injekt.injectLazy
 import java.util.concurrent.TimeUnit
 
+@Suppress("UNUSED_PARAMETER")
 class NetworkHelper(context: Context) {
 
 //    private val preferences: PreferencesHelper by injectLazy()

server/src/main/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt

@@ -1,14 +1,19 @@
 package eu.kanade.tachiyomi.network
 
 // import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.suspendCancellableCoroutine
 import okhttp3.Call
+import okhttp3.Callback
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
+import okhttp3.internal.closeQuietly
 import rx.Observable
 import rx.Producer
 import rx.Subscription
+import java.io.IOException
 import java.util.concurrent.atomic.AtomicBoolean
+import kotlin.coroutines.resumeWithException
 
 fun Call.asObservable(): Observable<Response> {
     return Observable.unsafeCreate { subscriber ->
@@ -48,36 +53,38 @@ fun Call.asObservable(): Observable<Response> {
 }
 
 // Based on https://github.com/gildor/kotlin-coroutines-okhttp
-// suspend fun Call.await(assertSuccess: Boolean = false): Response {
+suspend fun Call.await(): Response {
-//    return suspendCancellableCoroutine { continuation ->
+    return suspendCancellableCoroutine { continuation ->
-//        enqueue(
+        enqueue(
-//            object : Callback {
+            object : Callback {
-//                override fun onResponse(call: Call, response: Response) {
+                override fun onResponse(call: Call, response: Response) {
-//                    if (assertSuccess && !response.isSuccessful) {
+                    if (!response.isSuccessful) {
-//                        continuation.resumeWithException(Exception("HTTP error ${response.code}"))
+                        continuation.resumeWithException(Exception("HTTP error ${response.code}"))
-//                        return
+                        return
-//                    }
+                    }
-//
+
-//                    continuation.resume(response)
+                    continuation.resume(response) {
-//                }
+                        response.body?.closeQuietly()
-//
+                    }
-//                override fun onFailure(call: Call, e: IOException) {
+                }
-//                    // Don't bother with resuming the continuation if it is already cancelled.
+
-//                    if (continuation.isCancelled) return
+                override fun onFailure(call: Call, e: IOException) {
-//                    continuation.resumeWithException(e)
+                    // Don't bother with resuming the continuation if it is already cancelled.
-//                }
+                    if (continuation.isCancelled) return
-//            }
+                    continuation.resumeWithException(e)
-//        )
+                }
-//
+            }
-//        continuation.invokeOnCancellation {
+        )
-//            try {
+
-//                cancel()
+        continuation.invokeOnCancellation {
-//            } catch (ex: Throwable) {
+            try {
-//                // Ignore cancel exception
+                cancel()
-//            }
+            } catch (ex: Throwable) {
-//        }
+                // Ignore cancel exception
-//    }
+            }
-// }
+        }
+    }
+}
 
 fun Call.asObservableSuccess(): Observable<Response> {
     return asObservable()
@@ -103,6 +110,7 @@ fun Call.asObservableSuccess(): Observable<Response> {
 //    return progressClient.newCall(request)
 // }
 
+@Suppress("UNUSED_PARAMETER")
 fun OkHttpClient.newCallWithProgress(request: Request, listener: ProgressListener): Call {
     val progressClient = newBuilder()
 //        .cache(null)

server/src/main/kotlin/eu/kanade/tachiyomi/source/ConfigurableSource.kt

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

server/src/main/kotlin/eu/kanade/tachiyomi/source/Source.kt

@@ -44,4 +44,4 @@ interface Source {
 
 // fun Source.icon(): Drawable? = Injekt.get<ExtensionManager>().getAppIconForSource(this)
 
-// fun Source.getPreferenceKey(): String = "source_$id"
+fun Source.getPreferenceKey(): String = "source_$id"

server/src/main/kotlin/eu/kanade/tachiyomi/source/SourceManager.kt

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

server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt

@@ -61,3 +61,30 @@ interface SManga : Serializable {
         }
     }
 }
+
+// fun SManga.toMangaInfo(): MangaInfo {
+//    return MangaInfo(
+//        key = this.url,
+//        title = this.title,
+//        artist = this.artist ?: "",
+//        author = this.author ?: "",
+//        description = this.description ?: "",
+//        genres = this.genre?.split(", ") ?: emptyList(),
+//        status = this.status,
+//        cover = this.thumbnail_url ?: ""
+//    )
+// }
+//
+// fun MangaInfo.toSManga(): SManga {
+//    val mangaInfo = this
+//    return SManga.create().apply {
+//        url = mangaInfo.key
+//        title = mangaInfo.title
+//        artist = mangaInfo.artist
+//        author = mangaInfo.author
+//        description = mangaInfo.description
+//        genre = mangaInfo.genres.joinToString(", ")
+//        status = mangaInfo.status
+//        thumbnail_url = mangaInfo.cover
+//    }
+// }

server/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt

@@ -55,7 +55,7 @@ abstract class HttpSource : CatalogueSource {
      * Note the generated id sets the sign bit to 0.
      */
     override val id by lazy {
-        val key = "${name.toLowerCase()}/$lang/$versionId"
+        val key = "${name.lowercase()}/$lang/$versionId"
         val bytes = MessageDigest.getInstance("MD5").digest(key.toByteArray())
         (0..7).map { bytes[it].toLong() and 0xff shl 8 * (7 - it) }.reduce(Long::or) and Long.MAX_VALUE
     }
@@ -81,7 +81,7 @@ abstract class HttpSource : CatalogueSource {
     /**
      * Visible name of the source.
      */
-    override fun toString() = "$name (${lang.toUpperCase()})"
+    override fun toString() = "$name (${lang.uppercase()})"
 
     /**
      * Returns an observable containing a page with a list of manga. Normally it's not needed to

server/src/main/kotlin/suwayomi/anime/impl/extension/github/OnlineExtension.kt

@@ -1,12 +0,0 @@
-package suwayomi.anime.impl.extension.github
-
-data class OnlineExtension(
-    val name: String,
-    val pkgName: String,
-    val versionName: String,
-    val versionCode: Int,
-    val lang: String,
-    val isNsfw: Boolean,
-    val apkName: String,
-    val iconUrl: String
-)

server/src/main/kotlin/suwayomi/server/ServerConfig.kt

@@ -1,33 +0,0 @@
-package suwayomi.server
-
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-import com.typesafe.config.Config
-import io.github.config4k.getValue
-import xyz.nulldev.ts.config.ConfigModule
-import xyz.nulldev.ts.config.GlobalConfigManager
-import xyz.nulldev.ts.config.debugLogsEnabled
-
-class ServerConfig(config: Config) : ConfigModule(config) {
-    val ip: String by config
-    val port: Int by config
-
-    // proxy
-    val socksProxyEnabled: Boolean by config
-    val socksProxyHost: String by config
-    val socksProxyPort: String by config
-
-    // misc
-    val debugLogsEnabled: Boolean = debugLogsEnabled(GlobalConfigManager.config)
-    val systemTrayEnabled: Boolean by config
-    val initialOpenInBrowserEnabled: Boolean by config
-
-    companion object {
-        fun register(config: Config) = ServerConfig(config.getConfig("server"))
-    }
-}

server/src/main/kotlin/suwayomi/server/database/migration/M0002_ChapterTableIndexRename.kt

@@ -1,24 +0,0 @@
-package suwayomi.server.database.migration
-
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-import org.jetbrains.exposed.sql.transactions.TransactionManager
-import org.jetbrains.exposed.sql.vendors.currentDialect
-import suwayomi.server.database.migration.lib.Migration
-
-@Suppress("ClassName", "unused")
-class M0002_ChapterTableIndexRename : Migration() {
-    /** this migration renamed ChapterTable.NUMBER_IN_LIST to ChapterTable.INDEX */
-    override fun run() {
-        with(TransactionManager.current()) {
-            exec("ALTER TABLE CHAPTER ALTER COLUMN NUMBER_IN_LIST RENAME TO INDEX")
-            commit()
-            currentDialect.resetCaches()
-        }
-    }
-}

server/src/main/kotlin/suwayomi/server/database/migration/M0003_DefaultCategory.kt

@@ -1,24 +0,0 @@
-package suwayomi.server.database.migration
-
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-import org.jetbrains.exposed.sql.transactions.TransactionManager
-import org.jetbrains.exposed.sql.vendors.currentDialect
-import suwayomi.server.database.migration.lib.Migration
-
-@Suppress("ClassName", "unused")
-class M0003_DefaultCategory : Migration() {
-    /** this migration renamed CategoryTable.IS_LANDING to ChapterTable.IS_DEFAULT */
-    override fun run() {
-        with(TransactionManager.current()) {
-            exec("ALTER TABLE CATEGORY ALTER COLUMN IS_LANDING RENAME TO IS_DEFAULT")
-            commit()
-            currentDialect.resetCaches()
-        }
-    }
-}

server/src/main/kotlin/suwayomi/server/database/migration/lib/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 Andreas Mausch
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

server/src/main/kotlin/suwayomi/server/database/migration/lib/Migration.kt

@@ -1,25 +0,0 @@
-package suwayomi.server.database.migration.lib
-
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-// originally licenced under MIT by Andreas Mausch, Changes are licenced under Mozilla Public License, v. 2.0.
-// adopted from: https://gitlab.com/andreas-mausch/exposed-migrations/-/tree/4bf853c18a24d0170eda896ddbb899cb01233595
-
-abstract class Migration {
-    val name: String
-    val version: Int
-
-    init {
-        val groups = Regex("^M(\\d+)_(.*)$").matchEntire(this::class.simpleName!!)?.groupValues
-            ?: throw IllegalArgumentException("Migration class name doesn't match convention")
-        version = groups[1].toInt()
-        name = groups[2]
-    }
-
-    abstract fun run()
-}

server/src/main/kotlin/suwayomi/server/database/migration/lib/MigrationEntity.kt

@@ -1,37 +0,0 @@
-package suwayomi.server.database.migration.lib
-
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-// originally licenced under MIT by Andreas Mausch, Changes are licenced under Mozilla Public License, v. 2.0.
-// adopted from: https://gitlab.com/andreas-mausch/exposed-migrations/-/tree/4bf853c18a24d0170eda896ddbb899cb01233595
-
-import org.jetbrains.exposed.dao.IntEntity
-import org.jetbrains.exposed.dao.IntEntityClass
-import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.dao.id.IdTable
-import org.jetbrains.exposed.sql.`java-time`.timestamp
-
-object MigrationsTable : IdTable<Int>() {
-    override val id = integer("version").entityId()
-    override val primaryKey = PrimaryKey(id)
-
-    val name = varchar("name", length = 400)
-    val executedAt = timestamp("executed_at")
-
-    init {
-        index(true, name)
-    }
-}
-
-class MigrationEntity(id: EntityID<Int>) : IntEntity(id) {
-    companion object : IntEntityClass<MigrationEntity>(MigrationsTable)
-
-    var version by MigrationsTable.id
-    var name by MigrationsTable.name
-    var executedAt by MigrationsTable.executedAt
-}

server/src/main/kotlin/suwayomi/server/database/migration/lib/runMigrations.kt

@@ -1,123 +0,0 @@
-package suwayomi.server.database.migration.lib
-
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-// originally licenced under MIT by Andreas Mausch, Changes are licenced under Mozilla Public License, v. 2.0.
-// adopted from: https://gitlab.com/andreas-mausch/exposed-migrations/-/tree/4bf853c18a24d0170eda896ddbb899cb01233595
-
-import mu.KotlinLogging
-import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.sql.Database
-import org.jetbrains.exposed.sql.SchemaUtils.create
-import org.jetbrains.exposed.sql.exists
-import org.jetbrains.exposed.sql.transactions.TransactionManager
-import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.server.ServerConfig
-import java.nio.file.FileSystems
-import java.nio.file.Files
-import java.nio.file.Paths
-import java.time.Clock
-import java.time.Instant.now
-import kotlin.io.path.ExperimentalPathApi
-import kotlin.io.path.isDirectory
-import kotlin.io.path.name
-import kotlin.streams.toList
-
-private val logger = KotlinLogging.logger {}
-
-fun runMigrations(migrations: List<Migration>, database: Database = TransactionManager.defaultDatabase!!, clock: Clock = Clock.systemUTC()) {
-    checkVersions(migrations)
-
-    logger.info { "Running migrations on database ${database.url}" }
-
-    val latestVersion = transaction(database) {
-        createTableIfNotExists(database)
-        MigrationEntity.all().maxByOrNull { it.version }?.version?.value
-    }
-
-    logger.info { "Database version before migrations: $latestVersion" }
-
-    migrations
-        .sortedBy { it.version }
-        .filter { shouldRun(latestVersion, it) }
-        .forEach {
-            logger.info { "Running migration version ${it.version}: ${it.name}" }
-            transaction(database) {
-                it.run()
-
-                MigrationEntity.new {
-                    version = EntityID(it.version, MigrationsTable)
-                    name = it.name
-                    executedAt = now(clock)
-                }
-            }
-        }
-
-    logger.info { "Migrations finished successfully" }
-}
-
-@OptIn(ExperimentalPathApi::class)
-private fun getTopLevelClasses(packageName: String): List<Class<*>> {
-    ServerConfig::class.java.getResource("/" + "suwayomi.server.database.migration".replace('.', '/'))
-    val path = "/" + packageName.replace('.', '/')
-    val uri = ServerConfig::class.java.getResource(path).toURI()
-
-    return when (uri.scheme) {
-        "jar" -> {
-            val fileSystem = FileSystems.newFileSystem(uri, emptyMap<String, Any>())
-            fileSystem.getPath(path)
-        }
-        else -> Paths.get(uri)
-    }.let { Files.walk(it, 1) }
-        .toList()
-        .filterNot { it.isDirectory() || it.name.contains('$') } // '$' means it's not a top level class
-        .filter { it.name.endsWith(".class") }
-        .map { Class.forName("$packageName.${it.name.substringBefore(".class")}") }
-}
-
-@Suppress("UnstableApiUsage")
-fun loadMigrationsFrom(packageName: String): List<Migration> {
-    return getTopLevelClasses(packageName)
-        .map {
-            logger.debug("found Migration class ${it.name}")
-            val clazz = it.getDeclaredConstructor().newInstance()
-            if (clazz is Migration)
-                clazz
-            else
-                throw RuntimeException("found a class that's not a Migration")
-        }
-}
-
-private fun checkVersions(migrations: List<Migration>) {
-    val sorted = migrations.map { it.version }.sorted()
-    if ((1..migrations.size).toList() != sorted) {
-        throw IllegalStateException("List of migrations version is not consecutive: $sorted")
-    }
-}
-
-private fun createTableIfNotExists(database: Database) {
-    if (MigrationsTable.exists()) {
-        return
-    }
-    val tableNames = database.dialect.allTablesNames()
-    when (tableNames.isEmpty()) {
-        true -> {
-            logger.info { "Empty database found, creating table for migrations" }
-            create(MigrationsTable)
-        }
-        false -> throw IllegalStateException("Tried to run migrations against a non-empty database without a Migrations table. This is not supported.")
-    }
-}
-
-private fun shouldRun(latestVersion: Int?, migration: Migration): Boolean {
-    val run = latestVersion?.let { migration.version > it } ?: true
-    if (!run) {
-        logger.debug { "Skipping migration version ${migration.version}: ${migration.name}" }
-    }
-    return run
-}

server/src/main/kotlin/suwayomi/server/util/Browser.kt

@@ -1,38 +0,0 @@
-package suwayomi.server.util
-
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-import dorkbox.util.Desktop
-import suwayomi.server.serverConfig
-
-object Browser {
-    private val appIP = if (serverConfig.ip == "0.0.0.0") "127.0.0.1" else serverConfig.ip
-    private val appBaseUrl = "http://$appIP:${serverConfig.port}"
-
-    private val electronInstances = mutableListOf<Any>()
-
-    fun openInBrowser() {
-
-        val openInElectron = System.getProperty("suwayomi.server.webInterface")?.equals("electron")
-
-        if (openInElectron == true) {
-            try {
-                val electronPath = System.getProperty("suwayomi.server.electronPath")!!
-                electronInstances.add(ProcessBuilder(electronPath, appBaseUrl).start())
-            } catch (e: Throwable) { // cover both java.lang.Exception and java.lang.Error
-                e.printStackTrace()
-            }
-        } else {
-            try {
-                Desktop.browseURL(appBaseUrl)
-            } catch (e: Throwable) { // cover both java.lang.Exception and java.lang.Error
-                e.printStackTrace()
-            }
-        }
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/Main.kt

@@ -1,4 +1,4 @@
-package suwayomi
+package suwayomi.tachidesk
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -7,8 +7,8 @@ package suwayomi
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-import suwayomi.server.JavalinSetup.javalinSetup
+import suwayomi.tachidesk.server.JavalinSetup.javalinSetup
-import suwayomi.server.applicationSetup
+import suwayomi.tachidesk.server.applicationSetup
 
 fun main() {
     applicationSetup()