fix typo

.gitattributes

@@ -1,28 +1,6 @@
-* text=auto
-* text eol=lf
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+*.bat           text eol=crlf
 
-# Windows forced line-endings
-/.idea/* text eol=crlf
-*.bat    text eol=crlf
-*.ps1    text eol=crlf
-
-# Gradle wrapper
-*.jar binary
-
-# Binary files types
-*.webp binary
-*.png binary
-*.jpg binary
-*.jpeg binary
-*.gif binary
-*.ico binary
-*.gz binary
-*.zip binary
-*.7z binary
-*.ttf binary
-*.eot binary
-*.woff binary
-*.pyc binary
-*.swp binary
-*.pdf binary
-*.exe binary

.github/ISSUE_TEMPLATE/bug_report.md

@@ -25,7 +25,6 @@ Note that the issue will be automatically closed if you do not fill out the titl
 ## Device information
 - Tachidesk version: (Example: v0.2.3-r255-win32)
 - Server Operating System: (Example: Ubuntu 20.04)
-- Server Desktop Environment: N/A or (Example: Gnome 40)
 - Server JVM version: bundled with win32 or (Example: Java 8 Update 281 or OpenJDK 8u281)
 - Client Operating System: <usually the same as above Server Operating System>
 - Client Web Browser: (Example: Google Chrome 89.0.4389.82) 

.github/scripts/commit-repo.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+git lfs install
+#git lfs track "*.zip"
+
+cp ../master/repo/* .
+new_jar_build=$(ls *.jar| tail -1)
+echo "last jar build file name: $new_jar_build"
+
+new_win32_build=$(ls *.zip| tail -1)
+echo "last win32 build file name: $new_win32_build"
+
+cp -f $new_jar_build Tachidesk-latest.jar
+cp -f $new_win32_build Tachidesk-latest-win32.zip
+
+git config --global user.email "github-actions[bot]@users.noreply.github.com"
+git config --global user.name "github-actions[bot]"
+git status
+if [ -n "$(git status --porcelain)" ]; then
+    git add .
+    git commit -m "Update repo"
+    git push
+else
+    echo "No changes to commit"
+fi

.github/scripts/create-repo.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Get last commit message
+#last_commit_log=$(git log -1 --pretty=format:"%s")
+#echo "last commit log: $last_commit_log"
+#
+#filter_count=$(echo "$last_commit_log" | grep -e '\[RELEASE CI\]' -e '\[CI RELEASE\]' | wc -c)
+#echo "count is: $filter_count"
+
+mkdir -p repo/
+cp server/build/Tachidesk-*.jar repo/
+cp server/build/Tachidesk-*.zip repo/
+
+ls repo
+pwd
+
+#if [ "$filter_count" -gt 0 ]; then
+#  cp server/build/Tachidesk-*.jar repo/
+#  cp server/build/Tachidesk-*.zip repo/
+#fi

.github/workflows/build.yml

@@ -1,6 +1,9 @@
-name: CI Pull Request
+name: CI
 
 on:
+  push:
+    branches:
+      - master
   pull_request:
 
 jobs:
@@ -16,21 +19,21 @@ jobs:
         uses: gradle/wrapper-validation-action@v1
 
   build:
-    name: Build pull request
+    name: Build FatJar
     needs: check_wrapper
     if: "!startsWith(github.event.head_commit.message, '[SKIP CI]')"
     runs-on: ubuntu-latest
 
     steps:
       - name: Cancel previous runs
-        uses: styfle/cancel-workflow-action@0.9.0
+        uses: styfle/cancel-workflow-action@0.5.0
         with:
           access_token: ${{ github.token }}
 
-      - name: Checkout pull request
+      - name: Checkout master branch
         uses: actions/checkout@v2
         with:
-          ref: ${{ github.event.pull_request.head.sha }}
+          ref: master
           path: master
           fetch-depth: 0
 
@@ -48,14 +51,21 @@ jobs:
       - name: Download android.jar
         run: |
           cd master
-          curl https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
+          curl https://raw.githubusercontent.com/AriaMoradi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
 
-      - name: Build Jar
+      - name: Cache node_modules
+        uses: actions/cache@v2
+        with:
+          path: |
+            **/react/node_modules
+          key: ${{ runner.os }}-${{ hashFiles('**/react/yarn.lock') }}
+
+      - name: Build Jar and launch4j
         uses: eskatos/gradle-command-action@v1
         with:
           build-root-directory: master
           wrapper-directory: master
-          arguments: :server:shadowJar --stacktrace
+          arguments: :server:windowsPackage --stacktrace
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true

.github/workflows/build_push.yml

@@ -1,129 +0,0 @@
-name: CI build
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  check_wrapper:
-    name: Validate Gradle Wrapper
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Clone repo
-        uses: actions/checkout@v2
-
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
-
-  build:
-    name: Build artifacts and deploy preview
-    needs: check_wrapper
-    if: "!startsWith(github.event.head_commit.message, '[SKIP CI]')"
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Cancel previous runs
-        uses: styfle/cancel-workflow-action@0.9.0
-        with:
-          access_token: ${{ github.token }}
-
-      - name: Checkout master branch
-        uses: actions/checkout@v2
-        with:
-          ref: master
-          path: master
-          fetch-depth: 0
-
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-
-      - name: Copy CI gradle.properties
-        run: |
-          cd master
-          mkdir -p ~/.gradle
-          cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
-
-      - name: Download android.jar
-        run: |
-          cd master
-          curl https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
-
-      - name: Build Jar
-        uses: eskatos/gradle-command-action@v1
-        env:
-          ProductBuildType: "Preview"
-        with:
-          build-root-directory: master
-          wrapper-directory: master
-          arguments: :server:shadowJar --stacktrace
-          wrapper-cache-enabled: true
-          dependencies-cache-enabled: true
-          configuration-cache-enabled: true
-
-#      - name: Mock Build and copy webUI, Build Jar
-#        run: |
-#          mkdir -p master/server/build
-#          cd master/server/build
-#          echo "test" > Tachidesk-v0.3.8-r583.jar
-
-      - name: Generate Tag Name
-        id: GenTagName
-        run: |
-          cd master/server/build
-          genTag=$(ls *.jar | sed -e's/Tachidesk-Server-\|.jar//g')
-          echo "$genTag"
-          echo "::set-output name=value::$genTag"
-
-      - name: make bundle packages
-        run: |
-          cd master/scripts
-          ./windows-bundler.sh win32
-          ./windows-bundler.sh win64
-          ./unix-bundler.sh linux-x64
-          ./unix-bundler.sh macOS-x64
-          ./unix-bundler.sh macOS-arm64
-
-#      - name: Mock make windows packages
-#        run: |
-#           cd master/server/build
-#           echo test > Tachidesk-v0.3.8-r580-win32.zip
-
-      - name: Checkout preview branch
-        uses: actions/checkout@v2
-        with:
-          repository: 'Suwayomi/Tachidesk-Server-preview'
-          ref: main
-          path: preview
-          token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }}
-
-      - name: Create Tag
-        run: |
-          TAG="${{ steps.GenTagName.outputs.value }}"
-          echo "tag: $TAG"
-          cd preview
-          echo "{ \"latest\": \"$TAG\" }" > index.json
-          git add index.json
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          git config --global user.name "github-actions[bot]"
-          git commit -m "Updated to $TAG"
-          git push origin main
-
-          git tag $TAG
-          git push origin $TAG
-
-      - name: Upload Preview Release
-        uses: ncipollo/release-action@v1
-        with:
-          token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }}
-          artifacts: "master/server/build/*.jar,master/server/build/*.zip,master/server/build/*.tar.gz"
-          owner: "Suwayomi"
-          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/issue_closer.yml

