fix typo

.editorconfig

@@ -1,11 +0,0 @@
-[*.{kt,kts}]
-indent_size=4
-insert_final_newline=true
-ij_kotlin_allow_trailing_comma=true
-ij_kotlin_allow_trailing_comma_on_call_site=true
-ij_kotlin_name_count_to_use_star_import=2147483647
-ij_kotlin_name_count_to_use_star_import_for_members=2147483647
-
-ktlint_standard_discouraged-comment-location=disabled
-ktlint_standard_if-else-wrapping=disabled
-ktlint_standard_no-consecutive-comments=disabled

.gitattributes

@@ -1,31 +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
-*.avif binary
-*.heif binary
-*.jxl binary

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,43 @@
+---
+name: "🐞 Bug report"
+title: "[Bug] <short description>"
+about: "Report a bug"
+labels: "bug"
+---
+
+**PLEASE READ THIS**
+
+I acknowledge that:
+
+- I have updated to the latest version of the app.
+- I have tried the troubleshooting guide described in `README.md`
+- If this is a request for adding/changing an extension it should be brought up to Tachiyomi: https://github.com/tachiyomiorg/tachiyomi-extensions/issues/new/choose
+- If this is an issue with some extension not working properly, It does work inside Tachiyomi as intended.
+- I have searched the existing issues and this is a new ticket **NOT** a duplicate or related to another open issue
+- I will fill out the title and the information in this template
+
+Note that the issue will be automatically closed if you do not fill out the title or requested information.
+
+**DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT**
+
+---
+
+## Device information
+- Tachidesk version: (Example: v0.2.3-r255-win32)
+- Server Operating System: (Example: Ubuntu 20.04)
+- 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) 
+
+## Steps to reproduce
+1. First Step
+2. Second Step
+
+### Expected behavior
+Describe what should have happened. Remove this line after you are done.
+
+### Actual behavior
+Describe what happens instead. Remove this line after you are done.
+
+## Other details
+Describe additional details If necessary. Remove this line after you are done.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,144 +0,0 @@
-name: 🐞 Bug report
-description: Report a bug in Suwayomi-Server
-labels: [bug]
-body:
-
-  - type: textarea
-    id: reproduce-steps
-    attributes:
-      label: Steps to reproduce
-      description: Provide an example of the issue.
-      placeholder: |
-        Example:
-          1. First step
-          2. Second step
-          3. Issue here
-    validations:
-      required: true
-
-  - type: textarea
-    id: expected-behavior
-    attributes:
-      label: Expected behavior
-      description: Explain what you should expect to happen.
-      placeholder: |
-        Example: "This should happen..."
-    validations:
-      required: true
-
-  - type: textarea
-    id: actual-behavior
-    attributes:
-      label: Actual behavior
-      description: Explain what actually happens.
-      placeholder: |
-        Example: "This happened instead..."
-    validations:
-      required: true
-
-  - type: input
-    id: suwayomi-server-version
-    attributes:
-      label: Suwayomi-Server version
-      description: You can find your Suwayomi-Server version in **More → About**.
-      placeholder: |
-        Example: "v2.0.1727"
-    validations:
-      required: true
-
-  - type: input
-    id: server-os
-    attributes:
-      label: Server operating system
-      description: The operating system on which Suwayomi-Server is running on
-      placeholder: |
-        Example: "Windows 11 Pro 24H2 | Ubuntu 24.04.2 LTS"
-    validations:
-      required: true
-
-  - type: input
-    id: server-desktop-environment
-    attributes:
-      label: Server Desktop Environment
-      description:
-      placeholder: |
-        Example: "Gnome 40"
-    validations:
-      required: false
-
-  - type: input
-    id: server-jvm-version
-    attributes:
-      label: Server JVM version
-      description: The java version used to run Suwayomi-Server
-      placeholder: |
-        Example: "openjdk 21.0.5 2024-10-15 LTS"
-    validations:
-      required: true
-
-  - type: input
-    id: client-name
-    attributes:
-      label: Used client name
-      description:
-      placeholder: |
-        Example: "Suwayomi-WebUI"
-    validations:
-      required: true
-
-  - type: input
-    id: client-version
-    attributes:
-      label: Client version
-      description:
-      placeholder: |
-        Example: "v1.2.3"
-    validations:
-      required: true
-
-  - type: input
-    id: client-browser
-    attributes:
-      label: Used web browser
-      description: The browser which is used to open Suwayomi-WebUI
-      placeholder: |
-        Example: "Chrome 134.0.6998.118 (64-Bit) | FireFox 136.0.2 (64-Bit) | Electron v35.0.2"
-    validations:
-      required: true
-
-  - type: input
-    id: client-os
-    attributes:
-      label: Client operating system
-      description: The system on which the Suwayomi-WebUI is running on
-      placeholder: |
-        Example: "Windows 11 Pro 24H2 | Ubuntu 24.04.2 LTS"
-    validations:
-      required: true
-
-  - type: textarea
-    id: other-details
-    attributes:
-      label: Other details
-      description: The more information that gets provided the better, especially via videos and images
-      placeholder: |
-        Additional details and attachments.
-
-  - type: checkboxes
-    id: acknowledgements
-    attributes:
-      label: Acknowledgements
-      description: Read this carefully, we will close and ignore your issue if you skimmed through this.
-      options:
-        - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open or closed issue.
-          required: true
-        - label: I have written a short but informative title (ideally less than ~100 characters).
-          required: true
-        - label: I have tried the troubleshooting guide described in [README.md](https://github.com/Suwayomi/Suwayomi-Server?tab=readme-ov-file#troubleshooting-and-support)
-          required: true
-        - label: I have updated to the **[latest version](https://github.com/suwayomi/suwayomi-server/releases/latest)**.
-          required: true
-        - label: I have filled out all of the requested information in this form, including specific version numbers.
-          required: true
-        - label: I understand that **Suwayomi does not have or fix any extensions**, and I **will not receive help** for any issues related to sources or extensions.
-          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1 @@
 blank_issues_enabled: false
-contact_links:
-  - name: ☎️ Support
-    url: https://discord.gg/DDZdqZWaHA
-    about: Join our discord to get help for anything that is not a bug or a feature request

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,29 @@
+---
+name: "🌟 Feature request"
+title: "[Feature Request] <short description>"
+about: "Suggest a feature to improve the project"
+labels: "enhancement"
+---
+
+**PLEASE READ THIS**
+
+I acknowledge that:
+
+- I have updated to the latest version of the app.
+- I have tried the troubleshooting guide described in `README.md`
+- If this is a request for adding/changing an extension it should be brought up to Tachiyomi: https://github.com/tachiyomiorg/tachiyomi-extensions/issues/new/choose
+- If this is an issue with some extension not working properly, It does work in Tachiyomi application as intended.
+- I have searched the existing issues and this is a new ticket **NOT** a duplicate or related to another open issue
+- I will fill out the title and the information in this template
+
+Note that the issue will be automatically closed if you do not fill out the title or requested information.
+
+**DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT**
+
+---
+
+## What feature should be added to Tachidesk?
+Explain What the feature is and how it should work in detail. Remove this line after you are done.
+
+##  Why/Project's Benefit/Existing Problem
+Explain why this should be added. Remove this line after you are done.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,37 +0,0 @@
-name: 🌟 Feature request
-description: Suggest a feature to improve Suwayomi-Server
-labels: [enhancement]
-body:
-
-  - type: textarea
-    id: feature-description
-    attributes:
-      label: Describe your suggested feature
-      description: How can Suwayomi-Server be improved?
-      placeholder: |
-        Example:
-          "It should work like this..."
-    validations:
-      required: true
-
-  - type: textarea
-    id: other-details
-    attributes:
-      label: Other details
-      placeholder: |
-        Additional details and attachments.
-
-  - type: checkboxes
-    id: acknowledgements
-    attributes:
-      label: Acknowledgements
-      description: Read this carefully, we will close and ignore your issue if you skimmed through this.
-      options:
-        - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open or closed issue.
-          required: true
-        - label: I have written a short but informative title (ideally less than ~100 characters).
-          required: true
-        - label: I have updated to the **[latest version](https://github.com/suwayomi/suwayomi-server/releases/latest)**.
-          required: true
-        - label: I have filled out all of the requested information in this form, including specific version numbers.
-          required: true

.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

@@ -0,0 +1,71 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+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 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.5.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/AriaMoradi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.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:windowsPackage --stacktrace
+          wrapper-cache-enabled: true
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: true

.github/workflows/build_pull_request.yml

@@ -1,53 +0,0 @@
-name: CI Pull Request
-
-on:
-  pull_request:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  check_wrapper:
-    name: Validate Gradle Wrapper
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Clone repo
-        uses: actions/checkout@v4
-
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
-
-  build:
-    name: Build pull request
-    needs: check_wrapper
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout pull request
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          path: master
-          fetch-depth: 0
-
-      - name: Set up JDK
-        uses: actions/setup-java@v4
-        with:
-          java-version: 21
-          distribution: 'temurin'
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
-
-      - name: Copy CI gradle.properties
-        run: |
-          cd master
-          mkdir -p ~/.gradle
-          cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
-
-      - name: Build Jar
-        working-directory: master
-        run: ./gradlew ktlintCheck :server:shadowJar --stacktrace
-

.github/workflows/build_push.yml

@@ -1,236 +0,0 @@
-name: CI build
-
-on:
-  push:
-    branches:
-      - master
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  check_wrapper:
-    name: Validate Gradle Wrapper
-    runs-on: ubuntu-latest
-    steps:
-      - name: Clone repo
-        uses: actions/checkout@v4
-
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
-
-  build:
-    name: Build Jar
-    needs: check_wrapper
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout master branch
-        uses: actions/checkout@v4
-        with:
-          ref: master
-          path: master
-          fetch-depth: 0
-
-      - name: Set up JDK
-        uses: actions/setup-java@v4
-        with:
-          java-version: 21
-          distribution: 'temurin'
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
-
-      - name: Copy CI gradle.properties
-        run: |
-          cd master
-          mkdir -p ~/.gradle
-          cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
-
-      - name: Build Jar
-        env:
-          ProductBuildType: "Preview"
-        working-directory: master
-        run: ./gradlew :server:shadowJar --stacktrace
-
-      - name: Upload Jar
-        uses: actions/upload-artifact@v4
-        with:
-          name: jar
-          path: master/server/build/*.jar
-          if-no-files-found: error
-
-      - name: Upload icons
-        uses: actions/upload-artifact@v4
-        with:
-          name: icon
-          path: master/server/src/main/resources/icon
-          if-no-files-found: error
-
-      - name: Tar scripts dir to maintain file permissions
-        run: tar -cvzf scripts.tar.gz -C master/ scripts/
-
-      - name: Upload scripts.tar.gz
-        uses: actions/upload-artifact@v4
-        with:
-          name: scripts
-          path: scripts.tar.gz
-          if-no-files-found: error
-
-  jlink:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            name: linux-x64
-          - os: windows-latest
-            name: windows-x64
-          - os: macos-14
-            name: macOS-arm64
-          - os: macos-13
-            name: macOS-x64
-        os: [ubuntu-latest, windows-latest, macos-14, macos-13]
-
-    steps:
-      - name: Set up JDK
-        uses: actions/setup-java@v4
-        with:
-          java-version: 21
-          distribution: 'temurin'
-
-      - name: Package JDK
-        run: jlink --add-modules java.base,java.compiler,java.datatransfer,java.desktop,java.instrument,java.logging,java.management,java.naming,java.prefs,java.scripting,java.se,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml,jdk.attach,jdk.crypto.ec,jdk.jdi,jdk.management,jdk.net,jdk.random,jdk.unsupported,jdk.unsupported.desktop,jdk.zipfs --output suwa --strip-debug --no-man-pages --no-header-files --compress=2
-
-      - name: Upload JRE package
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.name }}-jre
-          path: suwa
-
-  bundle:
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - debian-all
-          - linux-assets
-          - linux-x64
-          - macOS-x64
-          - macOS-arm64
-          - windows-x64
-
-    name: Make ${{ matrix.os }} release
-    needs: [build,jlink]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download Jar
-        uses: actions/download-artifact@v4
-        with:
-          name: jar
-          path: server/build
-
-      - name: Download JRE
-        uses: actions/download-artifact@v4
-        if: matrix.os != 'linux-assets' && matrix.os != 'debian-all'
-        with:
-          name: ${{ matrix.os }}-jre
-          path: jre
-
-      - name: Download icons
-        uses: actions/download-artifact@v4
-        with:
-          name: icon
-          path: server/src/main/resources/icon
-
-      - name: Download scripts.tar.gz
-        uses: actions/download-artifact@v4
-        with:
-          name: scripts
-
-      - name: Make ${{ matrix.os }} release
-        run: |
-          mkdir upload
-          tar -xvpf scripts.tar.gz
-          scripts/bundler.sh -o upload/ ${{ matrix.os }}
-
-      - name: Upload ${{ matrix.os }} release
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.os }}
-          path: upload/*
-          if-no-files-found: error
-
-  release:
-    needs: bundle
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          name: jar
-          path: release
-      - uses: actions/download-artifact@v4
-        with:
-          name: debian-all
-          path: release
-      - uses: actions/download-artifact@v4
-        with:
-          name: linux-assets
-          path: release
-      - uses: actions/download-artifact@v4
-        with:
-          name: linux-x64
-          path: release
-      - uses: actions/download-artifact@v4
-        with:
-          name: macOS-x64
-          path: release
-      - uses: actions/download-artifact@v4
-        with:
-          name: macOS-arm64
-          path: release
-      - uses: actions/download-artifact@v4
-        with:
-          name: windows-x64
-          path: release
-
-      - name: Checkout Preview branch
-        uses: actions/checkout@v4
-        with:
-          repository: "Suwayomi/Suwayomi-Server-preview"
-          ref: main
-          path: preview
-          token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }}
-
-      - name: Generate Tag Name
-        id: GenTagName
-        run: |
-          cd release
-          genTag=$(ls *.jar | sed -e's/Suwayomi-Server-\|.jar//g')
-          echo "$genTag"
-          echo "value=$genTag" >> $GITHUB_OUTPUT
-
-      - 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: softprops/action-gh-release@v2
-        with:
-          token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }}
-          repository: "Suwayomi/Suwayomi-Server-preview"
-          tag_name:  ${{ steps.GenTagName.outputs.value }}
-          files: release/*
-

.github/workflows/docker_build_stable.yml

@@ -1,15 +0,0 @@
-name: Docker Build Stable
-
-on:
-  release:
-    types: [published]
-  
-jobs:
-  build_publish_docker_container:
-    runs-on: ubuntu-latest
-
-    steps:         
-      - name: run docker build and publish script
-        run: |
-          curl -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: token ${{ secrets.DEPLOY_PREVIEW_TOKEN }}" -d '{"ref":"main", "inputs":{"tachidesk_release_type": "stable"}}' https://api.github.com/repos/suwayomi/docker-tachidesk/actions/workflows/build_container_images.yml/dispatches
-          

.github/workflows/issue_closer.yml

@@ -0,0 +1,37 @@
+name: Issue closer
+
+on:
+  issues:
+    types: [opened, edited, reopened]
+
+jobs:
+  autoclose:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Autoclose issues
+        uses: arkon/issue-closer-action@v3.0
+        with:
+          repo-token: ${{ github.token }}
+          rules: |
+            [
+              {
+                "type": "title",
+                "regex": ".*<short description>*",
+                "message": "You did not fill out the description in the title"
+              },
+              {
+                "type": "body",
+                "regex": ".*DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT.*",
+                "message": "The acknowledgment section was not removed"
+              },
+              {
+                "type": "body",
+                "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"
+              },
+              {
+                "type": "body",
+                "regex": ".*Remove this line after you are done.*",
+                "message": "The lines requesting to be removed were not removed."
+              }
+            ]

.github/workflows/publish.yml

@@ -1,208 +1,130 @@
-name: CI Publish
+name: Publish
 
 on:
-  workflow_dispatch:
   push:
     tags:
-      - "v*"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+      - 'v*'
 
 jobs:
   check_wrapper:
     name: Validate Gradle Wrapper
     runs-on: ubuntu-latest
+
     steps:
       - name: Clone repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/wrapper-validation-action@v1
 
   build:
-    name: Build Jar
+    name: Build FatJar
     needs: check_wrapper
     runs-on: ubuntu-latest
+
     steps:
-      - name: Checkout ${{ github.ref }}
-        uses: actions/checkout@v4
+      - name: Cancel previous runs
+        uses: styfle/cancel-workflow-action@0.5.0
         with:
-          ref: ${{ github.ref }}
+          access_token: ${{ github.token }}
+
+      - name: Checkout master branch
+        uses: actions/checkout@v2
+        with:
+          ref: master
           path: master
           fetch-depth: 0
 
-      - name: Set up JDK
-        uses: actions/setup-java@v4
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
         with:
-          java-version: 21
-          distribution: 'temurin'
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+          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
+          cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Build and copy webUI, Build Jar
-        env:
-          ProductBuildType: "Stable"
-        working-directory: master
-        run: ./gradlew :server:downloadWebUI :server:shadowJar --stacktrace
-
-      - name: Upload Jar
-        uses: actions/upload-artifact@v4
-        with:
-          name: jar
-          path: master/server/build/*.jar
-          if-no-files-found: error
-
-      - name: Upload icons
-        uses: actions/upload-artifact@v4
-        with:
-          name: icon
-          path: master/server/src/main/resources/icon
-          if-no-files-found: error
-
-      - name: Tar scripts dir to maintain file permissions
-        run: tar -cvzf scripts.tar.gz -C master/ scripts/
-
-      - name: Upload scripts.tar.gz
-        uses: actions/upload-artifact@v4
-        with:
-          name: scripts
-          path: scripts.tar.gz
-          if-no-files-found: error
-
-  jlink:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            name: linux-x64
-          - os: windows-latest
-            name: windows-x64
-          - os: macos-14
-            name: macOS-arm64
-          - os: macos-13
-            name: macOS-x64
-        os: [ubuntu-latest, windows-latest, macos-14, macos-13]
-
-    steps:
-      - name: Set up JDK
-        uses: actions/setup-java@v4
-        with:
-          java-version: 21
-          distribution: 'temurin'
-
-      - name: Package JDK
-        run: jlink --add-modules java.base,java.compiler,java.datatransfer,java.desktop,java.instrument,java.logging,java.management,java.naming,java.prefs,java.scripting,java.se,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml,jdk.attach,jdk.crypto.ec,jdk.jdi,jdk.management,jdk.net,jdk.random,jdk.unsupported,jdk.unsupported.desktop,jdk.zipfs --output suwa --strip-debug --no-man-pages --no-header-files --compress=2
-
-      - name: Upload JDK package
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.name }}-jre
-          path: suwa
-
-  bundle:
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - debian-all
-          - linux-assets
-          - linux-x64
-          - macOS-x64
-          - macOS-arm64
-          - windows-x64
-
-    name: Make ${{ matrix.os }} release
-    needs: [build, jlink]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download Jar
-        uses: actions/download-artifact@v4
-        with:
-          name: jar
-          path: server/build
-
-      - name: Download JRE
-        uses: actions/download-artifact@v4
-        if: matrix.os != 'linux-assets' && matrix.os != 'debian-all'
-        with:
-          name: ${{ matrix.os }}-jre
-          path: jre
-
-      - name: Download icons
-        uses: actions/download-artifact@v4
-        with:
-          name: icon
-          path: server/src/main/resources/icon
-
-      - name: Download scripts.tar.gz
-        uses: actions/download-artifact@v4
-        with:
-          name: scripts
-
-      - name: Make ${{ matrix.os }} release
+      - name: Download android.jar
         run: |
-          mkdir upload/
-          tar -xvpf scripts.tar.gz
-          scripts/bundler.sh -o upload/ ${{ matrix.os }}
+          cd master
+          curl https://raw.githubusercontent.com/AriaMoradi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
 
-      - name: Upload ${{ matrix.os }} files
-        uses: actions/upload-artifact@v4
+      - name: Cache node_modules
+        uses: actions/cache@v2
         with:
-          name: ${{ matrix.os }}
-          path: upload/*
-          if-no-files-found: error
+          path: |
+            **/react/node_modules
+          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
 
-  release:
-    if: startsWith(github.ref, 'refs/tags/v')
-    needs: bundle
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/download-artifact@v4
+      - name: Build no-webUI Jar
+        uses: eskatos/gradle-command-action@v1
         with:
-          name: jar
-          path: release
-      - uses: actions/download-artifact@v4
-        with:
-          name: debian-all
-          path: release
-      - uses: actions/download-artifact@v4
-        with:
-          name: linux-assets
-          path: release
-      - uses: actions/download-artifact@v4
-        with:
-          name: linux-x64
-          path: release
-      - uses: actions/download-artifact@v4
-        with:
-          name: macOS-x64
-          path: release
-      - uses: actions/download-artifact@v4
-        with:
-          name: macOS-arm64
-          path: release
-      - uses: actions/download-artifact@v4
-        with:
-          name: windows-x64
-          path: release
+          build-root-directory: master
+          wrapper-directory: master
+          arguments: :server:shadowJar -x :webUI:copyBuild --stacktrace
+          wrapper-cache-enabled: true
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: true
 
-      - name: Generate checksums
-        run: cd release && sha256sum * > Checksums.sha256
+      - name: Rename the no-webUI Jar
+        run: |
+          cd master/server/build
+          mv Tachidesk-*.jar $(ls *.jar | sed 's/\.jar/-no-webUI\.jar/g')
 
-      - name: Release
-        uses: softprops/action-gh-release@v2
+      - name: Build Jar and launch4j
+        uses: eskatos/gradle-command-action@v1
         with:
-          token: ${{ secrets.DEPLOY_RELEASE_TOKEN }}
+          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@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          file: "master/repo/*"
+          tags: true
           draft: true
-          files: release/*
+          verbose: true
+
+#      - 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 }}

.github/workflows/winget.yml

@@ -1,15 +0,0 @@
-name: Publish to WinGet
-on:
-  workflow_run:
-    workflows: ["CI Publish"]
-    types:
-      - completed
-jobs:
-  publish:
-    runs-on: windows-latest # action can only be run on windows
-    steps:
-      - uses: vedantmgoyal2009/winget-releaser@v2
-        with:
-          identifier: Suwayomi.Tachidesk-Server
-          installers-regex: '.*x64.msi$'
-          token: ${{ secrets.WINGET_PUBLISH_PAT }}

.gitignore

@@ -1,22 +1,8 @@
-# Ignore project-specific local files and dirs
+# Ignore Gradle project-specific cache directory
 .gradle
 .idea
-gradle.properties
-.fleet
-# But we need these
-!.idea/runConfigurations
-.kotlin
 
 # Ignore Gradle build output directory
 build
-server/out
-AndroidCompat/out
 
-# WebUI is either to be downloaded on-demand or is a dynamic build asset
-server/src/main/resources/WebUI.zip
-
-# bundling stage downlaoded assets
-scripts/OpenJDK*
-scripts/zulu*
-scripts/electron-*
-scripts/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/build.gradle.kts

@@ -1,23 +0,0 @@
-plugins {
-    id(
-        libs.plugins.kotlin.jvm
-            .get()
-            .pluginId,
-    )
-    id(
-        libs.plugins.kotlin.serialization
-            .get()
-            .pluginId,
-    )
-    id(
-        libs.plugins.ktlint
-            .get()
-            .pluginId,
-    )
-}
-
-dependencies {
-    // Shared
-    implementation(libs.bundles.shared)
-    testImplementation(libs.bundles.sharedTest)
-}

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

@@ -0,0 +1,12 @@
+package xyz.nulldev.ts.config
+
+import org.kodein.di.DI
+import org.kodein.di.bind
+import org.kodein.di.singleton
+
+class ConfigKodeinModule {
+    fun create() = DI.Module("ConfigManager") {
+        //Config module
+        bind<ConfigManager>() with singleton { GlobalConfigManager }
+    }
+}

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

@@ -1,40 +1,28 @@
 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.ConfigValue
-import com.typesafe.config.ConfigValueFactory
-import com.typesafe.config.parser.ConfigDocument
-import com.typesafe.config.parser.ConfigDocumentFactory
-import io.github.oshai.kotlinlogging.KotlinLogging
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
+import com.typesafe.config.ConfigRenderOptions
+import mu.KotlinLogging
+import net.harawata.appdirs.AppDirsFactory
 import java.io.File
 
 /**
  * Manages app config.
  */
 open class ConfigManager {
-    val logger = KotlinLogging.logger {}
-    private val generatedModules = mutableMapOf<Class<out ConfigModule>, ConfigModule>()
-    private val userConfigFile = File(ApplicationRootDir, "server.conf")
-    private var internalConfig = loadConfigs()
-    val config: Config
-        get() = internalConfig
+    private val dataRoot by lazy { AppDirsFactory.getInstance().getUserDataDir("Tachidesk", null, null)!! }
 
-    // Public read-only view of modules
+    private val generatedModules = mutableMapOf<Class<out ConfigModule>, ConfigModule>()
+    val config by lazy { loadConfigs() }
+
+    //Public read-only view of modules
     val loadedModules: Map<Class<out ConfigModule>, ConfigModule>
         get() = generatedModules
 
-    private val mutex = Mutex()
+    open val appConfigFile: String = "$dataRoot/server.conf"
+
+    val logger = KotlinLogging.logger {}
 
     /**
      * Get a config module
@@ -44,51 +32,37 @@ open class ConfigManager {
     /**
      * Get a config module (Java API)
      */
-    @Suppress("UNCHECKED_CAST")
     fun <T : ConfigModule> module(type: Class<T>): T = loadedModules[type] as T
 
-    private fun getUserConfig(): Config =
-        userConfigFile.let {
-            ConfigFactory.parseFile(it)
-        }
-
     /**
      * Load configs
      */
     fun loadConfigs(): Config {
-        // Load reference configs
-        val compatConfig = ConfigFactory.parseResources("compat-reference.conf")
+        //Load reference configs
+        val compatConfig =  ConfigFactory.parseResources("compat-reference.conf")
         val serverConfig = ConfigFactory.parseResources("server-reference.conf")
-        val baseConfig =
-            ConfigFactory.parseMap(
-                mapOf(
-                    // override AndroidCompat's rootDir
-                    "androidcompat.rootDir" to "$ApplicationRootDir/android-compat",
-                ),
-            )
 
-        // Load user config
-        val userConfig = getUserConfig()
+        //Load user config
+        val userConfig =
+            File(appConfigFile).let{
+                    ConfigFactory.parseFile(it)
+            }
 
-        val config =
-            ConfigFactory
-                .empty()
-                .withFallback(baseConfig)
+        val config = ConfigFactory.empty()
                 .withFallback(userConfig)
                 .withFallback(compatConfig)
                 .withFallback(serverConfig)
                 .resolve()
 
-        // set log level early
-        if (debugLogsEnabled(config)) {
-            setLogLevelFor(BASE_LOGGER_NAME, Level.DEBUG)
+        logger.debug {
+            "Loaded config:\n" + config.root().render(ConfigRenderOptions.concise().setFormatted(true))
         }
 
         return config
     }
 
     fun registerModule(module: ConfigModule) {
-        generatedModules[module.javaClass] = module
+        generatedModules.put(module.javaClass, module)
     }
 
     fun registerModules(vararg modules: ConfigModule) {
@@ -96,73 +70,6 @@ open class ConfigManager {
             registerModule(it)
         }
     }
-
-    private fun updateUserConfigFile(
-        path: String,
-        value: ConfigValue,
-    ) {
-        val userConfigDoc = ConfigDocumentFactory.parseFile(userConfigFile)
-        val updatedConfigDoc = userConfigDoc.withValue(path, value)
-        val newFileContent = updatedConfigDoc.render()
-        userConfigFile.writeText(newFileContent)
-    }
-
-    suspend fun updateValue(
-        path: String,
-        value: Any,
-    ) {
-        mutex.withLock {
-            val configValue = ConfigValueFactory.fromAnyRef(value)
-
-            updateUserConfigFile(path, configValue)
-            internalConfig = internalConfig.withValue(path, configValue)
-        }
-    }
-
-    fun resetUserConfig(updateInternalConfig: Boolean = true): ConfigDocument {
-        val serverConfigFileContent = this::class.java.getResource("/server-reference.conf")?.readText()
-        val serverConfigDoc = ConfigDocumentFactory.parseString(serverConfigFileContent)
-        userConfigFile.writeText(serverConfigDoc.render())
-
-        if (updateInternalConfig) {
-            getUserConfig().entrySet().forEach { internalConfig = internalConfig.withValue(it.key, it.value) }
-        }
-
-        return serverConfigDoc
-    }
-
-    /**
-     * Makes sure the "UserConfig" is up-to-date.
-     *
-     *  - adds missing settings
-     *  - removes outdated settings
-     */
-    fun updateUserConfig() {
-        val serverConfig = ConfigFactory.parseResources("server-reference.conf")
-        val userConfig = getUserConfig()
-
-        val hasMissingSettings = serverConfig.entrySet().any { !userConfig.hasPath(it.key) }
-        val hasOutdatedSettings = userConfig.entrySet().any { !serverConfig.hasPath(it.key) }
-        val isUserConfigOutdated = hasMissingSettings || hasOutdatedSettings
-        if (!isUserConfigOutdated) {
-            return
-        }
-
-        logger.debug {
-            "user config is out of date, updating... (missingSettings= $hasMissingSettings, outdatedSettings= $hasOutdatedSettings"
-        }
-
-        var newUserConfigDoc: ConfigDocument = resetUserConfig(false)
-        userConfig
-            .entrySet()
-            .filter {
-                serverConfig.hasPath(
-                    it.key,
-                )
-            }.forEach { newUserConfigDoc = newUserConfigDoc.withValue(it.key, it.value) }
-
-        userConfigFile.writeText(newUserConfigDoc.render())
-    }
 }
 
 object GlobalConfigManager : ConfigManager()

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

@@ -1,9 +0,0 @@
-package xyz.nulldev.ts.config
-
-import org.koin.core.module.Module
-import org.koin.dsl.module
-
-fun configManagerModule(): Module =
-    module {
-        single<ConfigManager> { GlobalConfigManager }
-    }

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

@@ -1,65 +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 com.typesafe.config.ConfigFactory
-import com.typesafe.config.ConfigValueFactory
-import io.github.config4k.getValue
-import kotlin.reflect.KProperty
 
 /**
  * Abstract config module.
  */
-@Suppress("UNUSED_PARAMETER")
-abstract class ConfigModule(
-    getConfig: () -> Config,
-)
-
-/**
- * Abstract jvm-commandline-argument-overridable config module.
- */
-abstract class SystemPropertyOverridableConfigModule(
-    getConfig: () -> Config,
-    moduleName: String,
-) : ConfigModule(getConfig) {
-    val overridableConfig = SystemPropertyOverrideDelegate(getConfig, moduleName)
-}
-
-/** Defines a config property that is overridable with jvm `-D` commandline arguments prefixed with [CONFIG_PREFIX] */
-class SystemPropertyOverrideDelegate(
-    val getConfig: () -> Config,
-    val moduleName: String,
-) {
-    inline operator fun <R, reified T> getValue(
-        thisRef: R,
-        property: KProperty<*>,
-    ): T {
-        val config = getConfig()
-        val configValue: T = config.getValue(thisRef, property)
-
-        val combined =
-            System.getProperty(
-                "$CONFIG_PREFIX.$moduleName.${property.name}",
-                if (T::class.simpleName == "List") {
-                    ConfigValueFactory.fromAnyRef(configValue).render()
-                } else {
-                    configValue.toString()
-                },
-            )
-
-        return when (T::class.simpleName) {
-            "Int" -> combined.toInt()
-            "Boolean" -> combined.toBoolean()
-            "Double" -> combined.toDouble()
-            "List" -> ConfigFactory.parseString("internal=" + combined).getStringList("internal").orEmpty()
-            // add more types as needed
-            else -> combined // covers String
-        } as T
-    }
-}
+abstract class ConfigModule(config: Config)

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

@@ -1,139 +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 ch.qos.logback.classic.LoggerContext
-import ch.qos.logback.classic.encoder.PatternLayoutEncoder
-import ch.qos.logback.classic.spi.ILoggingEvent
-import ch.qos.logback.core.rolling.RollingFileAppender
-import ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy
-import ch.qos.logback.core.util.FileSize
-import com.typesafe.config.Config
-import io.github.oshai.kotlinlogging.DelegatingKLogger
-import io.github.oshai.kotlinlogging.KotlinLogging
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-
-private fun fileSizeValueOfOrDefault(
-    fileSizeStr: String,
-    default: String,
-): FileSize =
-    try {
-        FileSize.valueOf(fileSizeStr)
-    } catch (e: IllegalArgumentException) {
-        FileSize.valueOf(default)
-    }
-
-private const val FILE_APPENDER_NAME = "SuwayomiDefaultAppender"
-
-private fun createRollingFileAppender(
-    logContext: LoggerContext,
-    logDirPath: String,
-    maxFiles: Int,
-    maxFileSize: String,
-    maxTotalSize: String,
-): RollingFileAppender<ILoggingEvent> {
-    val logFilename = "application"
-
-    val logEncoder =
-        PatternLayoutEncoder().apply {
-            pattern = "%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n"
-            context = logContext
-            start()
-        }
-
-    val appender =
-        RollingFileAppender<ILoggingEvent>().apply {
-            name = FILE_APPENDER_NAME
-            context = logContext
-            encoder = logEncoder
-            file = "$logDirPath/$logFilename.log"
-        }
-
-    val rollingPolicy =
-        SizeAndTimeBasedRollingPolicy<ILoggingEvent>().apply {
-            context = logContext
-            setParent(appender)
-            fileNamePattern = "$logDirPath/${logFilename}_%d{yyyy-MM-dd}_%i.log.gz"
-            maxHistory = maxFiles.coerceAtLeast(0)
-            setMaxFileSize(fileSizeValueOfOrDefault(maxFileSize, "10mb"))
-            setTotalSizeCap(fileSizeValueOfOrDefault(maxTotalSize, "100mb"))
-            start()
-        }
-
-    appender.rollingPolicy = rollingPolicy
-    appender.start()
-
-    return appender
-}
-
-private fun getBaseLogger(): ch.qos.logback.classic.Logger =
-    ((KotlinLogging.logger(Logger.ROOT_LOGGER_NAME) as DelegatingKLogger<*>).underlyingLogger as ch.qos.logback.classic.Logger)
-
-private fun getLogger(name: String): ch.qos.logback.classic.Logger {
-    val context = LoggerFactory.getILoggerFactory() as LoggerContext
-    return context.getLogger(name)
-}
-
-fun initLoggerConfig(
-    appRootPath: String,
-    maxFiles: Int,
-    maxFileSize: String,
-    maxTotalSize: String,
-) {
-    val context = LoggerFactory.getILoggerFactory() as LoggerContext
-    val logger = getBaseLogger()
-
-    // logback logs to the console by default (at least when adding a console appender logs in the console are duplicated)
-    logger.addAppender(createRollingFileAppender(context, "$appRootPath/logs", maxFiles, maxFileSize, maxTotalSize))
-
-    // set "kotlin exposed" log level
-    setLogLevelFor("Exposed", Level.ERROR)
-}
-
-fun updateFileAppender(
-    maxFiles: Int,
-    maxFileSize: String,
-    maxTotalSize: String,
-) {
-    val logger = getBaseLogger()
-
-    val appender = logger.getAppender(FILE_APPENDER_NAME) as RollingFileAppender<*>? ?: return
-    val rollingPolicy = appender.rollingPolicy as SizeAndTimeBasedRollingPolicy<*>
-    rollingPolicy.apply {
-        maxHistory = maxFiles
-        setMaxFileSize(FileSize.valueOf(maxFileSize))
-        setTotalSizeCap(FileSize.valueOf(maxTotalSize))
-
-        rollingPolicy.stop()
-        appender.stop()
-
-        rollingPolicy.start()
-        appender.start()
-    }
-}
-
-const val BASE_LOGGER_NAME = "_BaseLogger"
-
-fun setLogLevelFor(
-    name: String,
-    level: Level,
-) {
-    val logger =
-        if (name == BASE_LOGGER_NAME) {
-            getBaseLogger()
-        } else {
-            getLogger(name)
-        }
-
-    logger.level = level
-}
-
-fun debugLogsEnabled(config: Config) =
-    System.getProperty("suwayomi.tachidesk.config.server.debugLogsEnabled", config.getString("server.debugLogsEnabled")).toBoolean()

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

@@ -2,6 +2,5 @@ package xyz.nulldev.ts.config.util
 
 import com.typesafe.config.Config
 
-operator fun Config.get(key: String) =
-    getString(key)
+operator fun Config.get(key: String) = getString(key)
         ?: throw IllegalStateException("Could not find value for config entry: $key!")

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,50 +1,72 @@
+
 plugins {
-    id(
-        libs.plugins.kotlin.jvm
-            .get()
-            .pluginId,
-    )
-    id(
-        libs.plugins.kotlin.serialization
-            .get()
-            .pluginId,
-    )
-    id(
-        libs.plugins.ktlint
-            .get()
-            .pluginId,
-    )
+    application
+}
+
+
+repositories {
+    mavenCentral()
+    jcenter()
+    maven {
+        url = uri("https://jitpack.io")
+    }
+
+    maven {
+        url = uri("https://maven.google.com")
+    }
 }
 
 dependencies {
-    // Shared
-    implementation(libs.bundles.shared)
-    testImplementation(libs.bundles.sharedTest)
-
     // Android stub library
-    implementation(libs.android.stubs)
+//    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")
+
+    // 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(libs.xmlpull)
+    compileOnly( group= "xmlpull", name= "xmlpull", version= "1.1.3.1")
 
     // Config API
-    implementation(projects.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(libs.apksig)
+    compileOnly("com.android.tools.build:apksig:4.2.0-alpha13")
 
     // AndroidX annotations
-    compileOnly(libs.android.annotations)
+    compileOnly( "androidx.annotation:annotation:1.2.0-alpha01")
 
-    // substitute for duktape-android/quickjs
-    implementation(libs.bundles.polyglot)
-
-    // Kotlin wrapper around Java Preferences, makes certain things easier
-    implementation(libs.bundles.settings)
-
-    // Android version of SimpleDateFormat
-    implementation(libs.icu4j)
-
-    // OpenJDK lacks native JPEG encoder and native WEBP decoder
-    implementation(libs.bundles.twelvemonkeys)
+//    compileOnly("io.reactivex:rxjava:1.3.8")
 }
+
+//def fatJarTask = tasks.getByPath(':AndroidCompat:JVMPatch:fatJar')
+//
+//// Copy JVM core patches
+//task copyJVMPatches(type: Copy) {
+//    from fatJarTask.outputs.files
+//    into 'src/main/resources/patches'
+//}
+//
+//compileOnly(Java.dependsOn gradle.includedBuild('dex2jar').task(':dex-translator:assemble')
+//compileOnly(Java.dependsOn copyJVMPatches
+//copyJVMPatches.dependsOn fatJarTask
+//

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/lib/.gitignore

@@ -0,0 +1 @@
+android.jar

AndroidCompat/src/main/java/android/app/Service.java

@@ -25,7 +25,7 @@ import android.os.IBinder;
 import android.util.Log;
 import kotlin.NotImplementedError;
 import xyz.nulldev.androidcompat.service.ServiceSupport;
-import xyz.nulldev.androidcompat.util.KoinGlobalHelper;
+import xyz.nulldev.androidcompat.util.KodeinGlobalHelper;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -299,7 +299,7 @@ import java.lang.annotation.RetentionPolicy;
  */
 public abstract class Service extends ContextWrapper implements ComponentCallbacks2 {
 
-    private static final ServiceSupport serviceSupport = KoinGlobalHelper.instance(ServiceSupport.class);
+    private static final ServiceSupport serviceSupport = KodeinGlobalHelper.instance(ServiceSupport.class);
 
     private static final String TAG = "Service";
     /**
@@ -328,7 +328,7 @@ public abstract class Service extends ContextWrapper implements ComponentCallbac
     public Service() {
         //==================[THIS LINE MODIFIED FROM ANDROID SOURCE!]==================
         //Service must be initialized with a base context!
-        super(KoinGlobalHelper.instance(Context.class));
+        super(KodeinGlobalHelper.instance(Context.class));
     }
     /** Return the application that owns this service. */
     public final Application getApplication() {

AndroidCompat/src/main/java/android/graphics/Bitmap.java

@@ -1,235 +0,0 @@
-package android.graphics;
-
-import android.annotation.ColorInt;
-import android.annotation.NonNull;
-
-import javax.imageio.IIOImage;
-import javax.imageio.ImageIO;
-import javax.imageio.ImageWriteParam;
-import javax.imageio.ImageWriter;
-import javax.imageio.stream.ImageOutputStream;
-import java.awt.image.BufferedImage;
-import java.awt.image.Raster;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Iterator;
-
-public final class Bitmap {
-    private final int width;
-    private final int height;
-    private final BufferedImage image;
-
-    public Bitmap(BufferedImage image) {
-        this.image = image;
-        this.width = image.getWidth();
-        this.height = image.getHeight();
-    }
-
-    public BufferedImage getImage() {
-        return image;
-    }
-
-    public int getHeight() {
-        return height;
-    }
-
-    public int getWidth() {
-        return width;
-    }
-
-    public enum CompressFormat {
-        JPEG          (0),
-        PNG           (1),
-        WEBP          (2),
-        WEBP_LOSSY    (3),
-        WEBP_LOSSLESS (4);
-
-        CompressFormat(int nativeInt) {
-            this.nativeInt = nativeInt;
-        }
-
-        final int nativeInt;
-    }
-
-    public enum Config {
-        ALPHA_8(1),
-        RGB_565(3),
-        ARGB_4444(4),
-        ARGB_8888(5),
-        RGBA_F16(6),
-        HARDWARE(7),
-        RGBA_1010102(8);
-
-        final int nativeInt;
-
-        private static final Config[] sConfigs = {
-                null, ALPHA_8, null, RGB_565, ARGB_4444, ARGB_8888, RGBA_F16, HARDWARE, RGBA_1010102
-        };
-
-        Config(int ni) {
-            this.nativeInt = ni;
-        }
-
-        static Config nativeToConfig(int ni) {
-            return sConfigs[ni];
-        }
-    }
-
-    /**
-     * Common code for checking that x and y are >= 0
-     *
-     * @param x x coordinate to ensure is >= 0
-     * @param y y coordinate to ensure is >= 0
-     */
-    private static void checkXYSign(int x, int y) {
-        if (x < 0) {
-            throw new IllegalArgumentException("x must be >= 0");
-        }
-        if (y < 0) {
-            throw new IllegalArgumentException("y must be >= 0");
-        }
-    }
-
-    /**
-     * Common code for checking that width and height are > 0
-     *
-     * @param width  width to ensure is > 0
-     * @param height height to ensure is > 0
-     */
-    private static void checkWidthHeight(int width, int height) {
-        if (width <= 0) {
-            throw new IllegalArgumentException("width must be > 0");
-        }
-        if (height <= 0) {
-            throw new IllegalArgumentException("height must be > 0");
-        }
-    }
-
-    public static Bitmap createBitmap(int width, int height, Config config) {
-        BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-        return new Bitmap(image);
-    }
-
-    public static Bitmap createBitmap(@NonNull Bitmap source, int x, int y, int width, int height) {
-        checkXYSign(x, y);
-        checkWidthHeight(width, height);
-        if (x + width > source.getWidth()) {
-            throw new IllegalArgumentException("x + width must be <= bitmap.width()");
-        }
-        if (y + height > source.getHeight()) {
-            throw new IllegalArgumentException("y + height must be <= bitmap.height()");
-        }
-
-        // Android will make a copy when creating a sub image,
-        // so we do the same here
-        BufferedImage subImage = source.image.getSubimage(x, y, width, height);
-        BufferedImage newImage = new BufferedImage(subImage.getWidth(), subImage.getHeight(), subImage.getType());
-        newImage.setData(subImage.getData());
-
-        return new Bitmap(newImage);
-    }
-
-    public boolean compress(CompressFormat format, int quality, OutputStream stream) {
-        if (stream == null) {
-            throw new NullPointerException();
-        }
-
-        if (quality < 0 || quality > 100) {
-            throw new IllegalArgumentException("quality must be 0..100");
-        }
-        float qualityFloat = ((float) quality) / 100;
-
-        String formatString;
-        if (format == Bitmap.CompressFormat.PNG) {
-            formatString = "png";
-        } else if (format == Bitmap.CompressFormat.JPEG) {
-            formatString = "jpg";
-        } else {
-            throw new IllegalArgumentException("unsupported compression format!");
-        }
-
-        Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName(formatString);
-        if (!writers.hasNext()) {
-            throw new IllegalStateException("no image writers found for this format!");
-        }
-        ImageWriter writer = writers.next();
-
-        ImageOutputStream ios;
-        try {
-            ios = ImageIO.createImageOutputStream(stream);
-        } catch (IOException ex) {
-            throw new RuntimeException(ex);
-        }
-        writer.setOutput(ios);
-
-        ImageWriteParam param = writer.getDefaultWriteParam();
-        if ("jpg".equals(formatString)) {
-            param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
-            param.setCompressionQuality(qualityFloat);
-        }
-
-        try {
-            writer.write(null, new IIOImage(image, null, null), param);
-            ios.close();
-            writer.dispose();
-        } catch (IOException ex) {
-            throw new RuntimeException(ex);
-        }
-
-        return true;
-    }
-
-    /**
-     * Shared code to check for illegal arguments passed to getPixels()
-     * or setPixels()
-     *
-     * @param x      left edge of the area of pixels to access
-     * @param y      top edge of the area of pixels to access
-     * @param width  width of the area of pixels to access
-     * @param height height of the area of pixels to access
-     * @param offset offset into pixels[] array
-     * @param stride number of elements in pixels[] between each logical row
-     * @param pixels array to hold the area of pixels being accessed
-     */
-    private void checkPixelsAccess(int x, int y, int width, int height,
-                                   int offset, int stride, int[] pixels) {
-        checkXYSign(x, y);
-        if (width < 0) {
-            throw new IllegalArgumentException("width must be >= 0");
-        }
-        if (height < 0) {
-            throw new IllegalArgumentException("height must be >= 0");
-        }
-        if (x + width > getWidth()) {
-            throw new IllegalArgumentException(
-                    "x + width must be <= bitmap.width()");
-        }
-        if (y + height > getHeight()) {
-            throw new IllegalArgumentException(
-                    "y + height must be <= bitmap.height()");
-        }
-        if (Math.abs(stride) < width) {
-            throw new IllegalArgumentException("abs(stride) must be >= width");
-        }
-        int lastScanline = offset + (height - 1) * stride;
-        int length = pixels.length;
-        if (offset < 0 || (offset + width > length)
-                || lastScanline < 0
-                || (lastScanline + width > length)) {
-            throw new ArrayIndexOutOfBoundsException();
-        }
-    }
-
-    public void getPixels(@ColorInt int[] pixels, int offset, int stride,
-                          int x, int y, int width, int height) {
-        checkPixelsAccess(x, y, width, height, offset, stride, pixels);
-
-        Raster raster = image.getData();
-        int[] rasterPixels = raster.getPixels(x, y, width, height, (int[]) null);
-
-        for (int ht = 0; ht < height; ht++) {
-            int rowOffset = offset + stride * ht;
-            System.arraycopy(rasterPixels, ht * width, pixels, rowOffset, width);
-        }
-    }
-}

AndroidCompat/src/main/java/android/graphics/BitmapFactory.java

@@ -1,51 +0,0 @@
-package android.graphics;
-
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.util.Iterator;
-import javax.imageio.ImageIO;
-import javax.imageio.ImageReader;
-import javax.imageio.stream.ImageInputStream;
-
-public class BitmapFactory {
-    public static Bitmap decodeStream(InputStream inputStream) {
-        Bitmap bitmap = null;
-
-        try {
-            ImageInputStream imageInputStream = ImageIO.createImageInputStream(inputStream);
-            Iterator<ImageReader> imageReaders = ImageIO.getImageReaders(imageInputStream);
-
-            if (!imageReaders.hasNext()) {
-                throw new IllegalArgumentException("no reader for image");
-            }
-
-            ImageReader imageReader = imageReaders.next();
-            imageReader.setInput(imageInputStream);
-
-            BufferedImage image = imageReader.read(0, imageReader.getDefaultReadParam());
-            bitmap = new Bitmap(image);
-
-            imageReader.dispose();
-        } catch (IOException ex) {
-            throw new RuntimeException(ex);
-        }
-
-        return bitmap;
-    }
-
-    public static Bitmap decodeByteArray(byte[] data, int offset, int length) {
-        Bitmap bitmap = null;
-
-        ByteArrayInputStream byteArrayStream = new ByteArrayInputStream(data);
-        try {
-            BufferedImage image = ImageIO.read(byteArrayStream);
-            bitmap = new Bitmap(image);
-        } catch (IOException ex) {
-            throw new RuntimeException(ex);
-        }
-
-        return bitmap;
-    }
-}

AndroidCompat/src/main/java/android/graphics/Canvas.java

@@ -1,21 +0,0 @@
-package android.graphics;
-
-import java.awt.Graphics2D;
-import java.awt.image.BufferedImage;
-import javax.imageio.ImageIO;
-
-public final class Canvas {
-    private BufferedImage canvasImage;
-    private Graphics2D canvas;
-
-    public Canvas(Bitmap bitmap) {
-        canvasImage = bitmap.getImage();
-        canvas = canvasImage.createGraphics();
-    }
-
-    public void drawBitmap(Bitmap sourceBitmap, Rect src, Rect dst, Paint paint) {        
-        BufferedImage sourceImage = sourceBitmap.getImage();
-        BufferedImage sourceImageCropped = sourceImage.getSubimage(src.left, src.top, src.getWidth(), src.getHeight());
-        canvas.drawImage(sourceImageCropped, null, dst.left, dst.top);
-    }
-}

AndroidCompat/src/main/java/android/graphics/Rect.java

@@ -1,122 +0,0 @@
-package android.graphics;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public final class Rect {
-    int left;
-    int top;
-    int right;
-    int bottom;
-
-    private static final class UnflattenHelper {
-        private static final Pattern FLATTENED_PATTERN = Pattern.compile(
-            "(-?\\d+) (-?\\d+) (-?\\d+) (-?\\d+)");
-
-        static Matcher getMatcher(String str) {
-            return FLATTENED_PATTERN.matcher(str);
-        }
-    }
-
-    public Rect() {
-    }
-
-    public Rect(int left, int top, int right, int bottom) {
-        this.left = left;
-        this.top = top;
-        this.right = right;
-        this.bottom = bottom;
-    }
-
-    public Rect(Rect r) {
-        if (r == null) {
-            this.left = 0;
-            this.top = 0;
-            this.right = 0;
-            this.bottom = 0;
-        } else {
-            this.left = left;
-            this.top = top;
-            this.right = right;
-            this.bottom = bottom;
-        }
-    }
-
-    public final int getWidth() {
-        return right - left;
-    }
-
-    public final int getHeight() {
-        return bottom - top;
-    }
-
-    public static Rect unflattenFromString(String str) {
-        if (str.isEmpty()) {
-            return null;
-        }
-
-        Matcher matcher = UnflattenHelper.getMatcher(str);
-        if (!matcher.matches()) {
-            return null;
-        }
-
-        return new Rect(Integer.parseInt(matcher.group(1)),
-                        Integer.parseInt(matcher.group(2)),
-                        Integer.parseInt(matcher.group(3)),
-                        Integer.parseInt(matcher.group(4)));
-    }
-
-    public String toShortString() {
-        return toShortString(new StringBuilder(32));
-    }
-    
-    public String toShortString(StringBuilder sb) {
-        sb.setLength(0);
-        sb.append('['); sb.append(left); sb.append(',');
-        sb.append(top); sb.append("]["); sb.append(right);
-        sb.append(','); sb.append(bottom); sb.append(']');
-        return sb.toString();
-    }
-
-    public String flattenToString() {
-        StringBuilder sb = new StringBuilder(32);
-        sb.append(left);
-        sb.append(' ');
-        sb.append(top);
-        sb.append(' ');
-        sb.append(right);
-        sb.append(' ');
-        sb.append(bottom);
-        return sb.toString();
-    }
-
-    public void writeToParcel(Parcel out, int flags) {
-        out.writeInt(left);
-        out.writeInt(top);
-        out.writeInt(right);
-        out.writeInt(bottom);
-    }
-
-    public static final Parcelable.Creator<Rect> CREATOR = new Parcelable.Creator<Rect>() {
-        @Override
-        public Rect createFromParcel(Parcel in) {
-            Rect r = new Rect();
-            r.readFromParcel(in);
-            return r;
-        }
-
-        @Override
-        public Rect[] newArray(int size) {
-            return new Rect[size];
-        }
-    };
-
-    public void readFromParcel(Parcel in) {
-        left = in.readInt();
-        top = in.readInt();
-        right = in.readInt();
-        bottom = in.readInt();
-    }
-}

AndroidCompat/src/main/java/android/os/Environment.java

@@ -1,7 +1,7 @@
 package android.os;
 
 import xyz.nulldev.androidcompat.io.AndroidFiles;
-import xyz.nulldev.androidcompat.util.KoinGlobalHelper;
+import xyz.nulldev.androidcompat.util.KodeinGlobalHelper;
 
 import java.io.File;
 
@@ -9,7 +9,7 @@ import java.io.File;
  * Android compatibility layer for files
  */
 public class Environment {
-    private static AndroidFiles androidFiles = KoinGlobalHelper.instance(AndroidFiles.class);
+    private static AndroidFiles androidFiles = KodeinGlobalHelper.instance(AndroidFiles.class);
 
     public static String DIRECTORY_ALARMS = getHomeDirectory("Alarms").getAbsolutePath();
     public static String DIRECTORY_DCIM = getHomeDirectory("DCIM").getAbsolutePath();

AndroidCompat/src/main/java/android/preference/PreferenceManager.kt

@@ -9,10 +9,8 @@ import android.content.Context
 class PreferenceManager {
     companion object {
         @JvmStatic
-        fun getDefaultSharedPreferences(context: Context) =
-            context.getSharedPreferences(
-                context.applicationInfo.packageName,
-                Context.MODE_PRIVATE,
-            )!!
+        fun getDefaultSharedPreferences(context: Context)
+                = context.getSharedPreferences(context.applicationInfo.packageName,
+                Context.MODE_PRIVATE)!!
     }
 }

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/text/Html.java

@@ -4,7 +4,7 @@ package android.text;
 import android.graphics.drawable.Drawable;
 import org.jetbrains.annotations.NotNull;
 import org.jsoup.Jsoup;
-import org.jsoup.safety.Safelist;
+import org.jsoup.safety.Whitelist;
 import org.xml.sax.XMLReader;
 
 /**
@@ -18,7 +18,7 @@ import org.xml.sax.XMLReader;
 public class Html {
 
     public static Spanned fromHtml(String source) {
-        return new FakeSpanned(Jsoup.clean(source, Safelist.none()));
+        return new FakeSpanned(Jsoup.clean(source, Whitelist.none()));
     }
 
     public static Spanned fromHtml(String source, Html.ImageGetter imageGetter, Html.TagHandler tagHandler) {

AndroidCompat/src/main/java/android/webkit/CookieManager.java

@@ -1,247 +0,0 @@
-package android.webkit;
-
-import android.annotation.Nullable;
-import xyz.nulldev.androidcompat.webkit.CookieManagerImpl;
-
-public abstract class CookieManager {
-    /**
-     * @deprecated This class should not be constructed by applications, use {@link #getInstance}
-     * instead to fetch the singleton instance.
-     */
-    // TODO(ntfschr): mark this as @SystemApi after a year.
-    @Deprecated
-    public CookieManager() {}
-    @Override
-    protected Object clone() throws CloneNotSupportedException {
-        throw new CloneNotSupportedException("doesn't implement Cloneable");
-    }
-
-    private static CookieManager INSTANCE = null;
-    private static final Object lock = new Object();
-    /**
-     * Gets the singleton CookieManager instance.
-     *
-     * @return the singleton CookieManager instance
-     */
-    public static CookieManager getInstance() {
-        if (INSTANCE != null) {
-            return INSTANCE;
-        } else {
-            synchronized (lock) {
-                if (INSTANCE == null) {
-                    INSTANCE = new CookieManagerImpl();
-                }
-                return INSTANCE;
-            }
-        }
-    }
-    /**
-     * Sets whether the application's {@link WebView} instances should send and
-     * accept cookies.
-     * By default this is set to {@code true} and the WebView accepts cookies.
-     * <p>
-     * When this is {@code true}
-     * {@link CookieManager#setAcceptThirdPartyCookies setAcceptThirdPartyCookies} and
-     * {@link CookieManager#setAcceptFileSchemeCookies setAcceptFileSchemeCookies}
-     * can be used to control the policy for those specific types of cookie.
-     *
-     * @param accept whether {@link WebView} instances should send and accept
-     *               cookies
-     */
-    public abstract void setAcceptCookie(boolean accept);
-    /**
-     * Gets whether the application's {@link WebView} instances send and accept
-     * cookies.
-     *
-     * @return {@code true} if {@link WebView} instances send and accept cookies
-     */
-    public abstract boolean acceptCookie();
-    /**
-     * Sets whether the {@link WebView} should allow third party cookies to be set.
-     * Allowing third party cookies is a per WebView policy and can be set
-     * differently on different WebView instances.
-     * <p>
-     * Apps that target {@link android.os.Build.VERSION_CODES#KITKAT} or below
-     * default to allowing third party cookies. Apps targeting
-     * {@link android.os.Build.VERSION_CODES#LOLLIPOP} or later default to disallowing
-     * third party cookies.
-     *
-     * @param webview the {@link WebView} instance to set the cookie policy on
-     * @param accept whether the {@link WebView} instance should accept
-     *               third party cookies
-     */
-    public abstract void setAcceptThirdPartyCookies(WebView webview, boolean accept);
-    /**
-     * Gets whether the {@link WebView} should allow third party cookies to be set.
-     *
-     * @param webview the {@link WebView} instance to get the cookie policy for
-     * @return {@code true} if the {@link WebView} accepts third party cookies
-     */
-    public abstract boolean acceptThirdPartyCookies(WebView webview);
-    /**
-     * Sets a single cookie (key-value pair) for the given URL. Any existing cookie with the same
-     * host, path and name will be replaced with the new cookie. The cookie being set
-     * will be ignored if it is expired. To set multiple cookies, your application should invoke
-     * this method multiple times.
-     *
-     * <p>The {@code value} parameter must follow the format of the {@code Set-Cookie} HTTP
-     * response header defined by
-     * <a href="https://tools.ietf.org/html/draft-ietf-httpbis-rfc6265bis-03">RFC6265bis</a>.
-     * This is a key-value pair of the form {@code "key=value"}, optionally followed by a list of
-     * cookie attributes delimited with semicolons (ex. {@code "key=value; Max-Age=123"}). Please
-     * consult the RFC specification for a list of valid attributes.
-     *
-     * <p class="note"><b>Note:</b> if specifying a {@code value} containing the {@code "Secure"}
-     * attribute, {@code url} must use the {@code "https://"} scheme.
-     *
-     * @param url the URL for which the cookie is to be set
-     * @param value the cookie as a string, using the format of the 'Set-Cookie'
-     *              HTTP response header
-     */
-    public abstract void setCookie(String url, String value);
-    /**
-     * Sets a single cookie (key-value pair) for the given URL. Any existing cookie with the same
-     * host, path and name will be replaced with the new cookie. The cookie being set
-     * will be ignored if it is expired. To set multiple cookies, your application should invoke
-     * this method multiple times.
-     *
-     * <p>The {@code value} parameter must follow the format of the {@code Set-Cookie} HTTP
-     * response header defined by
-     * <a href="https://tools.ietf.org/html/draft-ietf-httpbis-rfc6265bis-03">RFC6265bis</a>.
-     * This is a key-value pair of the form {@code "key=value"}, optionally followed by a list of
-     * cookie attributes delimited with semicolons (ex. {@code "key=value; Max-Age=123"}). Please
-     * consult the RFC specification for a list of valid attributes.
-     *
-     * <p>This method is asynchronous. If a {@link ValueCallback} is provided,
-     * {@link ValueCallback#onReceiveValue} will be called on the current
-     * thread's {@link android.os.Looper} once the operation is complete.
-     * The value provided to the callback indicates whether the cookie was set successfully.
-     * You can pass {@code null} as the callback if you don't need to know when the operation
-     * completes or whether it succeeded, and in this case it is safe to call the method from a
-     * thread without a Looper.
-     *
-     * <p class="note"><b>Note:</b> if specifying a {@code value} containing the {@code "Secure"}
-     * attribute, {@code url} must use the {@code "https://"} scheme.
-     *
-     * @param url the URL for which the cookie is to be set
-     * @param value the cookie as a string, using the format of the 'Set-Cookie'
-     *              HTTP response header
-     * @param callback a callback to be executed when the cookie has been set
-     */
-    public abstract void setCookie(String url, String value, @Nullable ValueCallback<Boolean>
-            callback);
-    /**
-     * Gets all the cookies for the given URL. This may return multiple key-value pairs if multiple
-     * cookies are associated with this URL, in which case each cookie will be delimited by {@code
-     * "; "} characters (semicolon followed by a space). Each key-value pair will be of the form
-     * {@code "key=value"}.
-     *
-     * @param url the URL for which the cookies are requested
-     * @return value the cookies as a string, using the format of the 'Cookie'
-     *               HTTP request header
-     */
-    public abstract String getCookie(String url);
-
-    /**
-     * Removes all session cookies, which are cookies without an expiration
-     * date.
-     * @deprecated use {@link #removeSessionCookies(ValueCallback)} instead.
-     */
-    @Deprecated
-    public abstract void removeSessionCookie();
-    /**
-     * Removes all session cookies, which are cookies without an expiration
-     * date.
-     * <p>
-     * This method is asynchronous.
-     * If a {@link ValueCallback} is provided,
-     * {@link ValueCallback#onReceiveValue(Object)} will be called on the current
-     * thread's {@link android.os.Looper} once the operation is complete.
-     * The value provided to the callback indicates whether any cookies were removed.
-     * You can pass {@code null} as the callback if you don't need to know when the operation
-     * completes or whether any cookie were removed, and in this case it is safe to call the
-     * method from a thread without a Looper.
-     * @param callback a callback which is executed when the session cookies have been removed
-     */
-    public abstract void removeSessionCookies(@Nullable ValueCallback<Boolean> callback);
-    /**
-     * Removes all cookies.
-     * @deprecated Use {@link #removeAllCookies(ValueCallback)} instead.
-     */
-    @Deprecated
-    public abstract void removeAllCookie();
-    /**
-     * Removes all cookies.
-     * <p>
-     * This method is asynchronous.
-     * If a {@link ValueCallback} is provided,
-     * {@link ValueCallback#onReceiveValue(Object)}  will be called on the current
-     * thread's {@link android.os.Looper} once the operation is complete.
-     * The value provided to the callback indicates whether any cookies were removed.
-     * You can pass {@code null} as the callback if you don't need to know when the operation
-     * completes or whether any cookies were removed, and in this case it is safe to call the
-     * method from a thread without a Looper.
-     * @param callback a callback which is executed when the cookies have been removed
-     */
-    public abstract void removeAllCookies(@Nullable ValueCallback<Boolean> callback);
-    /**
-     * Gets whether there are stored cookies.
-     *
-     * @return {@code true} if there are stored cookies
-     */
-    public abstract boolean hasCookies();
-    /**
-     * Removes all expired cookies.
-     * @deprecated The WebView handles removing expired cookies automatically.
-     */
-    @Deprecated
-    public abstract void removeExpiredCookie();
-    /**
-     * Ensures all cookies currently accessible through the getCookie API are
-     * written to persistent storage.
-     * This call will block the caller until it is done and may perform I/O.
-     */
-    public abstract void flush();
-    /**
-     * Gets whether the application's {@link WebView} instances send and accept
-     * cookies for file scheme URLs.
-     *
-     * @return {@code true} if {@link WebView} instances send and accept cookies for
-     *         file scheme URLs
-     */
-    // Static for backward compatibility.
-    public static boolean allowFileSchemeCookies() {
-        return getInstance().allowFileSchemeCookiesImpl();
-    }
-
-    public abstract boolean allowFileSchemeCookiesImpl();
-
-    /**
-     * Sets whether the application's {@link WebView} instances should send and accept cookies for
-     * file scheme URLs.
-     * <p>
-     * Use of cookies with file scheme URLs is potentially insecure and turned off by default. All
-     * {@code file://} URLs share all their cookies, which may lead to leaking private app cookies
-     * (ex. any malicious file can access cookies previously set by other (trusted) files).
-     * <p class="note">
-     * Loading content via {@code file://} URLs is generally discouraged. See the note in
-     * {@link WebSettings#setAllowFileAccess}.
-     * Using <a href="{@docRoot}reference/androidx/webkit/WebViewAssetLoader.html">
-     * androidx.webkit.WebViewAssetLoader</a> to load files over {@code http(s)://} URLs allows
-     * the standard web security model to be used for setting and sharing cookies for local files.
-     * <p>
-     * Note that calls to this method will have no effect if made after calling other
-     * {@link CookieManager} APIs.
-     *
-     * @deprecated This setting is not secure, please use
-     *             <a href="{@docRoot}reference/androidx/webkit/WebViewAssetLoader.html">
-     *             androidx.webkit.WebViewAssetLoader</a> instead.
-     */
-    // Static for backward compatibility.
-    @Deprecated
-    public static void setAcceptFileSchemeCookies(boolean accept) {
-        getInstance().setAcceptFileSchemeCookiesImpl(accept);
-    }
-
-    public abstract void setAcceptFileSchemeCookiesImpl(boolean accept);
-}

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/core/net/Uri.kt

@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@file:Suppress("NOTHING_TO_INLINE") // Aliases to public API.
-
-package androidx.core.net
-
-import android.net.Uri
-import java.io.File
-
-/**
- * Creates a Uri from the given encoded URI string.
- *
- * @see Uri.parse
- */
-public inline fun String.toUri(): Uri = Uri.parse(this)
-
-/**
- * Creates a Uri from the given file.
- *
- * @see Uri.fromFile
- */
-public inline fun File.toUri(): Uri = Uri.fromFile(this)
-
-/**
- * Creates a [File] from the given [Uri]. Note that this will throw an
- * [IllegalArgumentException] when invoked on a [Uri] that lacks `file` scheme.
- */
-public fun Uri.toFile(): File {
-    require(scheme == "file") { "Uri lacks 'file' scheme: $this" }
-    return File(requireNotNull(path) { "Uri path is null: $this" })
-}

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,61 +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 {
-    // reference: https://android.googlesource.com/platform/frameworks/support/+/996971f962fcd554339a7cb2859cef9ca89dbcb7/preference/preference/src/main/java/androidx/preference/MultiSelectListPreference.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 MultiSelectListPreference(Context context) {
-        super(context);
-    }
-
-    public void setEntries(CharSequence[] entries) {
-        this.entries = entries;
-    }
-
-    public CharSequence[] getEntries() {
-        return entries;
-    }
-
-    public void setEntryValues(CharSequence[] entryValues) {
-        this.entryValues = entryValues;
-    }
-
-    public CharSequence[] getEntryValues() {
-        return entryValues;
-    }
-
-    @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<String>";
-    }
-}

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

@@ -1,157 +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;
-import java.util.Set;
-
-/**
- * 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 boolean isVisible;
-    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;
-    }
-
-    public void setVisible(boolean visible) {
-        isVisible = visible;
-    }
-
-    public boolean getVisible() {
-        return isVisible;
-    }
-
-    /** 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 */
-    @SuppressWarnings("unchecked")
-    public Object getCurrentValue() {
-        switch (getDefaultValueType()) {
-            case "String":
-                return sharedPreferences.getString(key, (String)defaultValue);
-            case "Boolean":
-                return sharedPreferences.getBoolean(key, (Boolean)defaultValue);
-            case "Set<String>":
-                return sharedPreferences.getStringSet(key, (Set<String>)defaultValue);
-            default:
-                throw new RuntimeException("Unsupported type");
-        }
-    }
-
-    /** Tachidesk specific API */
-    @SuppressWarnings("unchecked")
-    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;
-            case "Set<String>":
-                sharedPreferences.edit().putStringSet(key, (Set<String>)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,50 +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);
-        setDefaultValue(false);
-    }
-
-    @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/app/cash/quickjs/QuickJs.java

@@ -1,99 +0,0 @@
-package app.cash.quickjs;
-
-import org.graalvm.polyglot.*;
-
-import java.io.Closeable;
-import java.math.BigInteger;
-import java.util.Arrays;
-
-public final class QuickJs implements Closeable {
-    private Context context;
-
-    public static QuickJs create() {
-        return new QuickJs();
-    }
-
-    public QuickJs() {
-        this.context = Context
-                .newBuilder("js")
-                .allowHostAccess(HostAccess.ALL)
-                .allowPolyglotAccess(PolyglotAccess.NONE)
-                .allowHostClassLoading(false)
-                .build();
-        context.enter();
-    }
-
-    public Object evaluate(String script, String ignoredFileName) {
-        return this.evaluate(script);
-    }
-
-    public Object evaluate(String script) {
-        try {
-            Value value = context.eval("js", script);
-            return translateType(value);
-        } catch (Exception exception) {
-            throw new QuickJsException(exception.getMessage(), exception);
-        }
-    }
-
-    private Object translateType(Value obj) {
-        if (obj.isBoolean()) {
-            return obj.asBoolean();
-        } else if (obj.hasArrayElements()) {
-            if (obj.getArraySize() == 0) {
-                return new int[0];
-            } else {
-                Value element = obj.getArrayElement(0);
-                if (element.isBoolean()) {
-                    return obj.as(boolean[].class);
-                } else if (element.isNumber()) {
-                    if (element.fitsInInt()) {
-                        return obj.as(int[].class);
-                    } else if (element.fitsInBigInteger()) {
-                        return Arrays.stream(obj.as(BigInteger[].class)).map(BigInteger::longValue).toArray();
-                    } else {
-                        return obj.as(double[].class);
-                    }
-                } else if (element.isHostObject()) {
-                    return obj.as(Object[].class);
-                } else if (element.isString()) {
-                    return obj.as(String[].class);
-                }
-            }
-        } else if (obj.isNumber()) {
-            if (obj.fitsInInt()) {
-                return obj.asInt();
-            } else if (obj.fitsInBigInteger()) {
-                return obj.asBigInteger().longValue();
-            } else {
-                return obj.asDouble();
-            }
-        } else if (obj.isHostObject()) {
-            return obj.asHostObject();
-        } else if (obj.isString()) {
-            return obj.asString();
-        }
-        return obj;
-    }
-
-    public byte[] compile(String sourceCode, String ignoredFileName) {
-        return sourceCode.getBytes();
-    }
-
-    public Object execute(byte[] bytecode) {
-        return this.evaluate(new String(bytecode));
-    }
-
-    public <T> void set(String name, Class<T> ignoredType, T object) {
-        context.getBindings("js").putMember(name, object);
-    }
-
-    @Override
-    public void close() {
-        if (this.context != null) {
-            this.context.leave();
-            this.context.close();
-            this.context = null;
-        }
-    }
-}

AndroidCompat/src/main/java/app/cash/quickjs/QuickJsException.java

@@ -1,7 +0,0 @@
-package app.cash.quickjs;
-
-public final class QuickJsException extends RuntimeException {
-    public QuickJsException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}

AndroidCompat/src/main/java/com/android/internal/util/XmlUtils.java

@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 package com.android.internal.util;
-
 import android.graphics.Bitmap;
-import android.graphics.Bitmap.CompressFormat;
 import android.graphics.BitmapFactory;
+import android.graphics.Bitmap.CompressFormat;
 import android.net.Uri;
 import android.text.TextUtils;
 import android.util.ArrayMap;
@@ -26,14 +25,19 @@ import android.util.Xml;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlSerializer;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.ProtocolException;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 /** {@hide} */
 public class XmlUtils {
     private static final String STRING_ARRAY_SEPARATOR = ":";
@@ -1392,9 +1396,9 @@ public class XmlUtils {
             } else if (tagName.equals("long")) {
                 return Long.valueOf(parser.getAttributeValue(null, "value"));
             } else if (tagName.equals("float")) {
-                return Float.valueOf(parser.getAttributeValue(null, "value"));
+                return new Float(parser.getAttributeValue(null, "value"));
             } else if (tagName.equals("double")) {
-                return Double.valueOf(parser.getAttributeValue(null, "value"));
+                return new Double(parser.getAttributeValue(null, "value"));
             } else if (tagName.equals("boolean")) {
                 return Boolean.valueOf(parser.getAttributeValue(null, "value"));
             } else {

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/dalvik/system/BaseDexClassLoader.java

@@ -17,7 +17,7 @@ package dalvik.system;
 
 import org.jetbrains.annotations.Nullable;
 import xyz.nulldev.androidcompat.pm.PackageController;
-import xyz.nulldev.androidcompat.util.KoinGlobalHelper;
+import xyz.nulldev.androidcompat.util.KodeinGlobalHelper;
 
 import java.io.File;
 import java.io.IOException;
@@ -33,7 +33,7 @@ import java.util.Enumeration;
  * {@link ClassLoader} implementations.
  */
 public class BaseDexClassLoader extends ClassLoader {
-    private PackageController controller = KoinGlobalHelper.instance(PackageController.class);
+    private PackageController controller = KodeinGlobalHelper.instance(PackageController.class);
 
     private final URLClassLoader realClassloader;
 

AndroidCompat/src/main/java/io/requery/android/database/sqlite/RequerySQLiteOpenHelperFactory.kt

@@ -5,4 +5,4 @@ import android.arch.persistence.db.framework.FrameworkSQLiteOpenHelperFactory
 
 class RequerySQLiteOpenHelperFactory {
     fun create(configuration: SupportSQLiteOpenHelper.Configuration) = FrameworkSQLiteOpenHelperFactory().create(configuration)
-}
+}

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

@@ -1,14 +1,17 @@
 package xyz.nulldev.androidcompat
 
 import android.app.Application
-import org.koin.mp.KoinPlatformTools
+import org.kodein.di.DI
+import org.kodein.di.conf.global
+import org.kodein.di.instance
 import xyz.nulldev.androidcompat.androidimpl.CustomContext
 
 class AndroidCompat {
-    val context: CustomContext by KoinPlatformTools.defaultContext().get().inject()
+
+    val context: CustomContext by DI.global.instance()
 
     fun startApp(application: Application) {
         application.attach(context)
         application.onCreate()
     }
-}
+}

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

@@ -1,5 +1,8 @@
 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
@@ -9,18 +12,19 @@ import xyz.nulldev.ts.config.GlobalConfigManager
  * Initializes the Android compatibility module
  */
 class AndroidCompatInitializer {
+
+    val modApplier by lazy { ModApplier() }
+
     fun init() {
-        // Register config modules
+        modApplier.apply()
+
+        DI.global.addImport(AndroidCompatModule().create())
+
+        //Register config modules
         GlobalConfigManager.registerModules(
             FilesConfigModule.register(GlobalConfigManager.config),
             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",
+            SystemConfigModule.register(GlobalConfigManager.config)
         )
     }
 }

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

@@ -1,8 +1,11 @@
 package xyz.nulldev.androidcompat
 
 import android.content.Context
-import org.koin.core.module.Module
-import org.koin.dsl.module
+import org.kodein.di.DI
+import org.kodein.di.bind
+import org.kodein.di.conf.global
+import org.kodein.di.instance
+import org.kodein.di.singleton
 import xyz.nulldev.androidcompat.androidimpl.CustomContext
 import xyz.nulldev.androidcompat.androidimpl.FakePackageManager
 import xyz.nulldev.androidcompat.info.ApplicationInfoImpl
@@ -14,19 +17,23 @@ import xyz.nulldev.androidcompat.service.ServiceSupport
  * AndroidCompatModule
  */
 
-fun androidCompatModule(): Module =
-    module {
-        single { AndroidFiles() }
+class AndroidCompatModule {
+    fun create() = DI.Module("AndroidCompat") {
+        bind<AndroidFiles>() with singleton { AndroidFiles() }
 
-        single { ApplicationInfoImpl(get()) }
+        bind<ApplicationInfoImpl>() with singleton { ApplicationInfoImpl() }
 
-        single { ServiceSupport() }
+        bind<ServiceSupport>() with singleton { ServiceSupport() }
 
-        single { FakePackageManager() }
+        bind<FakePackageManager>() with singleton { FakePackageManager() }
 
-        single { PackageController() }
+        bind<PackageController>() with singleton { PackageController() }
 
-        single { CustomContext() }
-
-        single<Context> { get<CustomContext>() }
+        //Context
+        bind<CustomContext>() with singleton { CustomContext() }
+        bind<Context>() with singleton {
+            val context: Context by DI.global.instance<CustomContext>()
+            context
+        }
     }
+}

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

@@ -32,14 +32,15 @@ import android.os.*;
 import android.view.Display;
 import android.view.DisplayAdjustments;
 import org.jetbrains.annotations.NotNull;
-import org.koin.core.Koin;
+import org.jetbrains.annotations.Nullable;
+import org.kodein.di.*;
 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.KoinGlobalHelper;
+import xyz.nulldev.androidcompat.util.KodeinGlobalHelper;
 
 import java.io.*;
 import java.util.HashMap;
@@ -49,26 +50,28 @@ import java.util.Map;
 /**
  * Custom context implementation.
  *
+ * TODO Deal with packagemanager for extension sources
  */
-public class CustomContext extends Context {
-    private final Koin koin;
+public class CustomContext extends Context implements DIAware {
+    private DI kodein;
     public CustomContext() {
-        this(KoinGlobalHelper.koin());
+        this(KodeinGlobalHelper.kodein());
     }
 
-    public CustomContext(Koin koin) {
-        this.koin = koin;
+    public CustomContext(DI kodein) {
+        this.kodein = kodein;
 
         //Init configs
-        androidFiles = KoinGlobalHelper.instance(AndroidFiles.class, getDi());
-        applicationInfo = KoinGlobalHelper.instance(ApplicationInfoImpl.class, getDi());
-        serviceSupport = KoinGlobalHelper.instance(ServiceSupport.class, getDi());
-        fakePackageManager = KoinGlobalHelper.instance(FakePackageManager.class, getDi());
+        androidFiles = KodeinGlobalHelper.instance(AndroidFiles.class, getDi());
+        applicationInfo = KodeinGlobalHelper.instance(ApplicationInfoImpl.class, getDi());
+        serviceSupport = KodeinGlobalHelper.instance(ServiceSupport.class, getDi());
+        fakePackageManager = KodeinGlobalHelper.instance(FakePackageManager.class, getDi());
     }
 
     @NotNull
-    public Koin getDi() {
-        return koin;
+    @Override
+    public DI getDi() {
+        return kodein;
     }
 
     private AndroidFiles androidFiles;
@@ -162,22 +165,23 @@ public class CustomContext extends Context {
     /** 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
@@ -187,8 +191,8 @@ public class CustomContext extends Context {
 
     @Override
     public boolean deleteSharedPreferences(String name) {
-        JavaSharedPreferences item = (JavaSharedPreferences) prefs.remove(name);
-        return item.deleteAll();
+        prefs.remove(name);
+        return sharedPrefsFileFromString(name).delete();
     }
 
     @Override
@@ -717,5 +721,18 @@ public class CustomContext extends Context {
     public boolean isCredentialProtectedStorage() {
         return false;
     }
+
+    @NotNull
+    @Override
+    public DIContext<?> getDiContext() {
+        return getDi().getDiContext();
+    }
+
+    @Nullable
+    @Override
+    public DITrigger getDiTrigger() {
+        return null;
+    }
 }
 
+

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

@@ -16,14 +16,14 @@ import android.os.UserHandle;
 import kotlin.NotImplementedError;
 import xyz.nulldev.androidcompat.pm.InstalledPackage;
 import xyz.nulldev.androidcompat.pm.PackageController;
-import xyz.nulldev.androidcompat.util.KoinGlobalHelper;
+import xyz.nulldev.androidcompat.util.KodeinGlobalHelper;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
 public class FakePackageManager extends PackageManager {
-    private PackageController controller = KoinGlobalHelper.instance(PackageController.class);
+    private PackageController controller = KodeinGlobalHelper.instance(PackageController.class);
 
     @Override
     public PackageInfo getPackageInfo(String packageName, int flags) throws NameNotFoundException {

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,20 +1,18 @@
 package xyz.nulldev.androidcompat.config
 
 import com.typesafe.config.Config
-import io.github.config4k.getValue
 import xyz.nulldev.ts.config.ConfigModule
 
 /**
  * Application info config.
  */
 
-class ApplicationInfoConfigModule(
-    getConfig: () -> Config,
-) : ConfigModule(getConfig) {
-    val packageName: String by getConfig()
-    val debug: Boolean by getConfig()
+class ApplicationInfoConfigModule(config: Config) : ConfigModule(config) {
+    val packageName = config.getString("packageName")!!
+    val debug = config.getBoolean("debug")
 
     companion object {
-        fun register(config: Config) = ApplicationInfoConfigModule { config.getConfig("android.app") }
+        fun register(config: Config)
+                = ApplicationInfoConfigModule(config.getConfig("android.app"))
     }
 }

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

@@ -1,35 +1,33 @@
 package xyz.nulldev.androidcompat.config
 
 import com.typesafe.config.Config
-import io.github.config4k.getValue
 import xyz.nulldev.ts.config.ConfigModule
 
 /**
  * Files configuration modules. Specifies where to store the Android files.
  */
 
-class FilesConfigModule(
-    getConfig: () -> Config,
-) : ConfigModule(getConfig) {
-    val dataDir: String by getConfig()
-    val filesDir: String by getConfig()
-    val noBackupFilesDir: String by getConfig()
-    val externalFilesDirs: MutableList<String> by getConfig()
-    val obbDirs: MutableList<String> by getConfig()
-    val cacheDir: String by getConfig()
-    val codeCacheDir: String by getConfig()
-    val externalCacheDirs: MutableList<String> by getConfig()
-    val externalMediaDirs: MutableList<String> by getConfig()
-    val rootDir: String by getConfig()
-    val externalStorageDir: String by getConfig()
-    val downloadCacheDir: String by getConfig()
-    val databasesDir: String by getConfig()
+class FilesConfigModule(config: Config) : ConfigModule(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 getConfig()
+    val prefsDir = config.getString("prefsDir")!!
 
-    val packageDir: String by getConfig()
+    val packageDir = config.getString("packageDir")!!
 
     companion object {
-        fun register(config: Config) = FilesConfigModule { config.getConfig("android.files") }
+        fun register(config: Config)
+                = FilesConfigModule(config.getConfig("android.files"))
     }
-}
+}

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

@@ -1,27 +1,21 @@
 package xyz.nulldev.androidcompat.config
 
 import com.typesafe.config.Config
-import io.github.config4k.getValue
 import xyz.nulldev.ts.config.ConfigModule
 
-class SystemConfigModule(
-    val getConfig: () -> Config,
-) : ConfigModule(getConfig) {
-    val isDebuggable: Boolean by getConfig()
+class SystemConfigModule(val config: Config) : ConfigModule(config) {
+    val isDebuggable = config.getBoolean("isDebuggable")
 
     val propertyPrefix = "properties."
 
-    fun getStringProperty(property: String) = getConfig().getString("$propertyPrefix$property")!!
-
-    fun getIntProperty(property: String) = getConfig().getInt("$propertyPrefix$property")
-
-    fun getLongProperty(property: String) = getConfig().getLong("$propertyPrefix$property")
-
-    fun getBooleanProperty(property: String) = getConfig().getBoolean("$propertyPrefix$property")
-
-    fun hasProperty(property: String) = getConfig().hasPath("$propertyPrefix$property")
+    fun getStringProperty(property: String) = config.getString("$propertyPrefix$property")!!
+    fun getIntProperty(property: String) = config.getInt("$propertyPrefix$property")
+    fun getLongProperty(property: String) = config.getLong("$propertyPrefix$property")
+    fun getBooleanProperty(property: String) = config.getBoolean("$propertyPrefix$property")
+    fun hasProperty(property: String) = config.hasPath("$propertyPrefix$property")
 
     companion object {
-        fun register(config: Config) = SystemConfigModule { config.getConfig("android.system") }
+        fun register(config: Config)
+                = SystemConfigModule(config.getConfig("android.system"))
     }
 }

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/info/ApplicationInfoImpl.kt

@@ -1,12 +1,16 @@
 package xyz.nulldev.androidcompat.info
 
 import android.content.pm.ApplicationInfo
+import org.kodein.di.DI
+import org.kodein.di.DIAware
+import org.kodein.di.conf.global
+import org.kodein.di.instance
 import xyz.nulldev.androidcompat.config.ApplicationInfoConfigModule
 import xyz.nulldev.ts.config.ConfigManager
 
-class ApplicationInfoImpl(
-    private val configManager: ConfigManager,
-) : ApplicationInfo() {
+class ApplicationInfoImpl(override val di: DI = DI.global) : ApplicationInfo(), DIAware {
+    val configManager: ConfigManager by di.instance()
+
     val appInfoConfig: ApplicationInfoConfigModule
         get() = configManager.module()
 

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/io/AndroidFiles.kt

@@ -8,9 +8,7 @@ import java.io.File
 /**
  * Android file constants.
  */
-class AndroidFiles(
-    val configManager: ConfigManager = GlobalConfigManager,
-) {
+class AndroidFiles(val configManager: ConfigManager = GlobalConfigManager) {
     val filesConfig: FilesConfigModule
         get() = configManager.module()
 
@@ -32,8 +30,9 @@ class AndroidFiles(
 
     val packagesDir: File get() = registerFile(filesConfig.packageDir)
 
-    fun registerFile(file: String): File =
-        File(file).apply {
+    fun registerFile(file: String): File {
+        return File(file).apply {
             mkdirs()
         }
+    }
 }

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

@@ -1,280 +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.PropertiesSettings
-import com.russhwolf.settings.Settings
-import com.russhwolf.settings.serialization.decodeValue
-import com.russhwolf.settings.serialization.decodeValueOrNull
-import com.russhwolf.settings.serialization.encodeValue
-import io.github.oshai.kotlinlogging.KotlinLogging
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.SerializationException
-import kotlinx.serialization.builtins.SetSerializer
-import kotlinx.serialization.builtins.serializer
-import xyz.nulldev.androidcompat.util.SafePath
-import xyz.nulldev.ts.config.ApplicationRootDir
-import java.util.Properties
-import kotlin.io.path.Path
-import kotlin.io.path.createParentDirectories
-import kotlin.io.path.deleteIfExists
-import kotlin.io.path.exists
-import kotlin.io.path.inputStream
-import kotlin.io.path.outputStream
-
-@OptIn(ExperimentalSerializationApi::class, ExperimentalSettingsApi::class)
-class JavaSharedPreferences(
-    key: String,
-) : SharedPreferences {
-    companion object {
-        private val logger = KotlinLogging.logger {}
-    }
-
-    private val file =
-        Path(
-            ApplicationRootDir,
-            "settings",
-            "${SafePath.buildValidFilename(key)}.xml",
-        )
-    private val properties =
-        Properties().also { properties ->
-            try {
-                if (file.exists()) {
-                    file.inputStream().use { properties.loadFromXML(it) }
-                }
-            } catch (e: Exception) {
-                logger.error(e) { "Error loading settings from $key" }
-            }
-        }
-    private val preferences =
-        PropertiesSettings(
-            properties,
-            onModify = { properties ->
-                try {
-                    if (properties.isEmpty) {
-                        file.deleteIfExists()
-                    } else {
-                        file.createParentDirectories()
-                        file.outputStream().use {
-                            properties.storeToXML(it, null)
-                        }
-                    }
-                } catch (e: Exception) {
-                    logger.error(e) { "Error saving settings in $key" }
-                }
-            },
-        )
-    private val listeners = mutableMapOf<SharedPreferences.OnSharedPreferenceChangeListener, (String) -> Unit>()
-
-    // TODO: 2021-05-29 Need to find a way to get this working with all pref types
-    override fun getAll(): MutableMap<String, *> = preferences.keys.associateWith { preferences.getStringOrNull(it) }.toMutableMap()
-
-    override fun getString(
-        key: String,
-        defValue: String?,
-    ): String? =
-        if (defValue != null) {
-            preferences.getString(key, defValue)
-        } else {
-            preferences.getStringOrNull(key)
-        }
-
-    override fun getStringSet(
-        key: String,
-        defValues: Set<String>?,
-    ): Set<String>? {
-        try {
-            return if (defValues != null) {
-                preferences.decodeValue(SetSerializer(String.serializer()), key, defValues)
-            } else {
-                preferences.decodeValueOrNull(SetSerializer(String.serializer()), key)
-            }
-        } catch (e: SerializationException) {
-            throw ClassCastException("$key was not a StringSet")
-        }
-    }
-
-    override fun getInt(
-        key: String,
-        defValue: Int,
-    ): Int = preferences.getInt(key, defValue)
-
-    override fun getLong(
-        key: String,
-        defValue: Long,
-    ): Long = preferences.getLong(key, defValue)
-
-    override fun getFloat(
-        key: String,
-        defValue: Float,
-    ): Float = preferences.getFloat(key, defValue)
-
-    override fun getBoolean(
-        key: String,
-        defValue: Boolean,
-    ): Boolean = preferences.getBoolean(key, defValue)
-
-    override fun contains(key: String): Boolean = key in preferences.keys
-
-    override fun edit(): SharedPreferences.Editor =
-        Editor(preferences) { key ->
-            listeners.forEach { (_, listener) ->
-                listener(key)
-            }
-        }
-
-    class Editor(
-        private val preferences: Settings,
-        private val notify: (String) -> Unit,
-    ) : SharedPreferences.Editor {
-        private val actions = mutableListOf<Action>()
-
-        private sealed class Action {
-            data class Add(
-                val key: String,
-                val value: Any,
-            ) : Action()
-
-            data class Remove(
-                val key: String,
-            ) : Action()
-
-            data object Clear : Action()
-        }
-
-        override fun putString(
-            key: String,
-            value: String?,
-        ): SharedPreferences.Editor {
-            if (value != null) {
-                actions += Action.Add(key, value)
-            } else {
-                actions += Action.Remove(key)
-            }
-            return this
-        }
-
-        override fun putStringSet(
-            key: String,
-            values: MutableSet<String>?,
-        ): SharedPreferences.Editor {
-            if (values != null) {
-                actions += Action.Add(key, values)
-            } else {
-                actions += Action.Remove(key)
-            }
-            return this
-        }
-
-        override fun putInt(
-            key: String,
-            value: Int,
-        ): SharedPreferences.Editor {
-            actions += Action.Add(key, value)
-            return this
-        }
-
-        override fun putLong(
-            key: String,
-            value: Long,
-        ): SharedPreferences.Editor {
-            actions += Action.Add(key, value)
-            return this
-        }
-
-        override fun putFloat(
-            key: String,
-            value: Float,
-        ): SharedPreferences.Editor {
-            actions += Action.Add(key, value)
-            return this
-        }
-
-        override fun putBoolean(
-            key: String,
-            value: Boolean,
-        ): SharedPreferences.Editor {
-            actions += Action.Add(key, value)
-            return this
-        }
-
-        override fun remove(key: String): SharedPreferences.Editor {
-            actions += Action.Remove(key)
-            return this
-        }
-
-        override fun clear(): SharedPreferences.Editor {
-            actions.add(Action.Clear)
-            return this
-        }
-
-        override fun commit(): Boolean {
-            addToPreferences()
-            return true
-        }
-
-        override fun apply() {
-            addToPreferences()
-        }
-
-        private fun addToPreferences() {
-            actions.forEach {
-                @Suppress("UNCHECKED_CAST")
-                when (it) {
-                    is Action.Add -> {
-                        when (val value = it.value) {
-                            is Set<*> -> preferences.encodeValue(SetSerializer(String.serializer()), it.key, value as Set<String>)
-                            is String -> preferences.putString(it.key, value)
-                            is Int -> preferences.putInt(it.key, value)
-                            is Long -> preferences.putLong(it.key, value)
-                            is Float -> preferences.putFloat(it.key, value)
-                            is Double -> preferences.putDouble(it.key, value)
-                            is Boolean -> preferences.putBoolean(it.key, value)
-                        }
-                        notify(it.key)
-                    }
-                    is Action.Remove -> {
-                        preferences.remove(it.key)
-                        /**
-                         * Set<String> are stored like
-                         * key.0 = value1
-                         * key.1 = value2
-                         * key.size = 2
-                         */
-                        preferences.keys.forEach { key ->
-                            if (key.startsWith(it.key + ".")) {
-                                preferences.remove(key)
-                            }
-                        }
-
-                        notify(it.key)
-                    }
-                    Action.Clear -> preferences.clear()
-                }
-            }
-        }
-    }
-
-    override fun registerOnSharedPreferenceChangeListener(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
-        val javaListener: (String) -> Unit = {
-            listener.onSharedPreferenceChanged(this, it)
-        }
-        listeners[listener] = javaListener
-    }
-
-    override fun unregisterOnSharedPreferenceChangeListener(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
-        listeners.remove(listener)
-    }
-
-    fun deleteAll(): Boolean {
-        preferences.clear()
-        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

@@ -14,58 +14,44 @@ import java.io.File
 import javax.imageio.ImageIO
 import javax.xml.parsers.DocumentBuilderFactory
 
-data class InstalledPackage(
-    val root: File,
-) {
+
+
+data class InstalledPackage(val root: File) {
     val apk = File(root, "package.apk")
     val jar = File(root, "translated.jar")
     val icon = File(root, "icon.png")
 
     val info: PackageInfo
-        get() =
-            ApkParsers.getMetaInfo(apk).toPackageInfo(apk).also {
-                val parsed = ApkFile(apk)
-                val dbFactory = DocumentBuilderFactory.newInstance()
-                val dBuilder = dbFactory.newDocumentBuilder()
-                val doc =
-                    parsed.manifestXml.byteInputStream().use {
-                        dBuilder.parse(it)
-                    }
-
-                it.applicationInfo.metaData =
-                    Bundle().apply {
-                        val appTag = doc.getElementsByTagName("application").item(0)
-
-                        appTag
-                            ?.childNodes
-                            ?.toList()
-                            ?.filter {
-                                it.nodeType == Node.ELEMENT_NODE
-                            }?.map {
-                                it as Element
-                            }?.filter {
-                                it.tagName == "meta-data"
-                            }?.map {
-                                putString(
-                                    it.attributes.getNamedItem("android:name").nodeValue,
-                                    it.attributes.getNamedItem("android:value").nodeValue,
-                                )
-                            }
-                    }
-
-                it.signatures =
-                    (
-                        parsed.apkSingers.flatMap { it.certificateMetas }
-                        // + parsed.apkV2Singers.flatMap { it.certificateMetas }
-                    ) // Blocked by: https://github.com/hsiafan/apk-parser/issues/72
-                        .map { Signature(it.data) }
-                        .toTypedArray()
+        get() = ApkParsers.getMetaInfo(apk).toPackageInfo(root, apk).also {
+            val parsed = ApkFile(apk)
+            val dbFactory = DocumentBuilderFactory.newInstance()
+            val dBuilder = dbFactory.newDocumentBuilder()
+            val doc = parsed.manifestXml.byteInputStream().use {
+                dBuilder.parse(it)
             }
 
+            it.applicationInfo.metaData = Bundle().apply {
+                val appTag = doc.getElementsByTagName("application").item(0)
+
+                appTag?.childNodes?.toList()?.filter {
+                    it.nodeType == Node.ELEMENT_NODE
+                }?.map {
+                    it as Element
+                }?.filter {
+                    it.tagName == "meta-data"
+                }?.map {
+                    putString(it.attributes.getNamedItem("android:name").nodeValue,
+                            it.attributes.getNamedItem("android:value").nodeValue)
+                }
+            }
+
+            it.signatures = (parsed.apkSingers.flatMap { it.certificateMetas }
+                    /*+ parsed.apkV2Singers.flatMap { it.certificateMetas }*/) // Blocked by: https://github.com/hsiafan/apk-parser/issues/72
+                    .map { Signature(it.data) }.toTypedArray()
+        }
+
     fun verify(): Boolean {
-        val res =
-            ApkVerifier
-                .Builder(apk)
+        val res = ApkVerifier.Builder(apk)
                 .build()
                 .verify()
 
@@ -76,18 +62,14 @@ data class InstalledPackage(
         try {
             val icons = ApkFile(apk).allIcons
 
-            val read =
-                icons
-                    .filter { it.isFile }
-                    .map {
-                        it.data.inputStream().use {
-                            ImageIO.read(it)
-                        }
-                    }.sortedByDescending { it.width * it.height }
-                    .firstOrNull() ?: return
+            val read = icons.filter { it.isFile }.map {
+                it.data.inputStream().use {
+                    ImageIO.read(it)
+                }
+            }.sortedByDescending { it.width * it.height }.firstOrNull() ?: return
 
             ImageIO.write(read, "png", icon)
-        } catch (e: Exception) {
+        } catch(e: Exception) {
             icon.delete()
         }
     }
@@ -95,20 +77,17 @@ data class InstalledPackage(
     fun writeJar() {
         try {
             Dex2jar.from(apk).to(jar.toPath())
-        } catch (e: Exception) {
+        } catch(e: Exception) {
             jar.delete()
         }
     }
 
-    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/PackageController.kt

@@ -1,12 +1,14 @@
 package xyz.nulldev.androidcompat.pm
 
 import net.dongliu.apk.parser.ApkParsers
-import org.koin.mp.KoinPlatformTools
+import org.kodein.di.DI
+import org.kodein.di.conf.global
+import org.kodein.di.instance
 import xyz.nulldev.androidcompat.io.AndroidFiles
 import java.io.File
 
 class PackageController {
-    private val androidFiles: AndroidFiles by KoinPlatformTools.defaultContext().get().inject()
+    private val androidFiles by DI.global.instance<AndroidFiles>()
     private val uninstallListeners = mutableListOf<(String) -> Unit>()
 
     fun registerUninstallListener(listener: (String) -> Unit) {
@@ -23,10 +25,7 @@ class PackageController {
         return File(androidFiles.packagesDir, pn)
     }
 
-    fun installPackage(
-        apk: File,
-        allowReinstall: Boolean,
-    ) {
+    fun installPackage(apk: File, allowReinstall: Boolean) {
         val root = findRoot(apk)
 
         if (root.exists()) {
@@ -49,24 +48,22 @@ class PackageController {
             if (!installed.jar.exists()) {
                 throw IllegalStateException("Failed to translate APK dex!")
             }
-        } catch (t: Throwable) {
+        } catch(t: Throwable) {
             root.deleteRecursively()
             throw t
         }
     }
 
-    fun listInstalled(): List<InstalledPackage> =
-        androidFiles.packagesDir
-            .listFiles()
-            .orEmpty()
-            .filter {
-                it.isDirectory
-            }.map {
-                InstalledPackage(it)
-            }
+    fun listInstalled(): List<InstalledPackage> {
+        return androidFiles.packagesDir.listFiles().orEmpty().filter {
+            it.isDirectory
+        }.map {
+            InstalledPackage(it)
+        }
+    }
 
     fun deletePackage(pack: InstalledPackage) {
-        if (!pack.root.exists()) error("Package was never installed!")
+        if(!pack.root.exists()) error("Package was never installed!")
 
         val packageName = pack.info.packageName
         pack.root.deleteRecursively()
@@ -77,15 +74,14 @@ class PackageController {
 
     fun findPackage(packageName: String): InstalledPackage? {
         val file = File(androidFiles.packagesDir, packageName)
-        return if (file.exists()) {
+        return if(file.exists())
             InstalledPackage(file)
-        } else {
+        else
             null
-        }
     }
 
     fun findJarFromApk(apkFile: File): File? {
         val pkgName = ApkParsers.getMetaInfo(apkFile).packageName
         return findPackage(pkgName)?.jar
     }
-}
+}

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

@@ -6,24 +6,22 @@ import android.content.pm.PackageInfo
 import net.dongliu.apk.parser.bean.ApkMeta
 import java.io.File
 
-fun ApkMeta.toPackageInfo(apk: File): PackageInfo =
-    PackageInfo().also {
+fun ApkMeta.toPackageInfo(root: File, apk: File): PackageInfo {
+    return PackageInfo().also {
         it.packageName = packageName
         it.versionCode = versionCode.toInt()
         it.versionName = versionName
 
-        it.reqFeatures =
-            usesFeatures
-                .map {
-                    FeatureInfo().apply {
-                        name = it.name
-                    }
-                }.toTypedArray()
-
-        it.applicationInfo =
-            ApplicationInfo().apply {
-                packageName = it.packageName
-                nonLocalizedLabel = label
-                sourceDir = apk.absolutePath
+        it.reqFeatures = usesFeatures.map {
+            FeatureInfo().apply {
+                name = it.name
             }
+        }.toTypedArray()
+
+        it.applicationInfo = ApplicationInfo().apply {
+            packageName = it.packageName
+            nonLocalizedLabel = label
+            sourceDir = apk.absolutePath
+        }
     }
+}