@@ -26,7 +26,7 @@ jobs:
               },
               {
                 "type": "body",
-                "regex": "(Tachidesk version|Server Operating System|Server Desktop Environment|Server JVM version|Client Operating System|Client Web Browser):.*(\\(Example:|<usually).*",
+                "regex": "(Tachidesk version|Server Operating System|Server JVM version|Client Operating System|Client Web Browser):.*(\\(Example:|<usually).*",
                 "message": "The requested information was not filled out"
               },
               {

.github/workflows/publish.yml

@@ -1,4 +1,4 @@
-name: CI Publish
+name: Publish
 
 on:
   push:
@@ -18,20 +18,20 @@ jobs:
         uses: gradle/wrapper-validation-action@v1
 
   build:
-    name: Build artifacts and release
+    name: Build FatJar
     needs: check_wrapper
     runs-on: ubuntu-latest
 
     steps:
       - name: Cancel previous runs
-        uses: styfle/cancel-workflow-action@0.9.0
+        uses: styfle/cancel-workflow-action@0.5.0
         with:
           access_token: ${{ github.token }}
 
-      - name: Checkout ${{ github.ref }}
+      - name: Checkout master branch
         uses: actions/checkout@v2
         with:
-          ref: ${{ github.ref }}
+          ref: master
           path: master
           fetch-depth: 0
 
@@ -49,41 +49,82 @@ jobs:
       - name: Download android.jar
         run: |
           cd master
-          curl https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
+          curl https://raw.githubusercontent.com/AriaMoradi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
 
-      - name: Build and copy webUI, Build Jar
+      - name: Cache node_modules
+        uses: actions/cache@v2
+        with:
+          path: |
+            **/react/node_modules
+          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+
+      - name: Build no-webUI Jar
         uses: eskatos/gradle-command-action@v1
-        env:
-          ProductBuildType: "Stable"
         with:
           build-root-directory: master
           wrapper-directory: master
-          arguments: :server:downloadWebUI :server:shadowJar --stacktrace
+          arguments: :server:shadowJar -x :webUI:copyBuild --stacktrace
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
 
-      - name: make bundle packages
+      - name: Rename the no-webUI Jar
         run: |
-          cd master/scripts
-          ./windows-bundler.sh win32
-          ./windows-bundler.sh win64
-          ./unix-bundler.sh linux-x64
-          ./unix-bundler.sh macOS-x64
-          ./unix-bundler.sh macOS-arm64
+          cd master/server/build
+          mv Tachidesk-*.jar $(ls *.jar | sed 's/\.jar/-no-webUI\.jar/g')
+
+      - name: Build Jar and launch4j
+        uses: eskatos/gradle-command-action@v1
+        with:
+          build-root-directory: master
+          wrapper-directory: master
+          arguments: :server:windowsPackage --stacktrace
+          wrapper-cache-enabled: true
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: true
+
+
+      - name: Create repo artifacts
+        run: |
+          cd master
+          ./.github/scripts/create-repo.sh
 
       - name: Upload Release
-        uses: xresloader/upload-to-github-release@v1
+        uses: xresloader/upload-to-github-release@master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          file: "master/server/build/*.jar;master/server/build/*.zip;master/server/build/*.tar.gz"
+          file: "master/repo/*"
           tags: true
           draft: true
           verbose: true
 
-      - name: Run Docker build workflow
-        run: |
-          sleep 10 # sleep a bit to make sure the release is actually inside github db
-          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
-          
+#      - name: Create Release
+#        id: create_release
+#        uses: actions/create-release@v1
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#        with:
+#          tag_name: ${{ github.ref }}
+#          release_name: Release ${{ github.ref }}
+#          body: |
+#                  Release body
+#          draft: false
+#          prerelease: true
+#
+#      - name: Get the Ref
+#        id: get-ref
+#        uses: ankitvgupta/ref-to-tag-action@master
+#        with:
+#          ref: ${{ github.ref }}
+#          head_ref: ${{ github.head_ref }}
+#
+#      - name: Get the tag
+#        run: echo "The tag was ${{ steps.get-ref.outputs.tag }}"
+#
+#      - name: Upload Release
+#        uses: AButler/upload-release-assets@v2.0
+#        with:
+#          files: 'master/repo/*'
+#          repo-token: ${{ secrets.GITHUB_TOKEN }}
+#          release-tag: ${{ steps.get-ref.outputs.tag }}

.gitignore

@@ -1,17 +1,8 @@
 # Ignore Gradle project-specific cache directory
 .gradle
 .idea
-gradle.properties
 
 # Ignore Gradle build output directory
 build
 
-server/src/main/resources/WebUI.zip
-server/tmp/
-server/tachiserver-data/
-
-# bundle asset downlaods
-OpenJDK*.*
-zulu*jre*
-electron-*.*
-rcedit-*
+server/src/main/resources/react

AndroidCompat/Config/build.gradle

@@ -0,0 +1,4 @@
+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,20 +0,0 @@
-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 net.harawata.appdirs.AppDirsFactory
-
-const val CONFIG_PREFIX = "suwayomi.tachidesk.config"
-
-val ApplicationRootDir: String
-    get(): String {
-        return System.getProperty(
-                "$CONFIG_PREFIX.server.rootDir",
-                AppDirsFactory.getInstance().getUserDataDir("Tachidesk", null, null)
-        )
-    }

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

@@ -1,23 +1,18 @@
 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 ch.qos.logback.classic.Level
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import com.typesafe.config.ConfigRenderOptions
 import mu.KotlinLogging
+import net.harawata.appdirs.AppDirsFactory
 import java.io.File
 
 /**
  * Manages app config.
  */
 open class ConfigManager {
+    private val dataRoot by lazy { AppDirsFactory.getInstance().getUserDataDir("Tachidesk", null, null)!! }
+
     private val generatedModules = mutableMapOf<Class<out ConfigModule>, ConfigModule>()
     val config by lazy { loadConfigs() }
 
@@ -25,6 +20,8 @@ open class ConfigManager {
     val loadedModules: Map<Class<out ConfigModule>, ConfigModule>
         get() = generatedModules
 
+    open val appConfigFile: String = "$dataRoot/server.conf"
+
     val logger = KotlinLogging.logger {}
 
     /**
@@ -35,7 +32,6 @@ open class ConfigManager {
     /**
      * Get a config module (Java API)
      */
-    @Suppress("UNCHECKED_CAST")
     fun <T : ConfigModule> module(type: Class<T>): T = loadedModules[type] as T
 
     /**
@@ -43,34 +39,21 @@ open class ConfigManager {
      */
     fun loadConfigs(): Config {
         //Load reference configs
-        val compatConfig = ConfigFactory.parseResources("compat-reference.conf")
+        val compatConfig =  ConfigFactory.parseResources("compat-reference.conf")
         val serverConfig = ConfigFactory.parseResources("server-reference.conf")
-        val baseConfig =
-                ConfigFactory.parseMap(
-                        mapOf(
-                                "androidcompat.rootDir" to "$ApplicationRootDir/android-compat" // override AndroidCompat's rootDir
-                        )
-                )
 
         //Load user config
         val userConfig =
-                File(ApplicationRootDir, "server.conf").let {
+            File(appConfigFile).let{
                     ConfigFactory.parseFile(it)
-                }
-
+            }
 
         val config = ConfigFactory.empty()
-                .withFallback(baseConfig)
                 .withFallback(userConfig)
                 .withFallback(compatConfig)
                 .withFallback(serverConfig)
                 .resolve()
 
-        // set log level early
-        if (debugLogsEnabled(config)) {
-            setLogLevel(Level.DEBUG)
-        }
-
         logger.debug {
             "Loaded config:\n" + config.root().render(ConfigRenderOptions.concise().setFormatted(true))
         }
@@ -79,7 +62,7 @@ open class ConfigManager {
     }
 
     fun registerModule(module: ConfigModule) {
-        generatedModules[module.javaClass] = module
+        generatedModules.put(module.javaClass, module)
     }
 
     fun registerModules(vararg modules: ConfigModule) {

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

@@ -1,44 +1,8 @@
 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.
  */
-@Suppress("UNUSED_PARAMETER")
 abstract class ConfigModule(config: Config)
-
-/**
- * Abstract jvm-commandline-argument-overridable config module.
- */
-abstract class SystemPropertyOverridableConfigModule(config: Config, moduleName: String): ConfigModule(config) {
-    val overridableConfig = SystemPropertyOverrideDelegate(config, moduleName)
-}
-
-/** Defines a config property that is overridable with jvm `-D` commandline arguments prefixed with [CONFIG_PREFIX] */
-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(
-            "$CONFIG_PREFIX.$moduleName.${property.name}",
-            configValue.toString()
-        )
-
-        return when(T::class.simpleName) {
-            "Int" -> combined.toInt()
-            "Boolean" -> combined.toBoolean()
-            // add more types as needed
-            else -> combined // covers String
-        } as T
-    }
-}

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

@@ -1,20 +0,0 @@
-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 ch.qos.logback.classic.Level
-import com.typesafe.config.Config
-import mu.KotlinLogging
-import org.slf4j.Logger
-
-fun setLogLevel(level: Level) {
-    (KotlinLogging.logger(Logger.ROOT_LOGGER_NAME).underlyingLogger as ch.qos.logback.classic.Logger).level = level
-}
-
-fun debugLogsEnabled(config: Config)
-    = 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

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

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

@@ -0,0 +1,22 @@
+[
+  {
+    "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,12 +1,12 @@
 
 plugins {
     application
-    kotlin("plugin.serialization")
 }
 
 
 repositories {
     mavenCentral()
+    jcenter()
     maven {
         url = uri("https://jitpack.io")
     }
@@ -18,40 +18,44 @@ repositories {
 
 dependencies {
     // Android stub library
+//    compileOnly( fileTree(File(rootProject.rootDir, "libs/android"), include: "*.jar")
     implementation(fileTree("lib/"))
+    implementation(fileTree("${rootProject.rootDir}/server/lib/dex2jar/"))
+
+
+    // 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")
+
+    // Coroutines
+    val kotlinx_coroutines_version = "1.4.2"
+    compileOnly( "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version")
+    compileOnly( "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$kotlinx_coroutines_version")
 
     // 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"))
+    implementation( project(":AndroidCompat:Config"))
+
+    // dex2jar
+//    compileOnly( "dex2jar:dex-translator")
+
+    // APK parser
+    compileOnly("net.dongliu:apk-parser:2.6.10")
 
     // APK sig verifier
     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
-    implementation("org.mozilla:rhino-runtime:1.7.13") // slimmer version of 'org.mozilla:rhino'
-    implementation("org.mozilla:rhino-engine:1.7.13") // provides the same interface as 'javax.script' a.k.a Nashorn
-
-    // 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")
-    }
+//    compileOnly("io.reactivex:rxjava:1.3.8")
 }
 
 //def fatJarTask = tasks.getByPath(':AndroidCompat:JVMPatch:fatJar')

AndroidCompat/getAndroid.ps1

@@ -1,106 +0,0 @@
-# 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/.
-
-# This is a windows only PowerShell script to create android.jar stubs
-
-# foolproof against running from AndroidCompat dir instead of running from project root
-if ($(Split-Path -Path (Get-Location) -Leaf) -eq "AndroidCompat" ) {
-    Set-Location ..
-}
-
-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/+/6cd31be5e4e25901aadf838120d71a79b46d9add/30/public/android.jar?format=TEXT" -UseBasicParsing).content
-
-$android_jar = (Get-Location).Path + "\tmp\android.jar"
-
-[IO.File]::WriteAllBytes($android_jar, [Convert]::FromBase64String($androidEncoded))
-
-# We need to remove any stub classes that we have implementations for
-Write-Output "Patching JAR..."
-
-function Remove-Files-Zip($zipfile, $paths)
-{
-    [Reflection.Assembly]::LoadWithPartialName('System.IO.Compression') | Out-Null
-
-    $stream = New-Object IO.FileStream($zipfile, [IO.FileMode]::Open)
-    $mode   = [IO.Compression.ZipArchiveMode]::Update
-    $zip    = New-Object IO.Compression.ZipArchive($stream, $mode)
-
-    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()
-    $stream.Dispose()
-}
-
-Write-Output "Removing org.json..."
-Remove-Files-Zip $android_jar 'org/json/*'
-
-Write-Output "Removing org.apache..."
-Remove-Files-Zip $android_jar 'org/apache/*'
-
-Write-Output "Removing org.w3c..."
-Remove-Files-Zip $android_jar 'org/w3c/*'
-
-Write-Output "Removing org.xml..."
-Remove-Files-Zip $android_jar 'org/xml/*'
-
-Write-Output "Removing org.xmlpull..."
-Remove-Files-Zip $android_jar 'org/xmlpull/*'
-
-Write-Output "Removing junit..."
-Remove-Files-Zip $android_jar 'junit/*'
-
-Write-Output "Removing javax..."
-Remove-Files-Zip $android_jar 'javax/*'
-
-Write-Output "Removing java..."
-Remove-Files-Zip $android_jar 'java/*'
-
-Write-Output "Removing overriden classes..."
-Remove-Files-Zip $android_jar 'android/app/Application.class'
-Remove-Files-Zip $android_jar 'android/app/Service.class'
-Remove-Files-Zip $android_jar 'android/net/Uri.class'
-Remove-Files-Zip $android_jar 'android/net/Uri$Builder.class'
-Remove-Files-Zip $android_jar 'android/os/Environment.class'
-Remove-Files-Zip $android_jar 'android/text/format/Formatter.class'
-Remove-Files-Zip $android_jar 'android/text/Html.class'
-
-function Dedupe($path)
-{
-    Push-Location $path
-    $classes = Get-ChildItem . *.* -Recurse | Where-Object { !$_.PSIsContainer }
-    $classes | ForEach-Object {
-        "Processing class: $($_.FullName)"
-        Remove-Files-Zip $android_jar ("$($_.Name).class","$($_.Name)$*.class","$($_.Name)Kt.class","$($_.Name)Kt$*.class") | Out-Null
-    }
-    Pop-Location
-}
-
-Dedupe "AndroidCompat/src/main/java"
-Dedupe "server/src/main/kotlin"
-
-Write-Output "Copying Android.jar to library folder..."
-Move-Item -Force $android_jar "AndroidCompat/lib/android.jar"
-
-Write-Output "Cleaning up..."
-Remove-Item -Recurse -Force "tmp"
-
-Write-Output "Done!"

AndroidCompat/getAndroid.sh

@@ -1,26 +1,7 @@
 #!/usr/bin/env bash
 
-# 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/.
-
-# This is a bash script to create android.jar stubs
-
-for dep in "curl" "base64" "zip"
-do
-  which $dep >/dev/null 2>&1 || { echo >&2 "Error: This script needs $dep installed."; abort=yes; }
-done
-
-if [ "$abort" = yes ]; then
-  echo "Some of the dependencies didn't exist. Aborting."
-  exit 1
-fi
-
-
 # foolproof against running from AndroidCompat dir instead of running from project root
-if [ "$(basename "$(pwd)")" = "AndroidCompat" ]; then
+if [ "$(basename $(pwd))" = "AndroidCompat" ]; then
   cd ..
 fi
 
@@ -30,9 +11,9 @@ rm -rf "tmp"
 mkdir -p "tmp"
 pushd "tmp"
 
-curl "https://android.googlesource.com/platform/prebuilts/sdk/+/6cd31be5e4e25901aadf838120d71a79b46d9add/30/public/android.jar?format=TEXT" | base64 --decode > android.jar
+curl "https://android.googlesource.com/platform/prebuilts/sdk/+/3b8a524d25fa6c3d795afb1eece3f24870c60988/27/public/android.jar?format=TEXT" | base64 --decode > android.jar
 
-# We need to remove any stub classes that we have implementations for
+# We need to remove any stub classes that we might use
 echo "Patching JAR..."
 
 echo "Removing org.json..."
@@ -59,7 +40,7 @@ zip --delete android.jar javax/*
 echo "Removing java..."
 zip --delete android.jar java/*
 
-echo "Removing overridden classes..."
+echo "Removing overriden classes..."
 zip --delete android.jar android/app/Application.class
 zip --delete android.jar android/app/Service.class
 zip --delete android.jar android/net/Uri.class
@@ -68,12 +49,12 @@ zip --delete android.jar android/os/Environment.class
 zip --delete android.jar android/text/format/Formatter.class
 zip --delete android.jar android/text/Html.class
 
-# Dedup overridden Android classes
+# Dedup overriden Android classes
 ABS_JAR="$(realpath android.jar)"
 function dedup() {
     pushd "$1"
-    CLASSES="$(find ./* -type f)"
-    echo "$CLASSES" | while read -r class
+    CLASSES="$(find * -type f)"
+    echo "$CLASSES" | while read class
     do
         NAME="${class%.*}"
         echo "Processing class: $NAME"
@@ -82,10 +63,13 @@ function dedup() {
     popd
 }
 
-popd
+pushd ..
 dedup AndroidCompat/src/main/java
+dedup server/src/main/java
 dedup server/src/main/kotlin
+popd
 
+popd
 echo "Copying Android.jar to library folder..."
 mv tmp/android.jar AndroidCompat/lib
 

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

@@ -0,0 +1,291 @@
+/*
+ * 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

@@ -0,0 +1,53 @@
+/*
+ * 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

@@ -0,0 +1,193 @@
+/*
+ * 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,34 @@
+/*
+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

@@ -0,0 +1,40 @@
+/*
+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

@@ -0,0 +1,34 @@
+/*
+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

@@ -0,0 +1,34 @@
+/*
+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

@@ -0,0 +1,34 @@
+/*
+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/Preconditions.java

@@ -1,13 +1,30 @@
-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");
+  }
+}

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

@@ -0,0 +1,127 @@
+/*
+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

@@ -0,0 +1,178 @@
+/*
+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

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

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

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

@@ -0,0 +1,14 @@
+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/com/squareup/duktape/Duktape.java

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.squareup.duktape;
 
 import kotlin.NotImplementedError;
@@ -23,18 +22,11 @@ import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 import java.io.Closeable;
 
-/* Note (March 2021):
- * The old implementation for duktape-android used the nashorn engine which is deprecated.
- * This new implementation uses Mozilla's Rhino: https://github.com/mozilla/rhino
- */
-
-/**
- * A simple EMCAScript (Javascript) interpreter.
- */
+/** A simple EMCAScript (Javascript) interpreter. */
 public final class Duktape implements Closeable, AutoCloseable {
 
     private ScriptEngineManager factory = new ScriptEngineManager();
-    private ScriptEngine engine = factory.getEngineByName("rhino");
+    private ScriptEngine engine = factory.getEngineByName("JavaScript");
 
     /**
    * Create a new interpreter instance. Calls to this method <strong>must</strong> matched with
@@ -46,6 +38,17 @@ public final class Duktape implements Closeable, AutoCloseable {
 
     private Duktape() {}
 
+    /**
+   * Evaluate {@code script} and return a result. {@code fileName} will be used in error
+   * reporting. Note that the result must be one of the supported Java types or the call will
+   * return null.
+   *
+   * @throws DuktapeException if there is an error evaluating the script.
+   */
+    public synchronized Object evaluate(String script, String fileName) {
+        throw new NotImplementedError("Not implemented!");
+    }
+
     /**
    * Evaluate {@code script} and return a result. Note that the result must be one of the
    * supported Java types or the call will return null.

AndroidCompat/src/main/java/com/squareup/duktape/DuktapeStub.java

@@ -1,30 +0,0 @@
-package com.squareup.duktape;
-
-/* part of tachiyomi-extensions which is licensed under Apache License Version 2.0 */
-
-import java.io.Closeable;
-import java.io.IOException;
-
-/** This is the reference Duktape stub that tachiyomi's extensions depend on.
- * Intended to be used as a reference.
- */
-public class DuktapeStub implements Closeable {
-
-    public static Duktape create() {
-        throw new RuntimeException("Stub!");
-    }
-
-    @Override
-    public synchronized void close() throws IOException {
-        throw new RuntimeException("Stub!");
-    }
-
-    public synchronized Object evaluate(String script) {
-        throw new RuntimeException("Stub!");
-    }
-
-    public synchronized <T> void set(String name, Class<T> type, T object) {
-        throw new RuntimeException("Stub!");
-    }
-
-}

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

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

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

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

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

@@ -2,6 +2,7 @@ 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
@@ -11,7 +12,12 @@ 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
@@ -20,8 +26,5 @@ 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.JavaSharedPreferences;
+import xyz.nulldev.androidcompat.io.sharedprefs.JsonSharedPreferences;
 import xyz.nulldev.androidcompat.service.ServiceSupport;
 import xyz.nulldev.androidcompat.util.KodeinGlobalHelper;
 
@@ -50,9 +50,10 @@ import java.util.Map;
 /**
  * Custom context implementation.
  *
+ * TODO Deal with packagemanager for extension sources
  */
 public class CustomContext extends Context implements DIAware {
-    private final DI kodein;
+    private DI kodein;
     public CustomContext() {
         this(KodeinGlobalHelper.kodein());
     }
@@ -164,22 +165,23 @@ 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 = new JavaSharedPreferences(s);
+            preferences = getSharedPreferences(sharedPrefsFileFromString(s), i);
             prefs.put(s, preferences);
         }
         return preferences;
     }
 
-    @Override
-    public SharedPreferences getSharedPreferences(@NotNull File file, int mode) {
-        String path = file.getAbsolutePath().replace('\\', '/');
-        int firstSlash = path.indexOf("/");
-        return new JavaSharedPreferences(path.substring(firstSlash));
+    public SharedPreferences getSharedPreferences(File file, int mode) {
+        return new JsonSharedPreferences(file);
     }
 
     @Override
@@ -189,8 +191,8 @@ public class CustomContext extends Context implements DIAware {
 
     @Override
     public boolean deleteSharedPreferences(String name) {
-        JavaSharedPreferences item = (JavaSharedPreferences) prefs.remove(name);
-        return item.deleteAll();
+        prefs.remove(name);
+        return sharedPrefsFileFromString(name).delete();
     }
 
     @Override
@@ -733,3 +735,4 @@ public class CustomContext extends Context implements DIAware {
     }
 }
 
+

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

@@ -0,0 +1,22 @@
+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/config/ApplicationInfoConfigModule.kt

@@ -1,7 +1,6 @@
 package xyz.nulldev.androidcompat.config
 
 import com.typesafe.config.Config
-import io.github.config4k.getValue
 import xyz.nulldev.ts.config.ConfigModule
 
 /**
@@ -9,8 +8,8 @@ import xyz.nulldev.ts.config.ConfigModule
  */
 
 class ApplicationInfoConfigModule(config: Config) : ConfigModule(config) {
-    val packageName: String by config
-    val debug: Boolean by config
+    val packageName = config.getString("packageName")!!
+    val debug = config.getBoolean("debug")
 
     companion object {
         fun register(config: Config)

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/FilesConfigModule.kt

@@ -1,7 +1,6 @@
 package xyz.nulldev.androidcompat.config
 
 import com.typesafe.config.Config
-import io.github.config4k.getValue
 import xyz.nulldev.ts.config.ConfigModule
 
 /**
@@ -9,23 +8,23 @@ import xyz.nulldev.ts.config.ConfigModule
  */
 
 class FilesConfigModule(config: Config) : ConfigModule(config) {
-    val dataDir:String by config
-    val filesDir:String by config
-    val noBackupFilesDir:String by config
-    val externalFilesDirs: MutableList<String> by config
-    val obbDirs: MutableList<String> by config
-    val cacheDir:String by config
-    val codeCacheDir:String by config
-    val externalCacheDirs: MutableList<String> by config
-    val externalMediaDirs: MutableList<String> by config
-    val rootDir:String by config
-    val externalStorageDir:String by config
-    val downloadCacheDir:String by config
-    val databasesDir:String by config
+    val dataDir = config.getString("dataDir")!!
+    val filesDir = config.getString("filesDir")!!
+    val noBackupFilesDir = config.getString("noBackupFilesDir")!!
+    val externalFilesDirs: MutableList<String> = config.getStringList("externalFilesDirs")!!
+    val obbDirs: MutableList<String> = config.getStringList("obbDirs")!!
+    val cacheDir = config.getString("cacheDir")!!
+    val codeCacheDir = config.getString("codeCacheDir")!!
+    val externalCacheDirs: MutableList<String> = config.getStringList("externalCacheDirs")!!
+    val externalMediaDirs: MutableList<String> = config.getStringList("externalMediaDirs")!!
+    val rootDir = config.getString("rootDir")!!
+    val externalStorageDir = config.getString("externalStorageDir")!!
+    val downloadCacheDir = config.getString("downloadCacheDir")!!
+    val databasesDir = config.getString("databasesDir")!!
 
-    val prefsDir:String by config
+    val prefsDir = config.getString("prefsDir")!!
 
-    val packageDir:String by config
+    val packageDir = config.getString("packageDir")!!
 
     companion object {
         fun register(config: Config)

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/SystemConfigModule.kt

@@ -2,10 +2,9 @@ package xyz.nulldev.androidcompat.config
 
 import com.typesafe.config.Config
 import xyz.nulldev.ts.config.ConfigModule
-import io.github.config4k.getValue
 
 class SystemConfigModule(val config: Config) : ConfigModule(config) {
-    val isDebuggable: Boolean by config
+    val isDebuggable = config.getBoolean("isDebuggable")
 
     val propertyPrefix = "properties."
 

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

@@ -4,21 +4,11 @@ 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.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
+import java.util.*
 
-@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

@@ -1,177 +0,0 @@
-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/pm/InstalledPackage.kt

@@ -22,7 +22,7 @@ data class InstalledPackage(val root: File) {
     val icon = File(root, "icon.png")
 
     val info: PackageInfo
-        get() = ApkParsers.getMetaInfo(apk).toPackageInfo(apk).also {
+        get() = ApkParsers.getMetaInfo(apk).toPackageInfo(root, apk).also {
             val parsed = ApkFile(apk)
             val dbFactory = DocumentBuilderFactory.newInstance()
             val dBuilder = dbFactory.newDocumentBuilder()
@@ -82,14 +82,12 @@ data class InstalledPackage(val root: File) {
         }
     }
 
-    companion object {
-        fun NodeList.toList(): List<Node> {
-            val out = mutableListOf<Node>()
+    private fun NodeList.toList(): List<Node> {
+        val out = mutableListOf<Node>()
 
-            for (i in 0 until length)
-                out += item(i)
+        for(i in 0 until length)
+            out += item(i)
 
-            return out
-        }
+        return out
     }
 }

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/PackageUtil.kt

@@ -6,7 +6,7 @@ import android.content.pm.PackageInfo
 import net.dongliu.apk.parser.bean.ApkMeta
 import java.io.File
 
-fun ApkMeta.toPackageInfo(apk: File): PackageInfo {
+fun ApkMeta.toPackageInfo(root: File, apk: File): PackageInfo {
     return PackageInfo().also {
         it.packageName = packageName
         it.versionCode = versionCode.toInt()

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

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

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

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

@@ -1,196 +0,0 @@
-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(@Suppress("UNUSED_PARAMETER") context: Context, intent: Intent) {
+    fun startService(context: Context, intent: Intent) {
         val name = intentToClassName(intent)
 
         logger.debug { "Starting service: $name" }
@@ -35,7 +35,7 @@ class ServiceSupport {
         }
     }
 
-    fun stopService(@Suppress("UNUSED_PARAMETER") context: Context, intent: Intent) {
+    fun stopService(context: Context, intent: Intent) {
         val name = intentToClassName(intent)
         stopService(name)
     }

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

@@ -25,7 +25,6 @@ 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 -> {

AndroidCompat/src/main/resources/compat-reference.conf

@@ -1,12 +1,36 @@
-# AndroidComapt Root dir
-androidcompat.rootDir = androidcompat-root
 
-####################### `android.files` (FilesConfigModule) #######################
+# Allow/disallow preference changes (useful for demos)
+ts.server.allowConfigChanges = true
+
+# Enable the WebUI? Note: The API and multi-user sync server ui will remain available even if the WebUI is disabled
+ts.server.enableWebUi = true
+
+# 'true' to use the old, buggy/memory-leaking WebUI
+ts.server.useOldWebUi = false
+
+# 'true' to pretty print all JSON API responses
+ts.server.prettyPrintApi = false
+
+# List of blacklisted/whitelisted API endpoints/operation IDs
+ts.server.disabledApiEndpoints = []
+ts.server.enabledApiEndpoints = []
+
+# Message to print in the console when the API has finished booting
+ts.server.httpInitializedPrintMessage = ""
+
+# Use external folder for static files
+ts.server.useExternalStaticFiles = false
+ts.server.externalStaticFilesFolder = ""
+
+# Root storage dir
+ts.server.rootDir = tachiserver-data
+# Dir to store JVM patches
+ts.server.patchesDir = ${ts.server.rootDir}/patches
 
 # Storage dir for the emulated Android app
-android.files.rootDir = ${androidcompat.rootDir}/appdata
+android.files.rootDir = ${ts.server.rootDir}/android-compat/appdata
 # External storage dir for the emulated Android app's
-android.files.externalStorageDir = ${androidcompat.rootDir}/extappdata
+android.files.externalStorageDir = ${ts.server.rootDir}/android-compat/extappdata
 
 # Internal Android directories
 android.files.dataDir = ${android.files.rootDir}/data
@@ -24,16 +48,37 @@ android.files.externalCacheDirs = [${android.files.externalStorageDir}/cache]
 android.files.externalMediaDirs = [${android.files.externalStorageDir}/media]
 android.files.downloadCacheDir = ${android.files.externalStorageDir}/downloadCache
 
-android.files.packageDir = ${androidcompat.rootDir}/android-compat/packages
-
-####################### `android.app` (ApplicationInfoConfigModule) #######################
+android.files.packageDir = ${ts.server.rootDir}/android-compat/packages
 
 # Emulated Android app package name
 android.app.packageName = eu.kanade.tachiyomi
 # Debug mode for the emulated Android app
 android.app.debug = true
 
-####################### `android.system` (SystemConfigModule) #######################
-
 # Whether or not the emulated Android system is debuggable
 android.system.isDebuggable = true
+
+# Is the multi-user sync server enabled? Does not affect the single-user sync server included in the API.
+ts.syncd.enable = false
+
+# The URL of this server (displayed in the sync server web ui)
+ts.syncd.baseUrl = "http://example.com"
+
+# 'true' to disable the API and only enable the multi-user sync server
+ts.syncd.syncOnlyMode = false
+
+# The root directory to store synchronized data
+ts.syncd.rootDir = ${ts.server.rootDir}/sync/accounts
+
+# Location to store config files for the sandbox
+ts.syncd.sandboxedConfig = ${ts.server.rootDir}/sync/sandboxed_config.config
+
+# Recaptcha stuff for signup/login
+ts.syncd.recaptcha.siteKey = ""
+ts.syncd.recaptcha.secret = ""
+
+# Sync server display name
+ts.syncd.name = "Tachiyomi sync server"
+
+# Header used to forward the IP to the multi-user sync server if the server is behind a reverse proxy
+ts.syncd.ipHeader = ""

CHANGELOG-TEMPLATE.md

@@ -1,31 +0,0 @@
-# Server: v0.X.Y-next + WebUI: rXXX
-## Tachidesk-Server
-### Public API
-#### Non-breaking changes
-- N/A
-
-#### Breaking changes
-- N/A
-
-#### Bug fixes
-- N/A
-
-### Private API
-- N/A
-
-#### Non-code changes
-- N/A
-
-
-## Tachidesk-WebUI
-#### Visible changes
-- N/A
-
-#### Bug fixes
-- N/A
-
-#### Internal changes
-- N/A
-
-#### Non-code changes
-- N/A

CHANGELOG.md

@@ -1,112 +0,0 @@
-# Server: v0.4.9-next + WebUI: r769
-## Tachidesk-Server
-### Public API
-#### Non-breaking changes
-- N/A
-
-#### Breaking changes
-- N/A
-
-#### Bug fixes
-- N/A
-
-### Private API
-- N/A
-
-#### Non-code changes
-- N/A
-
-
-## Tachidesk-WebUI
-#### Visible changes
-- N/A
-
-#### Bug fixes
-- N/A
-
-#### Internal changes
-- N/A
-
-#### Non-code changes
-- N/A
-
-
-
-# Server: v0.4.9 + WebUI: r769
-## Tachidesk-Server
-### Public API
-#### Non-breaking changes
-- N/A
-
-#### Breaking changes
-- (r857) renamed: `SourceDataClass.isNSFW` -> `SourceDataClass.isNsfw`
-
-#### Bug fixes
-- N/A
-
-### Private API
-- (r850) Bump WebUI version to r767
-- (r861) Bump WebUI version to r769
-
-#### Non-code changes
-- (r851) Add this changelog file and `CHANGELOG-TEMPLATE.md`
-- (r852-r853) `CONTRIBUTING.md`: Add a note about this maintaining this file changelog
-- (r855) `CONTRIBUTING.md`: text cleanup
-- (r859) `CONTRIBUTING.md`: remove dumb rule
-- (r862) `windows-bundler.sh`: update jre
-- (r864) add linux and macOS bundler script and launcher scripts
-- (r865) fix macOS bundler script and launcher scripts
-- (r866) bump electron version to v14.0.0
-- (r868) add linux and macOS bundlers to the publish workflow
-- (r871) `publish.yml`: remove node module cache, won't need it anymore
-- (r873) `publish.yml` and `build_push.yml`: fix oopsies
-
-
-## Tachidesk-WebUI
-#### Visible changes
-- (r767-r769) Support for hiding NSFW content in settings screen, extensions screen, sources screen
-
-#### Bug fixes
-- N/A
-
-#### Internal changes
-- (r767) Remove some duplicate dependency declaration from `package.json`
-
-#### Non-code changes
-- (r42-r45) Change `README.md`: some links and stuff 
-- (r45-r765) Add all of the commit history from when WebUI was separated from Server, jumping from r45 to r765 (r45 is exactly the same as r765)
-- (r766) Steal `.gitattributes` from Tachidesk-Server
-- (r767) Dependency cleanup in `package.json`
-
-
-
-
-# Server: v0.4.8 + WebUI: r41
-## Tachidesk-Server
-### Public API
-#### Non-breaking changes
-- Added support for serializing Search Filters
-- `SourceDataClass` now has a `isNsfw` key
-
-#### Breaking changes
-- N/A
-
-#### Bug fixes
-- Fixed a bug where backup restore reversed chapter order
-- Open Site feature now works properly (https://github.com/Suwayomi/Tachidesk-WebUI/issues/19)
-
-### Private API
-- Added `CloudflareInterceptor` from TachiWeb-Server
-- Restoring backup for mangas in library(merging manga data) is now supported
-
-## Tachidesk-WebUI
-#### Visible changes
-- Better looking manga card titles
-- Better reader title, next, prev buttons
-
-#### Bug fixes
-- Open Site feature now works properly (https://github.com/Suwayomi/Tachidesk-WebUI/issues/19)
-- Re-ordering categories now works
-
-#### Internal changes
-- N/A

CODE_OF_CONDUCT.md

@@ -1,5 +0,0 @@
-# Code Of Conduct
-- Don't be a dick.
-
-# expanding the code of conduct!
-The contents of this document is up for debate and improvement! Discussions on discord.

CONTRIBUTING.md

@@ -1,39 +0,0 @@
-# Contributing
-## Where should I start?
-Checkout [This Kanban Board](https://github.com/Suwayomi/Tachidesk/projects/1) to see the rough development roadmap.
-
-**Note 1:** 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.
-
-**Note 2:** Store all changes with each direct commit/PR in [CHANGELOG.md](./CHANGELOG.md).
-
-## 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 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 located at https://github.com/Suwayomi/Tachidesk-WebUI
-
-## Why a web app?
-This structure is chosen to
-- Achieve the maximum multi-platform-ness
-- Gives the ability to access Tachidesk-Server from a remote client e.g., your phone, tablet or smart TV
-- Ease development of user interfaces for Tachidesk
-
-## Building from source
-### Prerequisites
-You need these software packages installed in order to build the project
-
-- 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`.
-    - **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.
-
-### 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

@@ -1,62 +1,37 @@
 
-| Build | Stable | Preview | Support Server |
-|-------|----------|---------|---------|
-| ![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) |
+![image](https://github.com/AriaMoradi/Tachidesk/raw/master/server/src/main/resources/icon/faviconlogo.png)
+# Tachidesk
+A free and open source manga reader that runs extensions built for [Tachiyomi](https://tachiyomi.org/). 
 
-# 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 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-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.
+Tachidesk is as multi-platform as you can get. Any platform that runs java and/or has a modern browser can run it.
 
 Ability to read and write Tachiyomi compatible backups and syncing is a planned feature.
 
 ## Is this application usable? Should I test it?
 Here is a list of current features:
 
-- From Tachiyomi
-    - Installing and executing Tachiyomi's Extensions, So you'll get the same sources
-    - A library to save your mangas and categories to put them into
-    - Searching and browsing installed sources
-    - Ability to download Manga for offline read
-    - Backup and restore support powered by Tachiyomi Backups
-- From Aniyomi
-    - Installing and executing Aniyomi's Extensions
-    - Searching and browsing installed sources.
-    - Viewing an anime and it's episodes
+- Installing and executing Tachiyomi's Extensions, So you'll get the same sources.
+- A library to save your mangas and categories to put them into.
+- Searching and browsing installed sources.
+- A minimal chapter reader.
+- Ability to download Mangas for offline read(This partially works)
 
-**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:** Keep in mind that Tachidesk is alpha software and can break rarely and/or with each update, so you may have to delete your data to fix it. See [General troubleshooting](#general-troubleshooting) and [Support and help](#support-and-help) if it happens.
 
-**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.
+Anyways, for more info checkout [finished milestone #1](https://github.com/AriaMoradi/Tachidesk/issues/2) and [milestone #2](https://github.com/AriaMoradi/Tachidesk/projects/1) to see what's implemented in more detail.
 
 ## Downloading and Running the app
 ### All Operating Systems
-You should have The Java Runtime Environment(JRE) 8 or newer and a modern browser installed(Google is your friend for seeking assitance). Also an internet connection is required as almost everything this app does is downloading stuff. 
+You should have The Java Runtime Environment(JRE) 8 or newer and a modern browser installed. Also an internet connection is required as almost everything this app does is downloading stuff. 
 
-Download the latest "Stable" jar release from [the releases section](https://github.com/Suwayomi/Tachidesk/releases) or a preview jar build from [the preview repository](https://github.com/Suwayomi/Tachidesk-preview/releases).
+Download the latest jar release from [the releases section](https://github.com/AriaMoradi/Tachidesk/releases).
 
-Double click on the jar file or run `java -jar Tachidesk-vX.Y.Z-rxxx.jar` (or `java -jar Tachidesk-latest.jar` if you have the latest preview) from a Terminal/Command Prompt window to run the app which will open a new browser window automatically. Also the System Tray Icon is your friend if you need to open the browser window again or close Tachidesk.
+Double click on the jar file or run `java -jar Tachidesk-vX.Y.Z-rxxx.jar` from a Terminal/Command Prompt window to run the app which will open a new browser window automatically. Also the System Tray Icon is your friend if you need to open the browser window again or close Tachidesk.
 
 ### Windows
-Download the latest "Stable" win32 or win64 (depending on your system, usually you want win64) release from [the releases section](https://github.com/Suwayomi/Tachidesk/releases) or a preview one from [the preview repository](https://github.com/Suwayomi/Tachidesk-preview/releases).
+Download the latest win32 release from [the releases section](https://github.com/AriaMoradi/Tachidesk/releases).
 
-The Windows specific build has java bundled inside, so you don't have to install java to use it. Unzip `Tachidesk-vX.Y.Z-rxxx-win64.zip` and run one of the Launcher files depending on what you want(see bellow). The rest works like the previous section.
-#### Windows Launchers
-- `Tachidesk Electron Launcher.bat`: Launches Tachidesk inside Electron as a desktop applicaton
-- `Tachidesk Browser Launcher.bat`: Launches Tachidesk in a browser window
-- `Tachidesk Debug Launcher.bat`: Launches Tachidesk with debug logs attached. If Tachidesk doesn't work for you, running this can give you insight into why.
+The Windows specific build has java bundled inside, so you don't have to install java to use it. Unzip `Tachidesk-vX.Y.Z-rxxx-win32.zip` and run `server.exe`. The rest works like the previous section.
 
 ### Arch Linux
 You can install Tachidesk from the AUR
@@ -65,32 +40,51 @@ yay -S tachidesk
 ```
 
 ### Docker
-Check our Offical Docker release [Tachidesk Container](https://github.com/orgs/Suwayomi/packages/container/package/tachidesk) or use [arbuilder's](https://github.com/arbuilder/Tachidesk-docker) tachidesk docker repo for installation. Source code for our container is available at [docker-tachidesk](https://github.com/Suwayomi/docker-tachidesk). By default the server will be running on http://localhost:4567 open this url in your browser.
+Check [arbuilder's repo](https://github.com/arbuilder/Tachidesk-docker) out for more details and the dockerfile.
 
-Install from the command line:
-```
-    $ docker pull ghcr.io/suwayomi/tachidesk
-```
-Run Container from the command line:
-```
-    $ docker run -p 4567:4567 ghcr.io/suwayomi/tachidesk
-```
+## General troubleshooting
+If the app breaks try deleting the directory below and re-running the app (**This will delete all your data!**) and if the problem persists open an issue. 
 
-### Using Tachidesk Remotely
-You can run Tachidesk on your computer or a server and connect to it remotely through the web interface with a web browser on any device including a mobile or tablet or even your smart TV!, this method of using Tachidesk is only recommended if you are a power user and know what you are doing.
+On Mac OS X : `/Users/<Account>/Library/Application Support/Tachidesk`
 
-## Troubleshooting and Support
-See [this troubleshooting wiki page](https://github.com/Suwayomi/Tachidesk/wiki/Troubleshooting).
+On Windows XP : `C:\Documents and Settings\<Account>\Application Data\Local Settings\Tachidesk`
 
-## Contributing and Technical info
-See [CONTRIBUTING.md](./CONTRIBUTING.md).
+On Windows 7 and later : `C:\Users\<Account>\AppData\Local\Tachidesk`
+
+On Unix/Linux : `/home/<account>/.local/share/Tachidesk`
+
+## Support and help
+Join Tachidesk's [discord server](https://discord.gg/wgPyb7hE5d) to hang out with the community and receive support and help.
+
+## How does it 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`.
+2. **webUI:** A react SPA project that works with the server to do the presentation.
+
+## Building from source
+### Get Android stubs jar
+#### Manual download
+Download [android.jar](https://raw.githubusercontent.com/AriaMoradi/Tachidesk/android-jar/android.jar) and put it under `AndroidCompat/lib`.
+#### Automated download(needs `bash`, `curl`, `base64`, `zip` to work)
+Run `AndroidCompat/getAndroid.sh` from project's root directory to download and rebuild the jar file from Google's repository.
+### building the jar
+Run `./gradlew shadowJar`, the resulting built jar file will be `server/build/Tachidesk-vX.Y.Z-rxxx.jar`.
+### building the Windows package
+Run `./gradlew windowsPackage`, the resulting built zip package file will be `server/build/Tachidesk-vX.Y.Z-rxxx-win32.zip`.
+## Running for development purposes
+### `server` module
+Run `./gradlew :server:run -x :webUI:copyBuild --stacktrace` to run the server
+### `webUI` module
+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 client if a new browser window doesn't start 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.
 
 ## Credit
-This project is a spiritual successor of [TachiWeb-Server](https://github.com/Tachiweb/TachiWeb-server), Many of the ideas and the groundwork adopted in this project comes from TachiWeb.
+The `AndroidCompat` module was originally developed by [@null-dev](https://github.com/null-dev) for [TachiWeb-Server](https://github.com/Tachiweb/TachiWeb-server) and is licensed under `Apache License Version 2.0`.
 
-The `AndroidCompat` module was originally developed by [@null-dev](https://github.com/null-dev) for [TachiWeb-Server](https://github.com/Tachiweb/TachiWeb-server) and is licensed under `Apache License Version 2.0` and `Copyright 2019 Andy Bao and contributors`.
-
-Parts of [tachiyomi](https://github.com/tachiyomiorg/tachiyomi) is adopted into this codebase, also licensed under `Apache License Version 2.0` and `Copyright 2015 Javier Tomás`.
+Parts of [tachiyomi](https://github.com/tachiyomiorg/tachiyomi) is adopted into this codebase, also licensed under `Apache License Version 2.0`.
 
 You can obtain a copy of `Apache License Version 2.0` from  http://www.apache.org/licenses/LICENSE-2.0
 
@@ -98,7 +92,7 @@ Changes to both codebases is licensed under `MPL v. 2.0` as the rest of this pro
 
 ## License
 
-    Copyright (C) Contributors to the Suwayomi project
+    Copyright (C) 2020-2021 Aria Moradi and contributors
 
     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

build.gradle.kts

@@ -1,31 +1,33 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.config.KotlinCompilerVersion
 
 plugins {
-    kotlin("jvm") version kotlinVersion
-    kotlin("plugin.serialization") version kotlinVersion
+    id("org.jetbrains.kotlin.jvm") version "1.4.21" apply false // Also in buildSrc Config.kt
+    id("java")
 }
 
 allprojects {
-    group = "suwayomi"
+    group = "xyz.nulldev.ts"
 
     version = "1.0"
 
     repositories {
+        jcenter()
         mavenCentral()
-        maven("https://maven.google.com/")
         maven("https://jitpack.io")
         maven("https://oss.sonatype.org/content/repositories/snapshots/")
+        maven("https://dl.bintray.com/inorichi/maven")
         maven("https://dl.google.com/dl/android/maven2/")
     }
 }
 
-val projects = listOf(
+val javaProjects = listOf(
         project(":AndroidCompat"),
         project(":AndroidCompat:Config"),
         project(":server")
 )
 
-configure(projects) {
+configure(javaProjects) {
+    apply(plugin = "java")
     apply(plugin = "org.jetbrains.kotlin.jvm")
 
     java {
@@ -33,61 +35,49 @@ configure(projects) {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 
-    tasks.withType<KotlinCompile> {
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
         kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_1_8.toString()
+            jvmTarget = "1.8"
         }
     }
 
     dependencies {
         // Kotlin
-        implementation(kotlin("stdlib-jdk8"))
-        implementation(kotlin("reflect"))
-        testImplementation(kotlin("test-junit5"))
-
-        // coroutines
-        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")
+        implementation(kotlin("stdlib", KotlinCompilerVersion.VERSION))
+        implementation(kotlin("stdlib", KotlinCompilerVersion.VERSION))
+        testImplementation(kotlin("test", version = "1.4.21"))
+    }
+}
 
+configure(listOf(
+        project(":AndroidCompat"),
+        project(":server"),
+        project(":AndroidCompat:Config")
 
+)) {
+    dependencies {
         // Dependency Injection
-        implementation("org.kodein.di:kodein-di-conf-jvm:7.5.0")
+        implementation("org.kodein.di:kodein-di-conf-jvm:7.1.0")
 
         // Logging
         implementation("org.slf4j:slf4j-api:1.7.30")
-        implementation("ch.qos.logback:logback-classic:1.2.3")
-        implementation("io.github.microutils:kotlin-logging:2.0.6")
+        implementation("org.slf4j:slf4j-simple:1.7.30")
+        implementation("io.github.microutils:kotlin-logging:2.0.3")
 
-        // ReactiveX
+        // RxJava
         implementation("io.reactivex:rxjava:1.3.8")
         implementation("io.reactivex:rxkotlin:1.0.0")
-        implementation("com.jakewharton.rxrelay:rxrelay:1.2.0")
 
         // JSoup
         implementation("org.jsoup:jsoup:1.13.1")
 
+        // Kotlin
+        implementation(kotlin("reflect", version = "1.4.21"))
+
         // dependency of :AndroidCompat:Config
-        implementation("com.typesafe:config:1.4.1")
-        implementation("io.github.config4k:config4k:0.4.2")
+        implementation("com.typesafe:config:1.4.0")
 
         // to get application content root
-        implementation("net.harawata:appdirs:1.2.1")
-
-        // dex2jar
-        val dex2jarVersion = "v21"
-        implementation("com.github.ThexXTURBOXx.dex2jar:dex-translator:$dex2jarVersion")
-        implementation("com.github.ThexXTURBOXx.dex2jar:dex-tools:$dex2jarVersion")
-
-        // APK parser
-        implementation("net.dongliu:apk-parser:2.6.10")
-
-        // Jackson
-        implementation("com.fasterxml.jackson.core:jackson-annotations:2.10.3")
+        implementation("net.harawata:appdirs:1.2.0")
     }
 }

buildSrc/build.gradle.kts

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

buildSrc/src/main/kotlin/Constants.kt

@@ -1,33 +0,0 @@
-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.9"
-
-val webUIRevisionTag = System.getenv("WebUIRevision") ?: "r769"
-
-// 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.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

scripts/resources/Tachidesk Browser Launcher.bat

@@ -1 +0,0 @@
-start "" jre/bin/javaw -jar Tachidesk.jar

scripts/resources/Tachidesk Browser Launcher.command

@@ -1,3 +0,0 @@
-cd "`dirname "$0"`"
-
-./jre/Contents/Home/bin/java -jar Tachidesk.jar

scripts/resources/Tachidesk Debug Launcher.bat

@@ -1,7 +0,0 @@
-:: 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 Debug Launcher.command

@@ -1,3 +0,0 @@
-cd "`dirname "$0"`"
-
-./jre/Contents/Home/bin/java -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true -jar  Tachidesk.jar

scripts/resources/Tachidesk Electron Launcher.bat

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

scripts/resources/Tachidesk Electron Launcher.command

@@ -1,3 +0,0 @@
-cd "`dirname "$0"`"
-
-./jre/Contents/Home/bin/java "-Dsuwayomi.tachidesk.config.server.webUIInterface=electron" "-Dsuwayomi.tachidesk.config.server.electronPath=electron/Electron.app/Contents/MacOS/Electron" -jar Tachidesk.jar

scripts/resources/tachidesk-browser-launcher.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-./jre/bin/java -jar Tachidesk.jar

scripts/resources/tachidesk-debug-launcher.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-./jre/bin/java -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true -jar  Tachidesk.jar

scripts/resources/tachidesk-electron-launcher.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-./jre/bin/java "-Dsuwayomi.tachidesk.config.server.webUIInterface=electron" "-Dsuwayomi.tachidesk.config.server.electronPath=electron/electron" -jar Tachidesk.jar

scripts/unix-bundler.sh

@@ -1,89 +0,0 @@
-#!/bin/bash
-
-# 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/.
-
-electron_version="v14.0.0"
-
-if [ $1 = "linux-x64" ]; then
-  jre="OpenJDK8U-jre_x64_linux_hotspot_8u302b08.tar.gz"
-  jre_release="jdk8u302-b08"
-  jre_url="https://github.com/adoptium/temurin8-binaries/releases/download/$jre_release/$jre"
-  jre_dir="$jre_release-jre"
-  electron="electron-$electron_version-linux-x64.zip"
-elif [ $1 = "macOS-x64" ]; then
-  jre="OpenJDK8U-jre_x64_mac_hotspot_8u302b08.tar.gz"
-  jre_release="jdk8u302-b08"
-  jre_url="https://github.com/adoptium/temurin8-binaries/releases/download/$jre_release/$jre"
-  jre_dir="$jre_release-jre"
-  electron="electron-$electron_version-darwin-x64.zip"
-elif [ $1 = "macOS-arm64" ]; then
-  jre="zulu8.56.0.23-ca-jre8.0.302-macosx_aarch64.tar.gz"
-  jre_release="zulu8.56.0.23-ca-jre8.0.302-macosx_aarch64"
-  jre_url="https://cdn.azul.com/zulu/bin/$jre"
-  jre_dir="$jre_release"
-  electron="electron-$electron_version-darwin-arm64.zip"
-else
-  echo "Unsupported arch value: $1"
-  exit 1
-fi
-
-arch="$1"
-os=$(echo $arch | cut -d '-' -f1)
-
-echo "creating $arch bundle"
-
-jar=$(ls ../server/build/*.jar | tail -n1)
-jar_name=$(echo $jar | cut -d'/' -f4)
-release_name=$(echo $jar_name | sed 's/.jar//')-$arch
-
-
-# make release dir
-mkdir $release_name
-
-
-echo "Dealing with jre..."
-if [ ! -f $jre ]; then
-  curl -L $jre_url -o $jre
-fi
-tar xvf $jre
-mv $jre_dir $release_name/jre
-
-echo "Dealing with electron"
-if [ ! -f $electron ]; then
-  curl -L "https://github.com/electron/electron/releases/download/$electron_version/$electron" -o $electron
-fi
-unzip $electron -d $release_name/electron
-
-# copy artifacts
-cp $jar $release_name/Tachidesk.jar
-if [ $os = linux ]; then
-  cp "resources/tachidesk-browser-launcher.sh" $release_name
-  cp "resources/tachidesk-debug-launcher.sh" $release_name
-  cp "resources/tachidesk-electron-launcher.sh" $release_name
-elif [ $os = macOS ]; then
-  cp "resources/Tachidesk Browser Launcher.command" $release_name
-  cp "resources/Tachidesk Debug Launcher.command" $release_name
-  cp "resources/Tachidesk Electron Launcher.command" $release_name
-fi
-
-archive_name=""
-if [ $os = linux ]; then
-  archive_name=$release_name.tar.gz
-  GZIP=-9 tar cvzf $archive_name $release_name
-elif [ $os = macOS ]; then
-  archive_name=$release_name.zip
-  zip -9 -r $archive_name $release_name
-fi
-
-rm -rf $release_name
-
-# clean up from possible previous runs
-if [ -f ../server/build/$archive_name ]; then
-  rm ../server/build/$archive_name
-fi
-
-mv $archive_name ../server/build/

scripts/windows-bundler.sh

@@ -1,86 +0,0 @@
-#!/bin/bash
-
-# 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/.
-
-electron_version="v14.0.0"
-
-if [ $1 = "win32" ]; then
-  jre="OpenJDK8U-jre_x86-32_windows_hotspot_8u292b10.zip"
-  jre_release="jdk8u292-b10"
-  jre_url="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/$jre_release/$jre"
-  arch="win32"
-  electron="electron-$electron_version-win32-ia32.zip"
-else
-  jre="OpenJDK8U-jre_x64_windows_hotspot_8u302b08.zip"
-  jre_release="jdk8u302-b08"
-  jre_url="https://github.com/adoptium/temurin8-binaries/releases/download/$jre_release/$jre"
-  arch="win64"
-  electron="electron-$electron_version-win32-x64.zip"
-fi
-
-jre_dir="$jre_release-jre"
-
-echo "creating windows bundle"
-
-jar=$(ls ../server/build/*.jar | tail -n1)
-jar_name=$(echo $jar | cut -d'/' -f4)
-release_name=$(echo $jar_name | sed 's/.jar//')-$arch
-
-
-# make release dir
-mkdir $release_name
-
-
-echo "Dealing with jre..."
-if [ ! -f $jre ]; then
-  curl -L $jre_url -o $jre
-fi
-unzip $jre
-mv $jre_dir $release_name/jre
-
-echo "Dealing with electron"
-if [ ! -f $electron ]; then
-  curl -L "https://github.com/electron/electron/releases/download/$electron_version/$electron" -o $electron
-fi
-unzip $electron -d $release_name/electron
-
-# change electron's icon
-rcedit="rcedit-x86.exe"
-if [ ! -f $rcedit ]; then
-  curl -L "https://github.com/electron/rcedit/releases/download/v1.1.1/$rcedit" -o $rcedit
-fi
-
-# check if running under github actions
-if [ $CI = true ]; then
-  # change electron executable's icon
-  sudo dpkg --add-architecture i386
-  wget -qO - https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add -
-  sudo add-apt-repository ppa:cybermax-dexter/sdl2-backport
-  sudo apt-add-repository "deb https://dl.winehq.org/wine-builds/ubuntu $(lsb_release -cs) main"
-  sudo apt install --install-recommends winehq-stable
-fi
-# this script assumes that wine is installed here on out
-
-WINEARCH=win32 wine $rcedit $release_name/electron/electron.exe --set-icon ../server/src/main/resources/icon/faviconlogo.ico
-
-# copy artifacts
-cp $jar $release_name/Tachidesk.jar
-cp "resources/Tachidesk Browser Launcher.bat" $release_name
-cp "resources/Tachidesk Debug Launcher.bat" $release_name
-cp "resources/Tachidesk Electron Launcher.bat" $release_name
-
-zip_name=$release_name.zip
-zip -9 -r $zip_name $release_name
-
-rm -rf $release_name
-
-# clean up from possible previous runs
-if [ -f ../server/build/$zip_name ]; then
-  rm ../server/build/$zip_name
-fi
-
-mv $zip_name ../server/build/

server/build.gradle.kts

@@ -1,97 +1,103 @@
-
 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.time.Instant
+import java.io.BufferedReader
 
 plugins {
+//    id("org.jetbrains.kotlin.jvm") version "1.4.21"
     application
-    kotlin("plugin.serialization")
-    id("com.github.johnrengelman.shadow") version "7.0.0"
-    id("org.jmailen.kotlinter") version "3.5.0"
-    id("com.github.gmazzo.buildconfig") version "3.0.2"
+    id("com.github.johnrengelman.shadow") version "6.1.0"
+    id("org.jmailen.kotlinter") version "3.3.0"
+    id("edu.sc.seis.launch4j") version "2.4.9"
 }
 
+val TachideskVersion = "v0.2.6"
+
+
 repositories {
-    maven {
-        url = uri("https://repo1.maven.org/maven2/")
-    }
+    mavenCentral()
+    jcenter()
     maven {
         url = uri("https://jitpack.io")
     }
 }
 
 dependencies {
-    // okhttp
-    val okhttpVersion = "4.9.1" // version is locked by Tachiyomi extensions
-    implementation("com.squareup.okhttp3:okhttp:$okhttpVersion")
-    implementation("com.squareup.okhttp3:logging-interceptor:$okhttpVersion")
-    implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:$okhttpVersion")
-    implementation("com.squareup.okio:okio:2.10.0")
-
-    // Javalin api
-    implementation("io.javalin:javalin:3.13.6")
-    // jackson version is tied to javalin, ref: `io.javalin.core.util.OptionalDependency`
-    implementation("com.fasterxml.jackson.core:jackson-databind:2.10.3")
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.10.3")
-
-    // Exposed ORM
-    val exposedVersion = "0.31.1"
-    implementation("org.jetbrains.exposed:exposed-core:$exposedVersion")
-    implementation("org.jetbrains.exposed:exposed-dao:$exposedVersion")
-    implementation("org.jetbrains.exposed:exposed-jdbc:$exposedVersion")
-    implementation("org.jetbrains.exposed:exposed-java-time:$exposedVersion")
-    // current database driver
-    implementation("com.h2database:h2:1.4.200")
-
-    // Exposed Migrations
-    val exposedMigrationsVersion = "3.1.1"
-    implementation("com.github.Suwayomi:exposed-migrations:$exposedMigrationsVersion")
-
-    // tray icon
-    implementation("com.dorkbox:SystemTray:4.1")
-    implementation("com.dorkbox:Utilities:1.9")
-
-
-    // dependencies of Tachiyomi extensions, some are duplicate, keeping it here for reference
-    implementation("com.github.inorichi.injekt:injekt-core:65b0440")
-    implementation("com.squareup.okhttp3:okhttp:4.9.1")
-    implementation("io.reactivex:rxjava:1.3.8")
-    implementation("org.jsoup:jsoup:1.14.1")
-    implementation("com.google.code.gson:gson:2.8.7")
-    implementation("com.github.salomonbrys.kotson:kotson:2.5.0")
-
-
-    // asm for ByteCodeEditor(fixing SimpleDateFormat) (must match Dex2Jar version)
-    implementation("org.ow2.asm:asm:9.2")
-
-    // extracting zip files
-    implementation("net.lingala.zip4j:zip4j:2.9.0")
-
-    // CloudflareInterceptor
-    implementation("net.sourceforge.htmlunit:htmlunit:2.52.0")
+//    implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
 
     // 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")
 
+    implementation("com.github.inorichi.injekt:injekt-core:65b0440")
+
+    val okhttp_version = "4.10.0-RC1"
+    implementation("com.squareup.okhttp3:okhttp:$okhttp_version")
+    implementation("com.squareup.okhttp3:logging-interceptor:$okhttp_version")
+    implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:$okhttp_version")
+    implementation("com.squareup.okio:okio:2.9.0")
+
+
+    // retrofit
+    val retrofit_version = "2.9.0"
+    implementation("com.squareup.retrofit2:retrofit:$retrofit_version")
+    implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.8.0")
+    implementation("com.squareup.retrofit2:converter-gson:$retrofit_version")
+    implementation("com.squareup.retrofit2:adapter-rxjava:$retrofit_version")
+
+
+    // reactivex
+    implementation("io.reactivex:rxjava:1.3.8")
+//    implementation("io.reactivex:rxandroid:1.2.1")
+//    implementation("com.jakewharton.rxrelay:rxrelay:1.2.0")
+//    implementation("com.github.pwittchen:reactivenetwork:0.13.0")
+
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.0")
+    implementation("com.google.code.gson:gson:2.8.6")
+    implementation("com.github.salomonbrys.kotson:kotson:2.5.0")
+
+    implementation("org.jsoup:jsoup:1.13.1")
+    implementation("com.github.salomonbrys.kotson:kotson:2.5.0")
+    implementation("com.squareup.duktape:duktape-android:1.3.0")
+
+
+    val coroutinesVersion = "1.3.9"
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
+
+    // dex2jar: https://github.com/DexPatcher/dex2jar/releases/tag/v2.1-20190905-lanchon
+    implementation(fileTree("lib/dex2jar/"))
+
+    // api
+    implementation("io.javalin:javalin:3.12.0")
+    implementation("org.slf4j:slf4j-simple:1.8.0-beta4")
+    implementation("org.slf4j:slf4j-api:1.8.0-beta4")
+    implementation("com.fasterxml.jackson.core:jackson-databind:2.10.3")
+
+    // Exposed ORM
+    val exposed_version = "0.28.1"
+    implementation("org.jetbrains.exposed:exposed-core:$exposed_version")
+    implementation("org.jetbrains.exposed:exposed-dao:$exposed_version")
+    implementation("org.jetbrains.exposed:exposed-jdbc:$exposed_version")
+    implementation("com.h2database:h2:1.4.199")
+
+    // tray icon
+    implementation("com.dorkbox:SystemTray:3.17")
+
+
     // AndroidCompat
     implementation(project(":AndroidCompat"))
     implementation(project(":AndroidCompat:Config"))
 
-    // uncomment to test extensions directly
-//    implementation(fileTree("lib/"))
+
+//    testImplementation("org.jetbrains.kotlin:kotlin-test")
+//    testImplementation("org.jetbrains.kotlin:kotlin-test-junit")
 }
 
+val name = "ir.armor.tachidesk.Main"
 application {
-    mainClass.set(MainClass)
+    mainClass.set(name)
 
-    // uncomment for testing electron
-//    applicationDefaultJvmArgs = listOf(
-//            "-Dsuwayomi.tachidesk.config.server.webUIInterface=electron",
-//            "-Dsuwayomi.tachidesk.config.server.electronPath=/usr/bin/electron"
-//    )
+    // Required by ShadowJar.
+    mainClassName = name
 }
 
 sourceSets {
@@ -102,104 +108,107 @@ sourceSets {
     }
 }
 
-buildConfig {
-    className("BuildConfig")
-    packageName("suwayomi.tachidesk.server")
+val TachideskRevision = Runtime
+        .getRuntime()
+        .exec("git rev-list master --count")
+        .let { process ->
+            process.waitFor()
+            val output = process.inputStream.use {
+                it.bufferedReader().use(BufferedReader::readText)
+            }
+            process.destroy()
+            "r" + output.trim()
 
-    useKotlinOutput()
-
-    fun quoteWrap(obj: Any): String = """"$obj""""
-
-    buildConfigField("String", "NAME", quoteWrap(rootProject.name))
-    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", "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 {
+    jar {
         manifest {
             attributes(
-                mapOf(
-                    "Main-Class" to MainClass,
-                    "Implementation-Title" to rootProject.name,
-                    "Implementation-Vendor" to "The Suwayomi Project",
-                    "Specification-Version" to tachideskVersion,
-                    "Implementation-Version" to tachideskRevision
-                )
-            )
-        }
-        archiveBaseName.set(rootProject.name)
-        archiveVersion.set(tachideskVersion)
-        archiveClassifier.set(tachideskRevision)
-    }
-    withType<KotlinCompile> {
-        kotlinOptions {
-            freeCompilerArgs = listOf(
-                "-Xopt-in=kotlin.RequiresOptIn",
-                "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-                "-Xopt-in=kotlinx.coroutines.InternalCoroutinesApi",
-                "-Xopt-in=kotlinx.serialization.ExperimentalSerializationApi",
+                    mapOf(
+                            "Main-Class" to "com.example.MainKt", //will make your jar (produced by jar task) runnable
+                            "ImplementationTitle" to project.name,
+                            "Implementation-Version" to project.version)
             )
         }
     }
-
-    test {
-        useJUnit()
-    }
-
-    withType<ShadowJar> {
-        destinationDirectory.set(File("$rootDir/server/build"))
-    }
-
-    named("run") {
-        dependsOn("formatKotlin", "lintKotlin", "downloadWebUI")
-    }
-
-    named<Copy>("processResources") {
-        duplicatesStrategy = DuplicatesStrategy.INCLUDE
-        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> {
-        source(files("src/kotlin"))
-    }
-
-    withType<FormatTask> {
-        source(files("src/kotlin"))
+    shadowJar {
+        manifest.inheritFrom(jar.get().manifest) //will make your shadowJar (produced by jar task) runnable
+        archiveBaseName.set("Tachidesk")
+        archiveVersion.set(TachideskVersion)
+        archiveClassifier.set(TachideskRevision)
     }
 }
+
+launch4j { //used for windows
+    mainClassName = name
+    bundledJrePath = "jre"
+    bundledJre64Bit = true
+    jreMinVersion = "8"
+    outputDir = "Tachidesk-$TachideskVersion-$TachideskRevision-win32"
+    icon = "${projectDir}/src/main/resources/icon/faviconlogo.ico"
+    jar = "${projectDir}/build/Tachidesk-$TachideskVersion-$TachideskRevision.jar"
+}
+
+tasks.register<Zip>("windowsPackage") {
+    from(fileTree("$buildDir/Tachidesk-$TachideskVersion-$TachideskRevision-win32"))
+    destinationDirectory.set(File("$buildDir"))
+    archiveFileName.set("Tachidesk-$TachideskVersion-$TachideskRevision-win32.zip")
+    dependsOn("windowsPackageWorkaround2")
+}
+
+tasks.register<Delete>("windowsPackageWorkaround2") {
+    delete(
+            "$buildDir/Tachidesk-$TachideskVersion-$TachideskRevision-win32/jre",
+            "$buildDir/Tachidesk-$TachideskVersion-$TachideskRevision-win32/lib",
+            "$buildDir/Tachidesk-$TachideskVersion-$TachideskRevision-win32/server.exe",
+            "$buildDir/Tachidesk-$TachideskVersion-$TachideskRevision-win32/Tachidesk-$TachideskVersion-$TachideskRevision-win32/Tachidesk-$TachideskVersion-$TachideskRevision-win32"
+    )
+    dependsOn("windowsPackageWorkaround")
+}
+
+tasks.register<Copy>("windowsPackageWorkaround") {
+    from("$buildDir/Tachidesk-$TachideskVersion-$TachideskRevision-win32")
+    into("$buildDir/Tachidesk-$TachideskVersion-$TachideskRevision-win32/Tachidesk-$TachideskVersion-$TachideskRevision-win32")
+    dependsOn("deleteUnwantedJreDir")
+}
+
+tasks.register<Delete>("deleteUnwantedJreDir") {
+    delete(
+            "$buildDir/Tachidesk-$TachideskVersion-$TachideskRevision-win32/jdk8u282-b08-jre"
+    )
+    dependsOn("addJreToDistributable")
+}
+
+tasks.register<Copy>("addJreToDistributable") {
+    from(zipTree("$buildDir/OpenJDK8U-jre_x86-32_windows_hotspot_8u282b08.zip"))
+    into("$buildDir/Tachidesk-$TachideskVersion-$TachideskRevision-win32")
+    eachFile {
+        path = path.replace(".*-jre".toRegex(),"jre")
+    }
+    dependsOn("downloadJre")
+    dependsOn("createExe")
+}
+
+tasks.register<de.undercouch.gradle.tasks.download.Download>("downloadJre") {
+    src("https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x86-32_windows_hotspot_8u282b08.zip")
+    dest(buildDir)
+    overwrite(false)
+    onlyIfModified(true)
+}
+
+tasks.withType<ShadowJar> {
+    destinationDir = File("$rootDir/server/build")
+    dependsOn("lintKotlin")
+}
+
+tasks.named("processResources") {
+    dependsOn(":webUI:copyBuild")
+}
+
+tasks.named("run") {
+    dependsOn("formatKotlin", "lintKotlin")
+}
+
+
+