ci: Maintenance

Include line ending

.github/ISSUE_TEMPLATE/bug-issue.yml

@@ -1,61 +0,0 @@
-name: 🐞 Bug report
-description: Create a new bug report.
-title: 'bug: <title>'
-labels: [bug]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        # ReVanced Manager bug report
-
-        Please check for existing issues [here](https://github.com/revanced/revanced-manager/labels/bug) before creating a new one.
-  - type: textarea
-    attributes:
-      label: Bug description
-      description: |
-        - Describe your bug in detail
-        - Add steps to reproduce the bug if possible (Step 1. Download some files. Step 2. ...)
-        - Add images and videos if possible
-        - List selected patches if applicable
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Version of ReVanced Manager and version & name of application you tried to patch
-    validations:
-      required: true
-  - type: dropdown
-    attributes:
-      label: Installation type
-      options:
-        - Non-root
-        - Root
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Device logs
-      description: Export logs in ReVanced Manager settings.
-      render: shell
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Patcher logs
-      description: Export logs in "Patcher" screen.
-      render: shell
-    validations:
-      required: false
-  - type: checkboxes
-    attributes:
-      label: Acknowledgements
-      description: Your issue will be closed if you don't follow the checklist below!
-      options:
-        - label: This request is not a duplicate of an existing issue.
-          required: true
-        - label: I have chosen an appropriate title.
-          required: true
-        - label: All requested information has been provided properly.
-          required: true
-        - label: The issue is solely related to the ReVanced Manager
-          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +0,0 @@
-blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature-issue.yml

@@ -1,42 +0,0 @@
-name: ⭐ Feature request
-description: Create a new feature request.
-title: 'feat: <title>'
-labels: [feature request]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        # ReVanced Manager feature request
-
-        Please check for existing feature requests [here](https://github.com/revanced/revanced-manager/labels/bug) before creating a new one.
-  - type: textarea
-    attributes:
-      label: Feature description
-      description: Describe your feature in detail.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Motivation
-      description: Explain why the lack of it is a problem.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: In case there is something else you want to add.
-    validations:
-      required: false
-  - type: checkboxes
-    attributes:
-      label: Acknowledgements
-      description: Your issue will be closed if you don't follow the checklist below!
-      options:
-        - label: This request is not a duplicate of an existing issue.
-          required: true
-        - label: I have chosen an appropriate title.
-          required: true
-        - label: All requested information has been provided properly.
-          required: true
-        - label: The issue is solely related to the ReVanced Manager
-          required: true

.github/config.yaml

@@ -1,2 +0,0 @@
-firstPRMergeComment: >
-  ❤️ Thank you for contributing to ReVanced Manager. Join us on [Discord](https://revanced.app/discord) if you want to receive a contributor role.

.github/crowdin.yml

@@ -0,0 +1,19 @@
+project_id_env: CROWDIN_PROJECT_ID
+api_token_env: CROWDIN_PERSONAL_TOKEN
+
+preserve_hierarchy: true
+
+pull_request_title: 'chore(translation): sync translation with Crowdin'
+commit_message: 'chore(translation): sync translation with Crowdin'
+pull_request_labels: 'translation'
+
+files: [
+  {
+    source: 'app/src/res/values/strings.xml',
+    translation: 'app/src/res/values-%android_code%/strings.xml'
+  }
+  {
+    source: 'app/src/res/values/plurals.xml',
+    translation: 'app/src/res/values-%android_code%/plurals.xml'
+  }
+]

.github/workflows/crowdin.yml

@@ -0,0 +1,34 @@
+name: Crowdin
+
+on:
+  push:
+    branches: [ dev ]
+    paths:
+      - "app/src/res/values/strings.xml"
+      - ".github/workflows/crowdin.yml"
+  schedule:
+    - cron: "0 0 * * 1"
+  workflow_dispatch:
+
+
+jobs:
+  synchronize-with-crowdin:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+
+      - name: Crowdin action
+        uses: crowdin/github-action@v2
+        with:
+          config: ".github/crowdin.yml"
+          upload_sources: true
+          upload_translations: false
+          download_translations: true
+          create_pull_request: true
+          localization_branch_name: "crowdin_translations"
+          pull_request_base_branch_name: "dev"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.github/workflows/pr-build.yml

@@ -1,44 +0,0 @@
-name: Build pull request
-
-on:
-  pull_request:
-    paths:
-      - ".github/workflows/pr-build.yml"
-      - "app/**"
-      - "gradle/**"
-      - "*.properties"
-      - ".kts"
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v4
-
-      - name: Build with Gradle
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew assembleRelease --no-daemon -PnoProguard -PsignAsDebug
-
-      - name: Set env
-        run: echo "COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
-
-      - name: Add hash to APK
-        run: mv app/build/outputs/apk/release/app-release.apk revanced-manager-${{ env.COMMIT_HASH }}.apk
-
-      - name: Upload build
-        uses: actions/upload-artifact@v4
-        with:
-          name: revanced-manager
-          path: revanced-manager-${{ env.COMMIT_HASH }}.apk

.github/workflows/release-build.yml

@@ -1,57 +0,0 @@
-name: Release Build
-
-on:
-  push:
-    tags:
-      - "v*"
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-      attestations: write
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set env
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v4
-
-      - name: Build with Gradle
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew assembleRelease --no-daemon
-
-      - name: Sign APK
-        id: sign_apk
-        uses: ilharp/sign-android-release@v1
-        with:
-          releaseDir: ./app/build/outputs/apk/release/
-          signingKey: ${{ secrets.SIGNING_KEYSTORE }}
-          keyStorePassword: ${{ secrets.SIGNING_KEYSTORE_PASSWORD }}
-          keyAlias: ${{ secrets.SIGNING_KEY_ALIAS }}
-          keyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }}
-
-      - name: Add version to APK
-        run: mv ${{ steps.sign_apk.outputs.signedFile }} revanced-manager-${{ env.RELEASE_VERSION }}.apk
-
-      - name: Generate artifact attestation
-        uses: actions/attest-build-provenance@v1
-        with:
-          subject-path: revanced-manager-${{ env.RELEASE_VERSION }}.apk
-
-      - name: Publish release APK
-        uses: "marvinpinto/action-automatic-releases@latest"
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          prerelease: false
-          files: revanced-manager-${{ env.RELEASE_VERSION }}.apk

.github/workflows/release.yml

@@ -0,0 +1,44 @@
+name: Android Release
+
+on:
+  push:
+    branches:
+      - dev
+  pull_request:
+    branches: 
+      - dev
+
+jobs:
+  build:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: gradle
+
+    - name: Build with Gradle
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: ./gradlew assembleRelease --no-daemon
+
+    - name: Sign APK
+      id: sign_apk
+      uses: r0adkll/sign-android-release@v1
+      with:
+        releaseDirectory: ./app/build/outputs/apk/release/
+        signingKeyBase64: ${{ secrets.TEMP_SIGNING_KEYSTORE }}
+        keyStorePassword: ${{ secrets.TEMP_SIGNING_KEYSTORE_PASSWORD }}
+        alias: ${{ vars.TEMP_SIGNING_KEY_ALIAS }}
+        keyPassword: ${{ secrets.TEMP_SIGNING_KEY_PASSWORD }}
+
+    - name: Upload APK
+      uses: actions/upload-artifact@v3
+      with:
+        name: manager
+        path: ${{steps.sign_apk.outputs.signedReleaseFile}}

.github/workflows/update-documentation.yml

@@ -1,19 +0,0 @@
-name: Update documentation
-
-on:
-  push:
-    paths:
-      - docs/**
-
-jobs:
-  trigger:
-    runs-on: ubuntu-latest
-    name: Dispatch event to documentation repository
-    if: github.ref == 'refs/heads/main'
-    steps:
-      - uses: peter-evans/repository-dispatch@v3
-        with:
-          token: ${{ secrets.DOCUMENTATION_REPO_ACCESS_TOKEN  }}
-          repository: revanced/revanced-documentation
-          event-type: update-documentation
-          client-payload: '{"repo": "${{ github.event.repository.name }}", "ref": "${{ github.ref }}"}'

.gitignore

@@ -1,7 +1,15 @@
 *.iml
 .gradle
 /local.properties
-/.idea
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+/.idea/deploymentTargetDropDown.xml
+/.idea/misc.xml
+/.idea/gradle.xml
 .DS_Store
 /build
 /captures
@@ -9,4 +17,3 @@
 .cxx
 local.properties
 
-.kotlin/

.idea/.gitignore

@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml

.idea/.name

@@ -0,0 +1 @@
+ReVanced Manager

.idea/compiler.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="17" />
+  </component>
+</project>

.idea/discord.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DiscordProjectSettings">
+    <option name="show" value="PROJECT_FILES" />
+    <option name="description" value="" />
+  </component>
+</project>

.idea/gradle.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="zulu-17" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
+        <option name="resolveExternalAnnotations" value="false" />
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,37 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+  </profile>
+</component>

.idea/kotlinc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.8.21" />
+  </component>
+</project>

.idea/misc.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17_PREVIEW" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

LICENSE

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -1,8 +1,8 @@
 # ReVanced Manager (Compose Rewrite)
 
-[![GitHub license](https://img.shields.io/github/license/revanced/revanced-manager)](../../blob/main/LICENSE)
-[![GitHub last commit](https://img.shields.io/github/last-commit/revanced/revanced-manager/compose-dev)](https://github.com/ReVanced/revanced-manager/commits/compose-dev)
-[![GitHub commit activity](https://img.shields.io/github/commit-activity/w/revanced/revanced-manager/compose-dev)](https://github.com/ReVanced/revanced-manager/commits/compose-dev)
+[![GitHub license](https://img.shields.io/github/license/revanced/revanced-manager-compose)](/LICENSE)
+[![GitHub last commit](https://img.shields.io/github/last-commit/revanced/revanced-manager-compose)](https://github.com/ReVanced/revanced-manager-compose/commits)
+[![GitHub commit activity](https://img.shields.io/github/commit-activity/w/revanced/revanced-manager-compose)](https://github.com/ReVanced/revanced-manager-compose/commits)
 
 _(Yet another)_ rewrite of the ReVanced Manager using Kotlin and Jetpack Compose.
 
@@ -32,24 +32,3 @@ By using Material 3 and Material You, we are ensuring that the app's user interf
 * **Better performance:** Jetpack Compose uses the power of the Android framework to provide smooth and fast performance, which enhances the user experience.
 * **Modern and efficient UI development:** Jetpack Compose provides a modern and efficient way of building UI, which makes it easier for developers to create beautiful and performant user interfaces.
 
-## 🔽 Download
-
-You can obtain ReVanced Manager by downloading it from either [revanced.app/download](https://revanced.app/download) or [GitHub Releases](https://github.com/ReVanced/revanced-manager/releases)
-
-## 📝 Prerequisites
-
-For a list of prerequisites, refer to [docs/0_prerequisites.md](docs/0_prerequisites.md)
-
-## 🔴 Issues
-
-For suggestions and bug reports, open an issue [here](https://github.com/revanced/revanced-manager/issues/new/choose).
-
-## 🌐 Translation
-
-[![Crowdin](https://badges.crowdin.net/revanced/localized.svg)](https://crowdin.com/project/revanced)
-
-We're accepting translations on [Crowdin](https://translate.revanced.app)
-
-## 🛠️ Building Manager from source
-
-For instructions on how to build ReVanced Manager from source, refer to [docs/4_building.md](docs/4_building.md)

SECURITY.md

@@ -1,77 +0,0 @@
-<p align="center">
-  <picture>
-    <source
-      width="256px"
-      media="(prefers-color-scheme: dark)"
-      srcset="assets/revanced-headline/revanced-headline-vertical-dark.svg"
-    >
-    <img 
-      width="256px"
-      src="assets/revanced-headline/revanced-headline-vertical-light.svg"
-    >
-  </picture>
-  <br>
-  <a href="https://revanced.app/">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="assets/revanced-logo/revanced-logo.svg" />
-           <img height="24px" src="assets/revanced-logo/revanced-logo.svg" />
-       </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://github.com/ReVanced">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
-           <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
-       </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="http://revanced.app/discord">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-       </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://reddit.com/r/revancedapp">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-       </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://t.me/app_revanced">
-      <picture>
-         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-      </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://x.com/revancedapp">
-      <picture>
-         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
-         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
-      </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://www.youtube.com/@ReVanced">
-      <picture>
-         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-     </picture>
-   </a>
-   <br>
-   <br>
-   Continuing the legacy of Vanced
-</p>
-
-# 🔒 Security Policy
-
-This document describes how to report security vulnerabilities for ReVanced Manager.
-
-## 🚨 Reporting a Vulnerability
-
-Please open an issue in our [advisory tracker](https://github.com/ReVanced/revanced-manager/security/advisories/new) or reach out privately to us on [Discord](https://discord.gg/revanced).
-
-If a vulnerability is confirmed and accepted, you can join our [Discord](https://discord.gg/revanced) server to receive a special contributor role.
-
-### ⏳ Supported Versions
-
-| Version                                                                                                                                 | Branch      | Supported          |
-| --------------------------------------------------------------------------------------------------------------------------------------- | ----------- | ------------------ |
-| ![Latest stable release](https://img.shields.io/github/v/release/ReVanced/revanced-manager?style=for-the-badge "Latest stable release") | main        | :white_check_mark: |
-| ![Latest version](https://img.shields.io/badge/version-latest-brightgreen?style=for-the-badge "Latest version")                         | dev         | :white_check_mark: |
-| ![Latest version](https://img.shields.io/badge/version-latest-brightgreen?style=for-the-badge "Latest version")                         | compose-dev | :white_check_mark: |

app/build.gradle.kts

@@ -1,54 +1,35 @@
-import kotlin.random.Random
-
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kotlin.serialization)
-    alias(libs.plugins.kotlin.parcelize)
-    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.devtools)
     alias(libs.plugins.about.libraries)
+    id("kotlin-parcelize")
+    kotlin("plugin.serialization") version "1.8.22"
 }
 
 android {
     namespace = "app.revanced.manager"
-    compileSdk = 35
-    buildToolsVersion = "35.0.1"
+    compileSdk = 33
+    buildToolsVersion = "33.0.2"
 
     defaultConfig {
         applicationId = "app.revanced.manager"
         minSdk = 26
-        targetSdk = 35
+        targetSdk = 33
         versionCode = 1
         versionName = "0.0.1"
+        resourceConfigurations.addAll(listOf(
+            "en",
+        ))
+
         vectorDrawables.useSupportLibrary = true
     }
 
     buildTypes {
-        debug {
-            applicationIdSuffix = ".debug"
-            resValue("string", "app_name", "ReVanced Manager (dev)")
-            isPseudoLocalesEnabled = true
-
-            buildConfigField("long", "BUILD_ID", "${Random.nextLong()}L")
-        }
-
         release {
-            if (!project.hasProperty("noProguard")) {
-                isMinifyEnabled = true
-                isShrinkResources = true
-                proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
-            }
-
-            if (project.hasProperty("signAsDebug")) {
-                applicationIdSuffix = ".debug"
-                resValue("string", "app_name", "ReVanced Manager Debug")
-                signingConfig = signingConfigs.getByName("debug")
-
-                isPseudoLocalesEnabled = true
-            }
-
-            buildConfigField("long", "BUILD_ID", "0L")
+            isMinifyEnabled = true
+            isShrinkResources = true
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
 
@@ -61,7 +42,6 @@ android {
         includeInApk = false
         includeInBundle = false
     }
-
     packaging {
         resources.excludes.addAll(listOf(
             "/prebuilt/**",
@@ -85,24 +65,9 @@ android {
         jvmTarget = "17"
     }
 
-    buildFeatures {
-        compose = true
-        aidl = true
-        buildConfig = true
-    }
+    buildFeatures.compose = true
 
-    android {
-        androidResources {
-            generateLocaleConfig = true
-        }
-    }
-
-    externalNativeBuild {
-        cmake {
-            path = file("src/main/cpp/CMakeLists.txt")
-            version = "3.22.1"
-        }
-    }
+    composeOptions.kotlinCompilerExtensionVersion = "1.5.1"
 }
 
 kotlin {
@@ -116,26 +81,23 @@ dependencies {
     implementation(libs.runtime.ktx)
     implementation(libs.runtime.compose)
     implementation(libs.splash.screen)
-    implementation(libs.activity.compose)
+    implementation(libs.compose.activity)
+    implementation(libs.paging.common.ktx)
     implementation(libs.work.runtime.ktx)
     implementation(libs.preferences.datastore)
-    implementation(libs.appcompat)
 
     // Compose
     implementation(platform(libs.compose.bom))
     implementation(libs.compose.ui)
     implementation(libs.compose.ui.preview)
-    implementation(libs.compose.ui.tooling)
     implementation(libs.compose.livedata)
     implementation(libs.compose.material.icons.extended)
     implementation(libs.compose.material3)
-    implementation(libs.navigation.compose)
 
     // Accompanist
     implementation(libs.accompanist.drawablepainter)
-
-    // Placeholder
-    implementation(libs.placeholder.material3)
+    implementation(libs.accompanist.webview)
+    implementation(libs.accompanist.placeholder)
 
     // HTML Scraper
     implementation(libs.skrapeit.dsl)
@@ -148,7 +110,6 @@ dependencies {
     // KotlinX
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.kotlinx.collection.immutable)
-    implementation(libs.kotlinx.datetime)
 
     // Room
     implementation(libs.room.runtime)
@@ -157,29 +118,20 @@ dependencies {
     ksp(libs.room.compiler)
 
     // ReVanced
-    implementation(libs.revanced.patcher)
-    implementation(libs.revanced.library)
+    implementation(libs.patcher)
 
-    // Downloader plugins
-    implementation(project(":downloader-plugin"))
-
-    // Native processes
-    implementation(libs.kotlin.process)
-
-    // HiddenAPI
-    compileOnly(libs.hidden.api.stub)
-
-    // LibSU
-    implementation(libs.libsu.core)
-    implementation(libs.libsu.service)
-    implementation(libs.libsu.nio)
+    // Signing
+    implementation(libs.apksign)
+    implementation(libs.bcpkix.jdk18on)
 
     // Koin
     implementation(libs.koin.android)
     implementation(libs.koin.compose)
-    implementation(libs.koin.compose.navigation)
     implementation(libs.koin.workmanager)
 
+    // Compose Navigation
+    implementation(libs.reimagined.navigation)
+
     // Licenses
     implementation(libs.about.libraries)
 
@@ -190,22 +142,6 @@ dependencies {
     implementation(libs.ktor.content.negotiation)
     implementation(libs.ktor.serialization)
 
-    // Markdown
-    implementation(libs.markdown.renderer)
-
-    // Fading Edges
-    implementation(libs.fading.edges)
-
-    // Scrollbars
-    implementation(libs.scrollbars)
-
-    // EnumUtil
-    implementation(libs.enumutil)
-    ksp(libs.enumutil.ksp)
-
-    // Reorderable lists
-    implementation(libs.reorderable)
-
-    // Compose Icons
-    implementation(libs.compose.icons.fontawesome)
+    // Markdown to HTML
+    implementation(libs.markdown)
 }

app/proguard-rules.pro

@@ -26,10 +26,6 @@
     kotlinx.serialization.KSerializer serializer(...);
 }
 
-# This required for the process runtime.
--keep class app.revanced.manager.patcher.runtime.process.* {
-  *;
-}
 # Required for the patcher to function correctly
 -keep class app.revanced.patcher.** {
   *;
@@ -49,15 +45,9 @@
 -keep class com.android.** {
   *;
 }
--keep class app.revanced.manager.plugin.** {
-  *;
-}
-
--dontwarn com.google.auto.value.**
 -dontwarn java.awt.**
 -dontwarn javax.**
 -dontwarn org.slf4j.**
 -dontwarn it.skrape.fetcher.*
--dontwarn com.google.j2objc.annotations.*
 
 -keepattributes RuntimeVisibleAnnotations,AnnotationDefault

app/schemas/app.revanced.manager.data.room.AppDatabase/1.json

@@ -2,11 +2,11 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "d0119047505da435972c5247181de675",
+    "identityHash": "5515d164bc8f713201506d42a02d337f",
     "entities": [
       {
         "tableName": "patch_bundles",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER NOT NULL, `name` TEXT NOT NULL, `version` TEXT, `source` TEXT NOT NULL, `auto_update` INTEGER NOT NULL, PRIMARY KEY(`uid`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER NOT NULL, `name` TEXT NOT NULL, `source` TEXT NOT NULL, `auto_update` INTEGER NOT NULL, `version` TEXT, `integrations_version` TEXT, PRIMARY KEY(`uid`))",
         "fields": [
           {
             "fieldPath": "uid",
@@ -20,12 +20,6 @@
             "affinity": "TEXT",
             "notNull": true
           },
-          {
-            "fieldPath": "version",
-            "columnName": "version",
-            "affinity": "TEXT",
-            "notNull": false
-          },
           {
             "fieldPath": "source",
             "columnName": "source",
@@ -37,6 +31,18 @@
             "columnName": "auto_update",
             "affinity": "INTEGER",
             "notNull": true
+          },
+          {
+            "fieldPath": "versionInfo.patches",
+            "columnName": "version",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "versionInfo.integrations",
+            "columnName": "integrations_version",
+            "affinity": "TEXT",
+            "notNull": false
           }
         ],
         "primaryKey": {
@@ -45,7 +51,17 @@
             "uid"
           ]
         },
-        "indices": [],
+        "indices": [
+          {
+            "name": "index_patch_bundles_name",
+            "unique": true,
+            "columnNames": [
+              "name"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_patch_bundles_name` ON `${TABLE_NAME}` (`name`)"
+          }
+        ],
         "foreignKeys": []
       },
       {
@@ -144,7 +160,7 @@
       },
       {
         "tableName": "downloaded_app",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`package_name` TEXT NOT NULL, `version` TEXT NOT NULL, `directory` TEXT NOT NULL, `last_used` INTEGER NOT NULL, PRIMARY KEY(`package_name`, `version`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`package_name` TEXT NOT NULL, `version` TEXT NOT NULL, `file` TEXT NOT NULL, PRIMARY KEY(`package_name`, `version`))",
         "fields": [
           {
             "fieldPath": "packageName",
@@ -159,16 +175,10 @@
             "notNull": true
           },
           {
-            "fieldPath": "directory",
-            "columnName": "directory",
+            "fieldPath": "file",
+            "columnName": "file",
             "affinity": "TEXT",
             "notNull": true
-          },
-          {
-            "fieldPath": "lastUsed",
-            "columnName": "last_used",
-            "affinity": "INTEGER",
-            "notNull": true
           }
         ],
         "primaryKey": {
@@ -221,7 +231,7 @@
       },
       {
         "tableName": "applied_patch",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`package_name` TEXT NOT NULL, `bundle` INTEGER NOT NULL, `patch_name` TEXT NOT NULL, PRIMARY KEY(`package_name`, `bundle`, `patch_name`), FOREIGN KEY(`package_name`) REFERENCES `installed_app`(`current_package_name`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`bundle`) REFERENCES `patch_bundles`(`uid`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`package_name` TEXT NOT NULL, `bundle` INTEGER NOT NULL, `patch_name` TEXT NOT NULL, PRIMARY KEY(`package_name`, `bundle`, `patch_name`), FOREIGN KEY(`package_name`) REFERENCES `installed_app`(`current_package_name`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`bundle`) REFERENCES `patch_bundles`(`uid`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
         "fields": [
           {
             "fieldPath": "packageName",
@@ -275,7 +285,7 @@
           },
           {
             "table": "patch_bundles",
-            "onDelete": "CASCADE",
+            "onDelete": "NO ACTION",
             "onUpdate": "NO ACTION",
             "columns": [
               "bundle"
@@ -285,145 +295,12 @@
             ]
           }
         ]
-      },
-      {
-        "tableName": "option_groups",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER NOT NULL, `patch_bundle` INTEGER NOT NULL, `package_name` TEXT NOT NULL, PRIMARY KEY(`uid`), FOREIGN KEY(`patch_bundle`) REFERENCES `patch_bundles`(`uid`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "uid",
-            "columnName": "uid",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "patchBundle",
-            "columnName": "patch_bundle",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "packageName",
-            "columnName": "package_name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "uid"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_option_groups_patch_bundle_package_name",
-            "unique": true,
-            "columnNames": [
-              "patch_bundle",
-              "package_name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_option_groups_patch_bundle_package_name` ON `${TABLE_NAME}` (`patch_bundle`, `package_name`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "patch_bundles",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "patch_bundle"
-            ],
-            "referencedColumns": [
-              "uid"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "options",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`group` INTEGER NOT NULL, `patch_name` TEXT NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, PRIMARY KEY(`group`, `patch_name`, `key`), FOREIGN KEY(`group`) REFERENCES `option_groups`(`uid`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "group",
-            "columnName": "group",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "patchName",
-            "columnName": "patch_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "key",
-            "columnName": "key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "group",
-            "patch_name",
-            "key"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "option_groups",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "group"
-            ],
-            "referencedColumns": [
-              "uid"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "trusted_downloader_plugins",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`package_name` TEXT NOT NULL, `signature` BLOB NOT NULL, PRIMARY KEY(`package_name`))",
-        "fields": [
-          {
-            "fieldPath": "packageName",
-            "columnName": "package_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "signature",
-            "columnName": "signature",
-            "affinity": "BLOB",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "package_name"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
       }
     ],
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd0119047505da435972c5247181de675')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '5515d164bc8f713201506d42a02d337f')"
     ]
   }
 }

app/src/main/AndroidManifest.xml

@@ -2,28 +2,26 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <permission
-        android:name="app.revanced.manager.permission.PLUGIN_HOST"
-        android:protectionLevel="signature"
-        android:label="@string/plugin_host_permission_label"
-        android:description="@string/plugin_host_permission_description"
-        />
+    <permission android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="ReservedSystemPermission" />
 
-    <uses-permission android:name="app.revanced.manager.permission.PLUGIN_HOST" />
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
-        tools:ignore="QueryAllPackagesPermission" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="29" />
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
         tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.MAIN" />
+        </intent>
+    </queries>
+
     <application
         android:name=".ManagerApplication"
         android:allowBackup="true"
@@ -35,7 +33,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.ReVancedManager"
         android:enableOnBackInvokedCallback="true"
-        tools:targetApi="34">
+        tools:targetApi="33">
 
         <activity
             android:name=".MainActivity"
@@ -48,22 +46,9 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".plugin.downloader.webview.WebViewActivity" android:exported="false" android:theme="@style/Theme.WebViewActivity" />
-
         <service android:name=".service.InstallService" />
         <service android:name=".service.UninstallService" />
 
-        <service
-            android:name="androidx.work.impl.foreground.SystemForegroundService"
-            android:foregroundServiceType="specialUse"
-            android:exported="false"
-            tools:node="merge">
-            <property
-                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
-                android:value="patching"
-                />
-        </service>
-
         <provider
                 android:name="androidx.startup.InitializationProvider"
                 android:authorities="${applicationId}.androidx-startup"

app/src/main/aidl/app/revanced/manager/IRootSystemService.aidl

@@ -1,8 +0,0 @@
-// IRootService.aidl
-package app.revanced.manager;
-
-// Declare any non-default types here with import statements
-
-interface IRootSystemService {
-    IBinder getFileSystemService();
-}

app/src/main/aidl/app/revanced/manager/patcher/runtime/process/IPatcherEvents.aidl

@@ -1,11 +0,0 @@
-// IPatcherEvents.aidl
-package app.revanced.manager.patcher.runtime.process;
-
-// Interface for sending events back to the main app process.
-oneway interface IPatcherEvents {
-    void log(String level, String msg);
-    void patchSucceeded();
-    void progress(String name, String state, String msg);
-    // The patching process has ended. The exceptionStackTrace is null if it finished successfully.
-    void finished(String exceptionStackTrace);
-}

app/src/main/aidl/app/revanced/manager/patcher/runtime/process/IPatcherProcess.aidl

@@ -1,14 +0,0 @@
-// IPatcherProcess.aidl
-package app.revanced.manager.patcher.runtime.process;
-
-import app.revanced.manager.patcher.runtime.process.Parameters;
-import app.revanced.manager.patcher.runtime.process.IPatcherEvents;
-
-interface IPatcherProcess {
-    // Returns BuildConfig.BUILD_ID, which is used to ensure the main app and runner process are running the same code.
-    long buildId();
-    // Makes the patcher process exit with code 0
-    oneway void exit();
-    // Starts patching.
-    oneway void start(in Parameters parameters, IPatcherEvents events);
-}

app/src/main/aidl/app/revanced/manager/patcher/runtime/process/Parameters.aidl

@@ -1,4 +0,0 @@
-// Parameters.aidl
-package app.revanced.manager.patcher.runtime.process;
-
-parcelable Parameters;

app/src/main/assets/root/module.prop

@@ -1,6 +0,0 @@
-id=__PKG_NAME__-ReVanced
-name=__LABEL__ ReVanced
-version=__VERSION__
-versionCode=0
-author=ReVanced
-description=Mounts the patched APK on top of the original one

app/src/main/assets/root/service.sh

@@ -1,40 +0,0 @@
-#!/system/bin/sh
-DIR=${0%/*}
-
-package_name="__PKG_NAME__"
-version="__VERSION__"
-
-rm "$DIR/log"
-
-{
-
-until [ "$(getprop sys.boot_completed)" = 1 ]; do sleep 5; done
-sleep 5
-
-base_path="$DIR/$package_name.apk"
-stock_path="$(pm path "$package_name" | grep base | sed 's/package://g')"
-stock_version="$(dumpsys package "$package_name" | grep versionName | cut -d "=" -f2)"
-
-echo "base_path: $base_path"
-echo "stock_path: $stock_path"
-echo "base_version: $version"
-echo "stock_version: $stock_version"
-
-if mount | grep -q "$stock_path" ; then
-  echo "Not mounting as stock path is already mounted"
-  exit 1
-fi
-
-if [ "$version" != "$stock_version" ]; then
-  echo "Not mounting as versions don't match"
-  exit 1
-fi
-
-if [ -z "$stock_path" ]; then
-  echo "Not mounting as app info could not be loaded"
-  exit 1
-fi
-
-mount -o bind "$base_path" "$stock_path"
-
-} >> "$DIR/log"

app/src/main/cpp/CMakeLists.txt

@@ -1,38 +0,0 @@
-
-# For more information about using CMake with Android Studio, read the
-# documentation: https://d.android.com/studio/projects/add-native-code.html.
-# For more examples on how to use CMake, see https://github.com/android/ndk-samples.
-
-# Sets the minimum CMake version required for this project.
-cmake_minimum_required(VERSION 3.22.1)
-
-# Declares the project name. The project name can be accessed via ${ PROJECT_NAME},
-# Since this is the top level CMakeLists.txt, the project name is also accessible
-# with ${CMAKE_PROJECT_NAME} (both CMake variables are in-sync within the top level
-# build script scope).
-project("prop_override")
-
-# Creates and names a library, sets it as either STATIC
-# or SHARED, and provides the relative paths to its source code.
-# You can define multiple libraries, and CMake builds them for you.
-# Gradle automatically packages shared libraries with your APK.
-#
-# In this top level CMakeLists.txt, ${CMAKE_PROJECT_NAME} is used to define
-# the target library name; in the sub-module's CMakeLists.txt, ${PROJECT_NAME}
-# is preferred for the same purpose.
-#
-# In order to load a library into your app from Java/Kotlin, you must call
-# System.loadLibrary() and pass the name of the library defined here;
-# for GameActivity/NativeActivity derived applications, the same library name must be
-# used in the AndroidManifest.xml file.
-add_library(${CMAKE_PROJECT_NAME} SHARED
-    # List C/C++ source files with relative paths to this CMakeLists.txt.
-        prop_override.cpp)
-
-# Specifies libraries CMake should link to your target library. You
-# can link libraries from various origins, such as libraries defined in this
-# build script, prebuilt third-party libraries, or Android system libraries.
-target_link_libraries(${CMAKE_PROJECT_NAME}
-    # List libraries link to the target library
-    android
-    log)

app/src/main/cpp/prop_override.cpp

@@ -1,62 +0,0 @@
-// Library for overriding Android system properties via environment variables.
-//
-// Usage: LD_PRELOAD=prop_override.so PROP_dalvik.vm.heapsize=123M getprop dalvik.vm.heapsize
-// Output: 123M
-#include <string>
-#include <cstring>
-#include <cstdlib>
-#include <dlfcn.h>
-
-// Source: https://android.googlesource.com/platform/system/core/+/100b08a848d018eeb1caa5d5e7c7c2aaac65da15/libcutils/include/cutils/properties.h
-#define PROP_VALUE_MAX 92
-// This is the mangled name of "android::base::GetProperty".
-#define GET_PROPERTY_MANGLED_NAME "_ZN7android4base11GetPropertyERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEES9_"
-
-extern "C" typedef int (*property_get_ptr)(const char *, char *, const char *);
-typedef std::string (*GetProperty_ptr)(const std::string &, const std::string &);
-
-char *GetPropOverride(const std::string &key) {
-    auto envKey = "PROP_" + key;
-
-    return getenv(envKey.c_str());
-}
-
-// See: https://android.googlesource.com/platform/system/core/+/100b08a848d018eeb1caa5d5e7c7c2aaac65da15/libcutils/properties.cpp
-extern "C" int property_get(const char *key, char *value, const char *default_value) {
-    auto replacement = GetPropOverride(std::string(key));
-    if (replacement) {
-        int len = strnlen(replacement, PROP_VALUE_MAX);
-
-        strncpy(value, replacement, len);
-        return len;
-    }
-
-    static property_get_ptr original = NULL;
-    if (!original) {
-        // Get the address of the original function.
-        original = reinterpret_cast<property_get_ptr>(dlsym(RTLD_NEXT, "property_get"));
-    }
-
-    return original(key, value, default_value);
-}
-
-// Defining android::base::GetProperty ourselves won't work because std::string has a slightly different "path" in the NDK version of the C++ standard library.
-// We can get around this by forcing the function to adopt a specific name using the asm keyword.
-std::string GetProperty(const std::string &, const std::string &) asm(GET_PROPERTY_MANGLED_NAME);
-
-
-// See: https://android.googlesource.com/platform/system/libbase/+/1a34bb67c4f3ba0a1ea6f4f20ac9fe117ba4fe64/properties.cpp
-// This isn't used for the properties we want to override, but property_get is deprecated so that could change in the future.
-std::string GetProperty(const std::string &key, const std::string &default_value) {
-    auto replacement = GetPropOverride(key);
-    if (replacement) {
-        return std::string(replacement);
-    }
-
-    static GetProperty_ptr original = NULL;
-    if (!original) {
-        original = reinterpret_cast<GetProperty_ptr>(dlsym(RTLD_NEXT, GET_PROPERTY_MANGLED_NAME));
-    }
-
-    return original(key, default_value);
-}

app/src/main/java/app/revanced/manager/MainActivity.kt

@@ -1,64 +1,31 @@
 package app.revanced.manager
 
-import android.content.ActivityNotFoundException
 import android.os.Bundle
-import android.os.Parcelable
 import androidx.activity.ComponentActivity
-import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.animation.ExperimentalAnimationApi
-import androidx.compose.animation.slideInHorizontally
-import androidx.compose.animation.slideOutHorizontally
 import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.core.view.WindowCompat
-import androidx.lifecycle.lifecycleScope
-import androidx.navigation.NavBackStackEntry
-import androidx.navigation.NavController
-import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.navigation
-import androidx.navigation.compose.rememberNavController
-import androidx.navigation.toRoute
-import app.revanced.manager.ui.model.navigation.AppSelector
-import app.revanced.manager.ui.model.navigation.ComplexParameter
-import app.revanced.manager.ui.model.navigation.Dashboard
-import app.revanced.manager.ui.model.navigation.InstalledApplicationInfo
-import app.revanced.manager.ui.model.navigation.Patcher
-import app.revanced.manager.ui.model.navigation.SelectedApplicationInfo
-import app.revanced.manager.ui.model.navigation.Settings
-import app.revanced.manager.ui.model.navigation.Update
+import app.revanced.manager.ui.component.AutoUpdatesDialog
+import app.revanced.manager.ui.destination.Destination
+import app.revanced.manager.ui.screen.AppInfoScreen
+import app.revanced.manager.ui.screen.VersionSelectorScreen
 import app.revanced.manager.ui.screen.AppSelectorScreen
 import app.revanced.manager.ui.screen.DashboardScreen
-import app.revanced.manager.ui.screen.InstalledAppInfoScreen
-import app.revanced.manager.ui.screen.PatcherScreen
+import app.revanced.manager.ui.screen.InstallerScreen
 import app.revanced.manager.ui.screen.PatchesSelectorScreen
-import app.revanced.manager.ui.screen.RequiredOptionsScreen
-import app.revanced.manager.ui.screen.SelectedAppInfoScreen
 import app.revanced.manager.ui.screen.SettingsScreen
-import app.revanced.manager.ui.screen.UpdateScreen
-import app.revanced.manager.ui.screen.settings.AboutSettingsScreen
-import app.revanced.manager.ui.screen.settings.AdvancedSettingsScreen
-import app.revanced.manager.ui.screen.settings.BackupRestoreSettingsScreen
-import app.revanced.manager.ui.screen.settings.ContributorScreen
-import app.revanced.manager.ui.screen.settings.DeveloperOptionsScreen
-import app.revanced.manager.ui.screen.settings.DownloadsSettingsScreen
-import app.revanced.manager.ui.screen.settings.GeneralSettingsScreen
-import app.revanced.manager.ui.screen.settings.LicensesScreen
-import app.revanced.manager.ui.screen.settings.update.ChangelogsScreen
 import app.revanced.manager.ui.theme.ReVancedManagerTheme
 import app.revanced.manager.ui.theme.Theme
 import app.revanced.manager.ui.viewmodel.MainViewModel
-import app.revanced.manager.ui.viewmodel.SelectedAppInfoViewModel
-import app.revanced.manager.util.EventEffect
-import kotlinx.coroutines.launch
-import org.koin.androidx.compose.koinViewModel
-import org.koin.androidx.compose.navigation.koinNavViewModel
+import dev.olshevski.navigation.reimagined.AnimatedNavHost
+import dev.olshevski.navigation.reimagined.NavBackHandler
+import dev.olshevski.navigation.reimagined.navigate
+import dev.olshevski.navigation.reimagined.pop
+import dev.olshevski.navigation.reimagined.popUpTo
+import dev.olshevski.navigation.reimagined.rememberNavController
+import org.koin.androidx.compose.getViewModel
 import org.koin.core.parameter.parametersOf
 import org.koin.androidx.viewmodel.ext.android.getViewModel as getActivityViewModel
 
@@ -67,264 +34,90 @@ class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        WindowCompat.setDecorFitsSystemWindows(window, false)
-        enableEdgeToEdge()
-        installSplashScreen()
-
         val vm: MainViewModel = getActivityViewModel()
 
+        installSplashScreen()
+
         setContent {
-            val launcher = rememberLauncherForActivityResult(
-                ActivityResultContracts.StartActivityForResult(),
-                onResult = vm::applyLegacySettings
-            )
             val theme by vm.prefs.theme.getAsState()
             val dynamicColor by vm.prefs.dynamicColor.getAsState()
 
-            EventEffect(vm.legacyImportActivityFlow) {
-                try {
-                    launcher.launch(it)
-                } catch (_: ActivityNotFoundException) {
-                }
-            }
-
             ReVancedManagerTheme(
                 darkTheme = theme == Theme.SYSTEM && isSystemInDarkTheme() || theme == Theme.DARK,
                 dynamicColor = dynamicColor
             ) {
-                ReVancedManager(vm)
-            }
-        }
-    }
-}
+                val navController =
+                    rememberNavController<Destination>(startDestination = Destination.Dashboard)
 
-@Composable
-private fun ReVancedManager(vm: MainViewModel) {
-    val navController = rememberNavController()
+                NavBackHandler(navController)
 
-    EventEffect(vm.appSelectFlow) { app ->
-        navController.navigateComplex(
-            SelectedApplicationInfo,
-            SelectedApplicationInfo.ViewModelParams(app)
-        )
-    }
-
-    NavHost(
-        navController = navController,
-        startDestination = Dashboard,
-        enterTransition = { slideInHorizontally(initialOffsetX = { it }) },
-        exitTransition = { slideOutHorizontally(targetOffsetX = { -it / 3 }) },
-        popEnterTransition = { slideInHorizontally(initialOffsetX = { -it / 3 }) },
-        popExitTransition = { slideOutHorizontally(targetOffsetX = { it }) },
-    ) {
-        composable<Dashboard> {
-            DashboardScreen(
-                onSettingsClick = { navController.navigate(Settings) },
-                onAppSelectorClick = {
-                    navController.navigate(AppSelector)
-                },
-                onUpdateClick = {
-                    navController.navigate(Update())
-                },
-                onDownloaderPluginClick = {
-                    navController.navigate(Settings.Downloads)
-                },
-                onAppClick = { packageName ->
-                    navController.navigate(InstalledApplicationInfo(packageName))
+                val showAutoUpdatesDialog by vm.prefs.showAutoUpdatesDialog.getAsState()
+                if (showAutoUpdatesDialog) {
+                    AutoUpdatesDialog(vm::applyAutoUpdatePrefs)
                 }
-            )
-        }
 
-        composable<InstalledApplicationInfo> {
-            val data = it.toRoute<InstalledApplicationInfo>()
-
-            InstalledAppInfoScreen(
-                onPatchClick = vm::selectApp,
-                onBackClick = navController::popBackStack,
-                viewModel = koinViewModel { parametersOf(data.packageName) }
-            )
-        }
-
-        composable<AppSelector> {
-            AppSelectorScreen(
-                onSelect = vm::selectApp,
-                onStorageSelect = vm::selectApp,
-                onBackClick = navController::popBackStack
-            )
-        }
-
-        composable<Patcher> {
-            PatcherScreen(
-                onBackClick = {
-                    navController.navigate(route = Dashboard) {
-                        launchSingleTop = true
-                        popUpTo<Dashboard> {
-                            inclusive = false
-                        }
-                    }
-                },
-                vm = koinViewModel { parametersOf(it.getComplexArg<Patcher.ViewModelParams>()) }
-            )
-        }
-
-        composable<Update> {
-            val data = it.toRoute<Update>()
-
-            UpdateScreen(
-                onBackClick = navController::popBackStack,
-                vm = koinViewModel { parametersOf(data.downloadOnScreenEntry) }
-            )
-        }
-
-        navigation<SelectedApplicationInfo>(startDestination = SelectedApplicationInfo.Main) {
-            composable<SelectedApplicationInfo.Main> {
-                val parentBackStackEntry = navController.navGraphEntry(it)
-                val data =
-                    parentBackStackEntry.getComplexArg<SelectedApplicationInfo.ViewModelParams>()
-                val viewModel =
-                    koinNavViewModel<SelectedAppInfoViewModel>(viewModelStoreOwner = parentBackStackEntry) {
-                        parametersOf(data)
-                    }
-
-                SelectedAppInfoScreen(
-                    onBackClick = navController::popBackStack,
-                    onPatchClick = {
-                        it.lifecycleScope.launch {
-                            navController.navigateComplex(
-                                Patcher,
-                                viewModel.getPatcherParams()
-                            )
-                        }
-                    },
-                    onPatchSelectorClick = { app, patches, options ->
-                        navController.navigateComplex(
-                            SelectedApplicationInfo.PatchesSelector,
-                            SelectedApplicationInfo.PatchesSelector.ViewModelParams(
-                                app,
-                                patches,
-                                options
-                            )
+                AnimatedNavHost(
+                    controller = navController
+                ) { destination ->
+                    when (destination) {
+                        is Destination.Dashboard -> DashboardScreen(
+                            onSettingsClick = { navController.navigate(Destination.Settings) },
+                            onAppSelectorClick = { navController.navigate(Destination.AppSelector) },
+                            onAppClick = { installedApp -> navController.navigate(Destination.ApplicationInfo(installedApp)) }
                         )
-                    },
-                    onRequiredOptions = { app, patches, options ->
-                        navController.navigateComplex(
-                            SelectedApplicationInfo.RequiredOptions,
-                            SelectedApplicationInfo.PatchesSelector.ViewModelParams(
-                                app,
-                                patches,
-                                options
-                            )
+
+                        is Destination.ApplicationInfo -> AppInfoScreen(
+                            onPatchClick = { packageName, patchesSelection ->
+                                navController.navigate(Destination.VersionSelector(packageName, patchesSelection))
+                            },
+                            onBackClick = { navController.pop() },
+                            viewModel = getViewModel { parametersOf(destination.installedApp) }
                         )
-                    },
-                    vm = viewModel
-                )
-            }
 
-            composable<SelectedApplicationInfo.PatchesSelector> {
-                val data =
-                    it.getComplexArg<SelectedApplicationInfo.PatchesSelector.ViewModelParams>()
-                val selectedAppInfoVm = koinNavViewModel<SelectedAppInfoViewModel>(
-                    viewModelStoreOwner = navController.navGraphEntry(it)
-                )
+                        is Destination.Settings -> SettingsScreen(
+                            onBackClick = { navController.pop() }
+                        )
 
-                PatchesSelectorScreen(
-                    onBackClick = navController::popBackStack,
-                    onSave = { patches, options ->
-                        selectedAppInfoVm.updateConfiguration(patches, options)
-                        navController.popBackStack()
-                    },
-                    vm = koinViewModel { parametersOf(data) }
-                )
-            }
+                        is Destination.AppSelector -> AppSelectorScreen(
+                            onAppClick = { navController.navigate(Destination.VersionSelector(it)) },
+                            onStorageClick = { navController.navigate(Destination.PatchesSelector(it)) },
+                            onBackClick = { navController.pop() }
+                        )
 
-            composable<SelectedApplicationInfo.RequiredOptions> {
-                val data =
-                    it.getComplexArg<SelectedApplicationInfo.PatchesSelector.ViewModelParams>()
-                val selectedAppInfoVm = koinNavViewModel<SelectedAppInfoViewModel>(
-                    viewModelStoreOwner = navController.navGraphEntry(it)
-                )
+                        is Destination.VersionSelector -> VersionSelectorScreen(
+                            onBackClick = { navController.pop() },
+                            onAppClick = { selectedApp ->
+                                navController.navigate(
+                                    Destination.PatchesSelector(
+                                        selectedApp,
+                                        destination.patchesSelection
+                                    )
+                                )
+                            },
+                            viewModel = getViewModel { parametersOf(destination.packageName, destination.patchesSelection) }
+                        )
 
-                RequiredOptionsScreen(
-                    onBackClick = navController::popBackStack,
-                    onContinue = { patches, options ->
-                        selectedAppInfoVm.updateConfiguration(patches, options)
-                        it.lifecycleScope.launch {
-                            navController.navigateComplex(
-                                Patcher,
-                                selectedAppInfoVm.getPatcherParams()
-                            )
-                        }
-                    },
-                    vm = koinViewModel { parametersOf(data) }
-                )
-            }
-        }
+                        is Destination.PatchesSelector -> PatchesSelectorScreen(
+                            onBackClick = { navController.pop() },
+                            onPatchClick = { patches, options ->
+                                navController.navigate(
+                                    Destination.Installer(
+                                        destination.selectedApp,
+                                        patches,
+                                        options
+                                    )
+                                )
+                            },
+                            vm = getViewModel { parametersOf(destination) }
+                        )
 
-        navigation<Settings>(startDestination = Settings.Main) {
-            composable<Settings.Main> {
-                SettingsScreen(
-                    onBackClick = navController::popBackStack,
-                    navigate = navController::navigate
-                )
-            }
-
-            composable<Settings.General> {
-                GeneralSettingsScreen(
-                    onBackClick = navController::popBackStack,
-                    onUpdateClick = { navController.navigate(Update()) }
-                )
-            }
-
-            composable<Settings.Advanced> {
-                AdvancedSettingsScreen(onBackClick = navController::popBackStack)
-            }
-
-            composable<Settings.Downloads> {
-                DownloadsSettingsScreen(onBackClick = navController::popBackStack)
-            }
-
-            composable<Settings.ImportExport> {
-                BackupRestoreSettingsScreen(onBackClick = navController::popBackStack)
-            }
-
-            composable<Settings.About> {
-                AboutSettingsScreen(
-                    onBackClick = navController::popBackStack,
-                    onChangelogClick = { navController.navigate(Settings.Changelogs) },
-                    navigate = navController::navigate
-                )
-            }
-
-            composable<Settings.Changelogs> {
-                ChangelogsScreen(onBackClick = navController::popBackStack)
-            }
-
-            composable<Settings.Contributors> {
-                ContributorScreen(onBackClick = navController::popBackStack)
-            }
-
-            composable<Settings.Licenses> {
-                LicensesScreen(onBackClick = navController::popBackStack)
-            }
-
-            composable<Settings.DeveloperOptions> {
-                DeveloperOptionsScreen(onBackClick = navController::popBackStack)
+                        is Destination.Installer -> InstallerScreen(
+                            onBackClick = { navController.popUpTo { it is Destination.Dashboard } },
+                            vm = getViewModel { parametersOf(destination) }
+                        )
+                    }
+                }
             }
         }
     }
-}
-
-@Composable
-private fun NavController.navGraphEntry(entry: NavBackStackEntry) =
-    remember(entry) { getBackStackEntry(entry.destination.parent!!.id) }
-
-// Androidx Navigation does not support storing complex types in route objects, so we have to store them inside the saved state handle of the back stack entry instead.
-private fun <T : Parcelable, R : ComplexParameter<T>> NavController.navigateComplex(
-    route: R,
-    data: T
-) {
-    navigate(route)
-    getBackStackEntry(route).savedStateHandle["args"] = data
-}
-
-private fun <T : Parcelable> NavBackStackEntry.getComplexArg() = savedStateHandle.get<T>("args")!!
+}

app/src/main/java/app/revanced/manager/ManagerApplication.kt

@@ -1,20 +1,12 @@
 package app.revanced.manager
 
-import android.app.Activity
 import android.app.Application
-import android.os.Bundle
-import android.util.Log
-import app.revanced.manager.data.platform.Filesystem
 import app.revanced.manager.di.*
 import app.revanced.manager.domain.manager.PreferencesManager
-import app.revanced.manager.domain.repository.DownloaderPluginRepository
 import app.revanced.manager.domain.repository.PatchBundleRepository
-import app.revanced.manager.util.tag
 import kotlinx.coroutines.Dispatchers
 import coil.Coil
 import coil.ImageLoader
-import com.topjohnwu.superuser.Shell
-import com.topjohnwu.superuser.internal.BuilderImpl
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 import me.zhanghai.android.appiconloader.coil.AppIconFetcher
@@ -29,9 +21,6 @@ class ManagerApplication : Application() {
     private val scope = MainScope()
     private val prefs: PreferencesManager by inject()
     private val patchBundleRepository: PatchBundleRepository by inject()
-    private val downloaderPluginRepository: DownloaderPluginRepository by inject()
-    private val fs: Filesystem by inject()
-
     override fun onCreate() {
         super.onCreate()
 
@@ -48,7 +37,6 @@ class ManagerApplication : Application() {
                 workerModule,
                 viewModelModule,
                 databaseModule,
-                rootModule
             )
         }
 
@@ -62,49 +50,14 @@ class ManagerApplication : Application() {
                 .build()
         )
 
-        val shellBuilder = BuilderImpl.create().setFlags(Shell.FLAG_MOUNT_MASTER)
-        Shell.setDefaultBuilder(shellBuilder)
-
         scope.launch {
             prefs.preload()
         }
-        scope.launch(Dispatchers.Default) {
-            downloaderPluginRepository.reload()
-        }
         scope.launch(Dispatchers.Default) {
             with(patchBundleRepository) {
                 reload()
                 updateCheck()
             }
         }
-        registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks {
-            private var firstActivityCreated = false
-
-            override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
-                if (firstActivityCreated) return
-                firstActivityCreated = true
-
-                // We do not want to call onFreshProcessStart() if there is state to restore.
-                // This can happen on system-initiated process death.
-                if (savedInstanceState == null) {
-                    Log.d(tag, "Fresh process created")
-                    onFreshProcessStart()
-                } else Log.d(tag, "System-initiated process death detected")
-            }
-
-            override fun onActivityStarted(activity: Activity) {}
-            override fun onActivityResumed(activity: Activity) {}
-            override fun onActivityPaused(activity: Activity) {}
-            override fun onActivityStopped(activity: Activity) {}
-            override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
-            override fun onActivityDestroyed(activity: Activity) {}
-        })
-    }
-
-    private fun onFreshProcessStart() {
-        fs.uiTempDir.apply {
-            deleteRecursively()
-            mkdirs()
-        }
     }
 }

app/src/main/java/app/revanced/manager/data/platform/FileSystem.kt

@@ -0,0 +1,27 @@
+package app.revanced.manager.data.platform
+
+import android.app.Application
+import android.os.Build
+import android.os.Environment
+import android.Manifest
+import android.content.pm.PackageManager
+import androidx.activity.result.contract.ActivityResultContract
+import androidx.activity.result.contract.ActivityResultContracts
+import app.revanced.manager.util.RequestManageStorageContract
+
+class FileSystem(private val app: Application) {
+    val contentResolver = app.contentResolver // TODO: move Content Resolver operations to here.
+
+    fun externalFilesDir() = Environment.getExternalStorageDirectory().toPath()
+
+    private fun usesManagePermission() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
+
+    private val storagePermissionName = if (usesManagePermission()) Manifest.permission.MANAGE_EXTERNAL_STORAGE else Manifest.permission.READ_EXTERNAL_STORAGE
+
+    fun permissionContract(): Pair<ActivityResultContract<String, Boolean>, String> {
+        val contract = if (usesManagePermission()) RequestManageStorageContract() else ActivityResultContracts.RequestPermission()
+        return contract to storagePermissionName
+    }
+
+    fun hasStoragePermission() = if (usesManagePermission()) Environment.isExternalStorageManager() else app.checkSelfPermission(storagePermissionName) == PackageManager.PERMISSION_GRANTED
+}

app/src/main/java/app/revanced/manager/data/platform/Filesystem.kt

@@ -1,51 +0,0 @@
-package app.revanced.manager.data.platform
-
-import android.Manifest
-import android.app.Application
-import android.content.Context
-import android.content.pm.PackageManager
-import android.os.Build
-import android.os.Environment
-import androidx.activity.result.contract.ActivityResultContract
-import androidx.activity.result.contract.ActivityResultContracts
-import app.revanced.manager.util.RequestManageStorageContract
-import java.io.File
-import java.nio.file.Path
-
-class Filesystem(private val app: Application) {
-    val contentResolver = app.contentResolver // TODO: move Content Resolver operations to here.
-
-    /**
-     * A directory that gets cleared when the app restarts.
-     * Do not store paths to this directory in a parcel.
-     */
-    val tempDir: File = app.getDir("ephemeral", Context.MODE_PRIVATE).apply {
-        deleteRecursively()
-        mkdirs()
-    }
-
-    /**
-     * A directory for storing temporary files related to UI.
-     * This is the same as [tempDir], but does not get cleared on system-initiated process death.
-     * Paths to this directory can be safely stored in parcels.
-     */
-    val uiTempDir: File = app.getDir("ui_ephemeral", Context.MODE_PRIVATE)
-
-    fun externalFilesDir(): Path = Environment.getExternalStorageDirectory().toPath()
-
-    private fun usesManagePermission() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
-
-    private val storagePermissionName =
-        if (usesManagePermission()) Manifest.permission.MANAGE_EXTERNAL_STORAGE else Manifest.permission.READ_EXTERNAL_STORAGE
-
-    fun permissionContract(): Pair<ActivityResultContract<String, Boolean>, String> {
-        val contract =
-            if (usesManagePermission()) RequestManageStorageContract() else ActivityResultContracts.RequestPermission()
-        return contract to storagePermissionName
-    }
-
-    fun hasStoragePermission() =
-        if (usesManagePermission()) Environment.isExternalStorageManager() else app.checkSelfPermission(
-            storagePermissionName
-        ) == PackageManager.PERMISSION_GRANTED
-}

app/src/main/java/app/revanced/manager/data/room/AppDatabase.kt

@@ -13,25 +13,15 @@ import app.revanced.manager.data.room.selection.SelectedPatch
 import app.revanced.manager.data.room.selection.SelectionDao
 import app.revanced.manager.data.room.bundles.PatchBundleDao
 import app.revanced.manager.data.room.bundles.PatchBundleEntity
-import app.revanced.manager.data.room.options.Option
-import app.revanced.manager.data.room.options.OptionDao
-import app.revanced.manager.data.room.options.OptionGroup
-import app.revanced.manager.data.room.plugins.TrustedDownloaderPlugin
-import app.revanced.manager.data.room.plugins.TrustedDownloaderPluginDao
 import kotlin.random.Random
 
-@Database(
-    entities = [PatchBundleEntity::class, PatchSelection::class, SelectedPatch::class, DownloadedApp::class, InstalledApp::class, AppliedPatch::class, OptionGroup::class, Option::class, TrustedDownloaderPlugin::class],
-    version = 1
-)
+@Database(entities = [PatchBundleEntity::class, PatchSelection::class, SelectedPatch::class, DownloadedApp::class, InstalledApp::class, AppliedPatch::class], version = 1)
 @TypeConverters(Converters::class)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun patchBundleDao(): PatchBundleDao
     abstract fun selectionDao(): SelectionDao
     abstract fun downloadedAppDao(): DownloadedAppDao
     abstract fun installedAppDao(): InstalledAppDao
-    abstract fun optionDao(): OptionDao
-    abstract fun trustedDownloaderPluginDao(): TrustedDownloaderPluginDao
 
     companion object {
         fun generateUid() = Random.Default.nextInt()

app/src/main/java/app/revanced/manager/data/room/Converters.kt

@@ -2,7 +2,7 @@ package app.revanced.manager.data.room
 
 import androidx.room.TypeConverter
 import app.revanced.manager.data.room.bundles.Source
-import app.revanced.manager.data.room.options.Option.SerializedValue
+import io.ktor.http.*
 import java.io.File
 
 class Converters {
@@ -16,11 +16,5 @@ class Converters {
     fun fileFromString(value: String) = File(value)
 
     @TypeConverter
-    fun fileToString(file: File): String = file.path
-
-    @TypeConverter
-    fun serializedOptionFromString(value: String) = SerializedValue.fromJsonString(value)
-
-    @TypeConverter
-    fun serializedOptionToString(value: SerializedValue) = value.toJsonString()
+    fun fileToString(file: File): String = file.absolutePath
 }

app/src/main/java/app/revanced/manager/data/room/apps/downloaded/DownloadedApp.kt

@@ -11,6 +11,5 @@ import java.io.File
 data class DownloadedApp(
     @ColumnInfo(name = "package_name") val packageName: String,
     @ColumnInfo(name = "version") val version: String,
-    @ColumnInfo(name = "directory") val directory: File,
-    @ColumnInfo(name = "last_used") val lastUsed: Long = System.currentTimeMillis()
+    @ColumnInfo(name = "file") val file: File,
 )

app/src/main/java/app/revanced/manager/data/room/apps/downloaded/DownloadedAppDao.kt

@@ -4,7 +4,6 @@ import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.Query
-import androidx.room.Upsert
 import kotlinx.coroutines.flow.Flow
 
 @Dao
@@ -15,11 +14,8 @@ interface DownloadedAppDao {
     @Query("SELECT * FROM downloaded_app WHERE package_name = :packageName AND version = :version")
     suspend fun get(packageName: String, version: String): DownloadedApp?
 
-    @Upsert
-    suspend fun upsert(downloadedApp: DownloadedApp)
-
-    @Query("UPDATE downloaded_app SET last_used = :newValue WHERE package_name = :packageName AND version = :version")
-    suspend fun markUsed(packageName: String, version: String, newValue: Long = System.currentTimeMillis())
+    @Insert
+    suspend fun insert(downloadedApp: DownloadedApp)
 
     @Delete
     suspend fun delete(downloadedApps: Collection<DownloadedApp>)

app/src/main/java/app/revanced/manager/data/room/apps/installed/AppliedPatch.kt

@@ -22,8 +22,7 @@ import kotlinx.parcelize.Parcelize
         ForeignKey(
             PatchBundleEntity::class,
             parentColumns = ["uid"],
-            childColumns = ["bundle"],
-            onDelete = ForeignKey.CASCADE
+            childColumns = ["bundle"]
         )
     ],
     indices = [Index(value = ["bundle"], unique = false)]

app/src/main/java/app/revanced/manager/data/room/apps/installed/InstalledApp.kt

@@ -1,15 +1,18 @@
 package app.revanced.manager.data.room.apps.installed
 
+import android.os.Parcelable
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import app.revanced.manager.R
+import kotlinx.parcelize.Parcelize
 
 enum class InstallType(val stringResource: Int) {
     DEFAULT(R.string.default_install),
-    MOUNT(R.string.mount_install)
+    ROOT(R.string.root_install)
 }
 
+@Parcelize
 @Entity(tableName = "installed_app")
 data class InstalledApp(
     @PrimaryKey
@@ -17,4 +20,4 @@ data class InstalledApp(
     @ColumnInfo(name = "original_package_name") val originalPackageName: String,
     @ColumnInfo(name = "version") val version: String,
     @ColumnInfo(name = "install_type") val installType: InstallType
-)
+) : Parcelable

app/src/main/java/app/revanced/manager/data/room/apps/installed/InstalledAppDao.kt

@@ -3,10 +3,9 @@ package app.revanced.manager.data.room.apps.installed
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
-import androidx.room.MapColumn
+import androidx.room.MapInfo
 import androidx.room.Query
 import androidx.room.Transaction
-import androidx.room.Upsert
 import kotlinx.coroutines.flow.Flow
 
 @Dao
@@ -17,30 +16,25 @@ interface InstalledAppDao {
     @Query("SELECT * FROM installed_app WHERE current_package_name = :packageName")
     suspend fun get(packageName: String): InstalledApp?
 
+    @MapInfo(keyColumn = "bundle", valueColumn = "patch_name")
     @Query(
         "SELECT bundle, patch_name FROM applied_patch" +
                 " WHERE package_name = :packageName"
     )
-    suspend fun getPatchesSelection(packageName: String): Map<@MapColumn("bundle") Int, List<@MapColumn(
-        "patch_name"
-    ) String>>
+    suspend fun getPatchesSelection(packageName: String): Map<Int, List<String>>
 
     @Transaction
-    suspend fun upsertApp(installedApp: InstalledApp, appliedPatches: List<AppliedPatch>) {
-        upsertApp(installedApp)
-        deleteAppliedPatches(installedApp.currentPackageName)
+    suspend fun insertApp(installedApp: InstalledApp, appliedPatches: List<AppliedPatch>) {
+        insertApp(installedApp)
         insertAppliedPatches(appliedPatches)
     }
 
-    @Upsert
-    suspend fun upsertApp(installedApp: InstalledApp)
+    @Insert
+    suspend fun insertApp(installedApp: InstalledApp)
 
     @Insert
     suspend fun insertAppliedPatches(appliedPatches: List<AppliedPatch>)
 
-    @Query("DELETE FROM applied_patch WHERE package_name = :packageName")
-    suspend fun deleteAppliedPatches(packageName: String)
-
     @Delete
     suspend fun delete(installedApp: InstalledApp)
 }

app/src/main/java/app/revanced/manager/data/room/bundles/PatchBundleDao.kt

@@ -8,25 +8,22 @@ interface PatchBundleDao {
     @Query("SELECT * FROM patch_bundles")
     suspend fun all(): List<PatchBundleEntity>
 
-    @Query("SELECT version, auto_update FROM patch_bundles WHERE uid = :uid")
-    fun getPropsById(uid: Int): Flow<BundleProperties?>
+    @Query("SELECT version, integrations_version, auto_update FROM patch_bundles WHERE uid = :uid")
+    fun getPropsById(uid: Int): Flow<BundleProperties>
 
-    @Query("UPDATE patch_bundles SET version = :patches WHERE uid = :uid")
-    suspend fun updateVersion(uid: Int, patches: String?)
+    @Query("UPDATE patch_bundles SET version = :patches, integrations_version = :integrations WHERE uid = :uid")
+    suspend fun updateVersion(uid: Int, patches: String?, integrations: String?)
 
     @Query("UPDATE patch_bundles SET auto_update = :value WHERE uid = :uid")
     suspend fun setAutoUpdate(uid: Int, value: Boolean)
 
-    @Query("UPDATE patch_bundles SET name = :value WHERE uid = :uid")
-    suspend fun setName(uid: Int, value: String)
-
     @Query("DELETE FROM patch_bundles WHERE uid != 0")
     suspend fun purgeCustomBundles()
 
     @Transaction
     suspend fun reset() {
         purgeCustomBundles()
-        updateVersion(0, null) // Reset the main source
+        updateVersion(0, null, null) // Reset the main source
     }
 
     @Query("DELETE FROM patch_bundles WHERE uid = :uid")

app/src/main/java/app/revanced/manager/data/room/bundles/PatchBundleEntity.kt

@@ -21,7 +21,7 @@ sealed class Source {
     }
 
     companion object {
-        fun from(value: String) = when (value) {
+        fun from(value: String) = when(value) {
             Local.SENTINEL -> Local
             API.SENTINEL -> API
             else -> Remote(Url(value))
@@ -29,16 +29,21 @@ sealed class Source {
     }
 }
 
-@Entity(tableName = "patch_bundles")
+data class VersionInfo(
+    @ColumnInfo(name = "version") val patches: String? = null,
+    @ColumnInfo(name = "integrations_version") val integrations: String? = null,
+)
+
+@Entity(tableName = "patch_bundles", indices = [Index(value = ["name"], unique = true)])
 data class PatchBundleEntity(
     @PrimaryKey val uid: Int,
     @ColumnInfo(name = "name") val name: String,
-    @ColumnInfo(name = "version") val version: String? = null,
+    @Embedded val versionInfo: VersionInfo,
     @ColumnInfo(name = "source") val source: Source,
     @ColumnInfo(name = "auto_update") val autoUpdate: Boolean
 )
 
 data class BundleProperties(
-    @ColumnInfo(name = "version") val version: String? = null,
+    @Embedded val versionInfo: VersionInfo,
     @ColumnInfo(name = "auto_update") val autoUpdate: Boolean
 )

app/src/main/java/app/revanced/manager/data/room/options/Option.kt

@@ -1,116 +0,0 @@
-package app.revanced.manager.data.room.options
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.ForeignKey
-import app.revanced.manager.patcher.patch.Option
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.SerializationException
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonElement
-import kotlinx.serialization.json.JsonNull
-import kotlinx.serialization.json.JsonPrimitive
-import kotlinx.serialization.json.add
-import kotlinx.serialization.json.boolean
-import kotlinx.serialization.json.buildJsonArray
-import kotlinx.serialization.json.float
-import kotlinx.serialization.json.int
-import kotlinx.serialization.json.jsonArray
-import kotlinx.serialization.json.jsonPrimitive
-import kotlinx.serialization.json.long
-import kotlin.reflect.KClass
-import kotlin.reflect.KType
-import kotlin.reflect.typeOf
-
-@Entity(
-    tableName = "options",
-    primaryKeys = ["group", "patch_name", "key"],
-    foreignKeys = [ForeignKey(
-        OptionGroup::class,
-        parentColumns = ["uid"],
-        childColumns = ["group"],
-        onDelete = ForeignKey.CASCADE
-    )]
-)
-data class Option(
-    @ColumnInfo(name = "group") val group: Int,
-    @ColumnInfo(name = "patch_name") val patchName: String,
-    @ColumnInfo(name = "key") val key: String,
-    // Encoded as Json.
-    @ColumnInfo(name = "value") val value: SerializedValue,
-) {
-    @Serializable
-    data class SerializedValue(val raw: JsonElement) {
-        fun toJsonString() = json.encodeToString(raw)
-        fun deserializeFor(option: Option<*>): Any? {
-            if (raw is JsonNull) return null
-
-            val errorMessage = "Cannot deserialize value as ${option.type}"
-            try {
-                if (option.type.classifier == List::class) {
-                    val elementType = option.type.arguments.first().type!!
-                    return raw.jsonArray.map { deserializeBasicType(elementType, it.jsonPrimitive) }
-                }
-
-                return deserializeBasicType(option.type, raw.jsonPrimitive)
-            } catch (e: IllegalArgumentException) {
-                throw SerializationException(errorMessage, e)
-            } catch (e: IllegalStateException) {
-                throw SerializationException(errorMessage, e)
-            } catch (e: kotlinx.serialization.SerializationException) {
-                throw SerializationException(errorMessage, e)
-            }
-        }
-
-        companion object {
-            private val json = Json {
-                // Patcher does not forbid the use of these values, so we should support them.
-                allowSpecialFloatingPointValues = true
-            }
-
-            private fun deserializeBasicType(type: KType, value: JsonPrimitive) = when (type) {
-                typeOf<Boolean>() -> value.boolean
-                typeOf<Int>() -> value.int
-                typeOf<Long>() -> value.long
-                typeOf<Float>() -> value.float
-                typeOf<String>() -> value.content.also {
-                    if (!value.isString) throw SerializationException(
-                        "Expected value to be a string: $value"
-                    )
-                }
-
-                else -> throw SerializationException("Unknown type: $type")
-            }
-
-            fun fromJsonString(value: String) = SerializedValue(json.decodeFromString(value))
-            fun fromValue(value: Any?) = SerializedValue(when (value) {
-                null -> JsonNull
-                is Number -> JsonPrimitive(value)
-                is Boolean -> JsonPrimitive(value)
-                is String -> JsonPrimitive(value)
-                is List<*> -> buildJsonArray {
-                    var elementClass: KClass<out Any>? = null
-
-                    value.forEach {
-                        when (it) {
-                            null -> throw SerializationException("List elements must not be null")
-                            is Number -> add(it)
-                            is Boolean -> add(it)
-                            is String -> add(it)
-                            else -> throw SerializationException("Unknown element type: ${it::class.simpleName}")
-                        }
-
-                        if (elementClass == null) elementClass = it::class
-                        else if (elementClass != it::class) throw SerializationException("List elements must have the same type")
-                    }
-                }
-
-                else -> throw SerializationException("Unknown type: ${value::class.simpleName}")
-            })
-        }
-    }
-
-    class SerializationException(message: String, cause: Throwable? = null) :
-        Exception(message, cause)
-}

app/src/main/java/app/revanced/manager/data/room/options/OptionDao.kt

@@ -1,50 +0,0 @@
-package app.revanced.manager.data.room.options
-
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.MapColumn
-import androidx.room.Query
-import androidx.room.Transaction
-import kotlinx.coroutines.flow.Flow
-
-@Dao
-abstract class OptionDao {
-    @Transaction
-    @Query(
-        "SELECT patch_bundle, `group`, patch_name, `key`, value FROM option_groups" +
-                " LEFT JOIN options ON uid = options.`group`" +
-                " WHERE package_name = :packageName"
-    )
-    abstract suspend fun getOptions(packageName: String): Map<@MapColumn("patch_bundle") Int, List<Option>>
-
-    @Query("SELECT uid FROM option_groups WHERE patch_bundle = :bundleUid AND package_name = :packageName")
-    abstract suspend fun getGroupId(bundleUid: Int, packageName: String): Int?
-
-    @Query("SELECT package_name FROM option_groups")
-    abstract fun getPackagesWithOptions(): Flow<List<String>>
-
-    @Insert
-    abstract suspend fun createOptionGroup(group: OptionGroup)
-
-    @Query("DELETE FROM option_groups WHERE patch_bundle = :uid")
-    abstract suspend fun clearForPatchBundle(uid: Int)
-
-    @Query("DELETE FROM option_groups WHERE package_name = :packageName")
-    abstract suspend fun clearForPackage(packageName: String)
-
-    @Query("DELETE FROM option_groups")
-    abstract suspend fun reset()
-
-    @Insert
-    protected abstract suspend fun insertOptions(patches: List<Option>)
-
-    @Query("DELETE FROM options WHERE `group` = :groupId")
-    protected abstract suspend fun clearGroup(groupId: Int)
-
-    @Transaction
-    open suspend fun updateOptions(options: Map<Int, List<Option>>) =
-        options.forEach { (groupId, options) ->
-            clearGroup(groupId)
-            insertOptions(options)
-        }
-}

app/src/main/java/app/revanced/manager/data/room/options/OptionGroup.kt

@@ -1,24 +0,0 @@
-package app.revanced.manager.data.room.options
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.ForeignKey
-import androidx.room.Index
-import androidx.room.PrimaryKey
-import app.revanced.manager.data.room.bundles.PatchBundleEntity
-
-@Entity(
-    tableName = "option_groups",
-    foreignKeys = [ForeignKey(
-        PatchBundleEntity::class,
-        parentColumns = ["uid"],
-        childColumns = ["patch_bundle"],
-        onDelete = ForeignKey.CASCADE
-    )],
-    indices = [Index(value = ["patch_bundle", "package_name"], unique = true)]
-)
-data class OptionGroup(
-    @PrimaryKey val uid: Int,
-    @ColumnInfo(name = "patch_bundle") val patchBundle: Int,
-    @ColumnInfo(name = "package_name") val packageName: String
-)

app/src/main/java/app/revanced/manager/data/room/plugins/TrustedDownloaderPlugin.kt

@@ -1,11 +0,0 @@
-package app.revanced.manager.data.room.plugins
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity(tableName = "trusted_downloader_plugins")
-class TrustedDownloaderPlugin(
-    @PrimaryKey @ColumnInfo(name = "package_name") val packageName: String,
-    @ColumnInfo(name = "signature") val signature: ByteArray
-)

app/src/main/java/app/revanced/manager/data/room/plugins/TrustedDownloaderPluginDao.kt

@@ -1,22 +0,0 @@
-package app.revanced.manager.data.room.plugins
-
-import androidx.room.Dao
-import androidx.room.Query
-import androidx.room.Transaction
-import androidx.room.Upsert
-
-@Dao
-interface TrustedDownloaderPluginDao {
-    @Query("SELECT signature FROM trusted_downloader_plugins WHERE package_name = :packageName")
-    suspend fun getTrustedSignature(packageName: String): ByteArray?
-
-    @Upsert
-    suspend fun upsertTrust(plugin: TrustedDownloaderPlugin)
-
-    @Query("DELETE FROM trusted_downloader_plugins WHERE package_name = :packageName")
-    suspend fun remove(packageName: String)
-
-    @Transaction
-    @Query("DELETE FROM trusted_downloader_plugins WHERE package_name IN (:packageNames)")
-    suspend fun removeAll(packageNames: Set<String>)
-}

app/src/main/java/app/revanced/manager/data/room/selection/SelectionDao.kt

@@ -2,31 +2,29 @@ package app.revanced.manager.data.room.selection
 
 import androidx.room.Dao
 import androidx.room.Insert
-import androidx.room.MapColumn
+import androidx.room.MapInfo
 import androidx.room.Query
 import androidx.room.Transaction
 
 @Dao
 abstract class SelectionDao {
     @Transaction
+    @MapInfo(keyColumn = "patch_bundle", valueColumn = "patch_name")
     @Query(
         "SELECT patch_bundle, patch_name FROM patch_selections" +
                 " LEFT JOIN selected_patches ON uid = selected_patches.selection" +
                 " WHERE package_name = :packageName"
     )
-    abstract suspend fun getSelectedPatches(packageName: String): Map<@MapColumn("patch_bundle") Int, List<@MapColumn(
-        "patch_name"
-    ) String>>
+    abstract suspend fun getSelectedPatches(packageName: String): Map<Int, List<String>>
 
     @Transaction
+    @MapInfo(keyColumn = "package_name", valueColumn = "patch_name")
     @Query(
         "SELECT package_name, patch_name FROM patch_selections" +
                 " LEFT JOIN selected_patches ON uid = selected_patches.selection" +
                 " WHERE patch_bundle = :bundleUid"
     )
-    abstract suspend fun exportSelection(bundleUid: Int): Map<@MapColumn("package_name") String, List<@MapColumn(
-        "patch_name"
-    ) String>>
+    abstract suspend fun exportSelection(bundleUid: Int): Map<String, List<String>>
 
     @Query("SELECT uid FROM patch_selections WHERE patch_bundle = :bundleUid AND package_name = :packageName")
     abstract suspend fun getSelectionId(bundleUid: Int, packageName: String): Int?
@@ -37,9 +35,6 @@ abstract class SelectionDao {
     @Query("DELETE FROM patch_selections WHERE patch_bundle = :uid")
     abstract suspend fun clearForPatchBundle(uid: Int)
 
-    @Query("DELETE FROM patch_selections WHERE package_name = :packageName")
-    abstract suspend fun clearForPackage(packageName: String)
-
     @Query("DELETE FROM patch_selections")
     abstract suspend fun reset()
 
@@ -51,7 +46,7 @@ abstract class SelectionDao {
 
     @Transaction
     open suspend fun updateSelections(selections: Map<Int, Set<String>>) =
-        selections.forEach { (selectionUid, patches) ->
+        selections.map { (selectionUid, patches) ->
             clearSelection(selectionUid)
             selectPatches(patches.map { SelectedPatch(selectionUid, it) })
         }

app/src/main/java/app/revanced/manager/di/HttpModule.kt

@@ -1,11 +1,9 @@
 package app.revanced.manager.di
 
 import android.content.Context
-import app.revanced.manager.BuildConfig
 import io.ktor.client.*
 import io.ktor.client.engine.okhttp.*
 import io.ktor.client.plugins.HttpTimeout
-import io.ktor.client.plugins.UserAgent
 import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.serialization.kotlinx.json.*
 import kotlinx.serialization.json.Json
@@ -42,9 +40,6 @@ val httpModule = module {
         install(HttpTimeout) {
             socketTimeoutMillis = 10000
         }
-        install(UserAgent) {
-            agent = "ReVanced-Manager/${BuildConfig.VERSION_CODE}"
-        }
     }
 
     fun provideJson() = Json {

app/src/main/java/app/revanced/manager/di/RepositoryModule.kt

@@ -1,28 +1,21 @@
 package app.revanced.manager.di
 
-import app.revanced.manager.data.platform.Filesystem
+import app.revanced.manager.data.platform.FileSystem
 import app.revanced.manager.data.platform.NetworkInfo
 import app.revanced.manager.domain.repository.*
 import app.revanced.manager.domain.worker.WorkerRepository
 import app.revanced.manager.network.api.ReVancedAPI
-import org.koin.core.module.dsl.createdAtStart
 import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.module
 
 val repositoryModule = module {
     singleOf(::ReVancedAPI)
-    singleOf(::Filesystem) {
-        createdAtStart()
-    }
+    singleOf(::GithubRepository)
+    singleOf(::FileSystem)
     singleOf(::NetworkInfo)
     singleOf(::PatchBundlePersistenceRepository)
     singleOf(::PatchSelectionRepository)
-    singleOf(::PatchOptionsRepository)
-    singleOf(::PatchBundleRepository) {
-        // It is best to load patch bundles ASAP
-        createdAtStart()
-    }
-    singleOf(::DownloaderPluginRepository)
+    singleOf(::PatchBundleRepository)
     singleOf(::WorkerRepository)
     singleOf(::DownloadedAppRepository)
     singleOf(::InstalledAppRepository)

app/src/main/java/app/revanced/manager/di/RootModule.kt

@@ -1,9 +0,0 @@
-package app.revanced.manager.di
-
-import app.revanced.manager.domain.installer.RootInstaller
-import org.koin.core.module.dsl.singleOf
-import org.koin.dsl.module
-
-val rootModule = module {
-    singleOf(::RootInstaller)
-}

app/src/main/java/app/revanced/manager/di/ServiceModule.kt

@@ -1,9 +1,21 @@
 package app.revanced.manager.di
 
+import app.revanced.manager.network.service.GithubService
 import app.revanced.manager.network.service.HttpService
+import app.revanced.manager.network.service.ReVancedService
 import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.module
 
 val serviceModule = module {
+    fun provideReVancedService(
+        client: HttpService,
+    ): ReVancedService {
+        return ReVancedService(
+            client = client,
+        )
+    }
+
+    single { provideReVancedService(get()) }
     singleOf(::HttpService)
+    singleOf(::GithubService)
 }

app/src/main/java/app/revanced/manager/di/ViewModelModule.kt

@@ -7,20 +7,18 @@ import org.koin.dsl.module
 val viewModelModule = module {
     viewModelOf(::MainViewModel)
     viewModelOf(::DashboardViewModel)
-    viewModelOf(::SelectedAppInfoViewModel)
     viewModelOf(::PatchesSelectorViewModel)
-    viewModelOf(::GeneralSettingsViewModel)
+    viewModelOf(::SettingsViewModel)
     viewModelOf(::AdvancedSettingsViewModel)
     viewModelOf(::AppSelectorViewModel)
-    viewModelOf(::PatcherViewModel)
-    viewModelOf(::UpdateViewModel)
-    viewModelOf(::ChangelogsViewModel)
+    viewModelOf(::VersionSelectorViewModel)
+    viewModelOf(::BundlesViewModel)
+    viewModelOf(::InstallerViewModel)
+    viewModelOf(::UpdateProgressViewModel)
+    viewModelOf(::ManagerUpdateChangelogViewModel)
     viewModelOf(::ImportExportViewModel)
-    viewModelOf(::AboutViewModel)
-    viewModelOf(::DeveloperOptionsViewModel)
     viewModelOf(::ContributorViewModel)
     viewModelOf(::DownloadsViewModel)
     viewModelOf(::InstalledAppsViewModel)
-    viewModelOf(::InstalledAppInfoViewModel)
-    viewModelOf(::UpdatesSettingsViewModel)
+    viewModelOf(::AppInfoViewModel)
 }

app/src/main/java/app/revanced/manager/domain/bundles/LocalPatchBundle.kt

@@ -4,18 +4,20 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.File
 import java.io.InputStream
+import java.nio.file.Files
+import java.nio.file.StandardCopyOption
 
-class LocalPatchBundle(name: String, id: Int, directory: File) :
-    PatchBundleSource(name, id, directory) {
-    suspend fun replace(patches: InputStream) {
+class LocalPatchBundle(name: String, id: Int, directory: File) : PatchBundleSource(name, id, directory) {
+    suspend fun replace(patches: InputStream? = null, integrations: InputStream? = null) {
         withContext(Dispatchers.IO) {
-            patchBundleOutputStream().use { outputStream ->
-                patches.copyTo(outputStream)
+            patches?.let {
+                Files.copy(it, patchesFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
+            }
+            integrations?.let {
+                Files.copy(it, this@LocalPatchBundle.integrationsFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
             }
         }
 
-        reload()?.also {
-            saveVersion(it.readManifestAttribute("Version"))
-        }
+        reload()
     }
 }

app/src/main/java/app/revanced/manager/domain/bundles/PatchBundleSource.kt

@@ -1,114 +1,55 @@
 package app.revanced.manager.domain.bundles
 
-import android.app.Application
-import android.util.Log
-import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import app.revanced.manager.R
-import app.revanced.manager.domain.repository.PatchBundlePersistenceRepository
 import app.revanced.manager.patcher.patch.PatchBundle
-import app.revanced.manager.util.tag
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.map
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
+import kotlinx.coroutines.flow.flowOf
 import java.io.File
-import java.io.OutputStream
 
 /**
  * A [PatchBundle] source.
  */
 @Stable
-sealed class PatchBundleSource(initialName: String, val uid: Int, directory: File) : KoinComponent {
-    protected val configRepository: PatchBundlePersistenceRepository by inject()
-    private val app: Application by inject()
+sealed class PatchBundleSource(val name: String, val uid: Int, directory: File) {
     protected val patchesFile = directory.resolve("patches.jar")
+    protected val integrationsFile = directory.resolve("integrations.apk")
 
     private val _state = MutableStateFlow(load())
     val state = _state.asStateFlow()
 
-    private val _nameFlow = MutableStateFlow(initialName)
-    val nameFlow =
-        _nameFlow.map { it.ifEmpty { app.getString(if (isDefault) R.string.bundle_name_default else R.string.bundle_name_fallback) } }
-
-    suspend fun getName() = nameFlow.first()
-
     /**
      * Returns true if the bundle has been downloaded to local storage.
      */
     fun hasInstalled() = patchesFile.exists()
 
-    protected fun patchBundleOutputStream(): OutputStream = with(patchesFile) {
-        // Android 14+ requires dex containers to be readonly.
-        try {
-            setWritable(true, true)
-            outputStream()
-        } finally {
-            setReadOnly()
-        }
-    }
-
     private fun load(): State {
         if (!hasInstalled()) return State.Missing
 
         return try {
-            State.Loaded(PatchBundle(patchesFile))
+            State.Loaded(PatchBundle(patchesFile, integrationsFile.takeIf(File::exists)))
         } catch (t: Throwable) {
-            Log.e(tag, "Failed to load patch bundle with UID $uid", t)
             State.Failed(t)
         }
     }
 
-    suspend fun reload(): PatchBundle? {
-        val newState = load()
-        _state.value = newState
-
-        val bundle = newState.patchBundleOrNull()
-        // Try to read the name from the patch bundle manifest if the bundle does not have a name.
-        if (bundle != null && _nameFlow.value.isEmpty()) {
-            bundle.readManifestAttribute("Name")?.let { setName(it) }
-        }
-
-        return bundle
-    }
-
-    /**
-     * Create a flow that emits the [app.revanced.manager.data.room.bundles.BundleProperties] of this [PatchBundleSource].
-     * The flow will emit null if the associated [PatchBundleSource] is deleted.
-     */
-    fun propsFlow() = configRepository.getProps(uid).flowOn(Dispatchers.Default)
-    suspend fun getProps() = propsFlow().first()!!
-
-    suspend fun currentVersion() = getProps().version
-    protected suspend fun saveVersion(version: String?) =
-        configRepository.updateVersion(uid, version)
-
-    suspend fun setName(name: String) {
-        configRepository.setName(uid, name)
-        _nameFlow.value = name
+    fun reload() {
+        _state.value = load()
     }
 
     sealed interface State {
         fun patchBundleOrNull(): PatchBundle? = null
 
-        data object Missing : State
+        object Missing : State
         data class Failed(val throwable: Throwable) : State
         data class Loaded(val bundle: PatchBundle) : State {
             override fun patchBundleOrNull() = bundle
         }
     }
 
-    companion object Extensions {
-        val PatchBundleSource.isDefault inline get() = uid == 0
-        val PatchBundleSource.asRemoteOrNull inline get() = this as? RemotePatchBundle
-        val PatchBundleSource.nameState
-            @Composable inline get() = nameFlow.collectAsStateWithLifecycle(
-                ""
-            )
+    companion object {
+        val PatchBundleSource.isDefault get() = uid == 0
+        val PatchBundleSource.asRemoteOrNull get() = this as? RemotePatchBundle
+        fun PatchBundleSource.propsOrNullFlow() = asRemoteOrNull?.propsFlow() ?: flowOf(null)
     }
 }

app/src/main/java/app/revanced/manager/domain/bundles/RemotePatchBundle.kt

@@ -1,31 +1,51 @@
 package app.revanced.manager.domain.bundles
 
 import androidx.compose.runtime.Stable
+import app.revanced.manager.data.room.bundles.VersionInfo
+import app.revanced.manager.domain.repository.PatchBundlePersistenceRepository
 import app.revanced.manager.network.api.ReVancedAPI
-import app.revanced.manager.network.dto.ReVancedAsset
+import app.revanced.manager.network.api.ReVancedAPI.Extensions.findAssetByType
+import app.revanced.manager.network.dto.BundleAsset
+import app.revanced.manager.network.dto.BundleInfo
 import app.revanced.manager.network.service.HttpService
 import app.revanced.manager.network.utils.getOrThrow
+import app.revanced.manager.util.APK_MIMETYPE
+import app.revanced.manager.util.JAR_MIMETYPE
 import io.ktor.client.request.url
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import java.io.File
 
 @Stable
 sealed class RemotePatchBundle(name: String, id: Int, directory: File, val endpoint: String) :
-    PatchBundleSource(name, id, directory) {
+    PatchBundleSource(name, id, directory), KoinComponent {
+    private val configRepository: PatchBundlePersistenceRepository by inject()
     protected val http: HttpService by inject()
 
-    protected abstract suspend fun getLatestInfo(): ReVancedAsset
+    protected abstract suspend fun getLatestInfo(): BundleInfo
 
-    private suspend fun download(info: ReVancedAsset) = withContext(Dispatchers.IO) {
-        patchBundleOutputStream().use {
-            http.streamTo(it) {
-                url(info.downloadUrl)
+    private suspend fun download(info: BundleInfo) = withContext(Dispatchers.IO) {
+        val (patches, integrations) = info
+        coroutineScope {
+            mapOf(
+                patches.url to patchesFile,
+                integrations.url to integrationsFile
+            ).forEach { (asset, file) ->
+                launch {
+                    http.download(file) {
+                        url(asset)
+                    }
+                }
             }
         }
 
-        saveVersion(info.version)
+        saveVersion(patches.version, integrations.version)
         reload()
     }
 
@@ -35,18 +55,29 @@ sealed class RemotePatchBundle(name: String, id: Int, directory: File, val endpo
 
     suspend fun update(): Boolean = withContext(Dispatchers.IO) {
         val info = getLatestInfo()
-        if (hasInstalled() && info.version == currentVersion())
+        if (hasInstalled() && VersionInfo(
+                info.patches.version,
+                info.integrations.version
+            ) == currentVersion()
+        ) {
             return@withContext false
+        }
 
         download(info)
         true
     }
 
+    private suspend fun currentVersion() = configRepository.getProps(uid).first().versionInfo
+    private suspend fun saveVersion(patches: String, integrations: String) =
+        configRepository.updateVersion(uid, patches, integrations)
+
     suspend fun deleteLocalFiles() = withContext(Dispatchers.Default) {
-        patchesFile.delete()
+        arrayOf(patchesFile, integrationsFile).forEach(File::delete)
         reload()
     }
 
+    fun propsFlow() = configRepository.getProps(uid)
+
     suspend fun setAutoUpdate(value: Boolean) = configRepository.setAutoUpdate(uid, value)
 
     companion object {
@@ -57,7 +88,7 @@ sealed class RemotePatchBundle(name: String, id: Int, directory: File, val endpo
 class JsonPatchBundle(name: String, id: Int, directory: File, endpoint: String) :
     RemotePatchBundle(name, id, directory, endpoint) {
     override suspend fun getLatestInfo() = withContext(Dispatchers.IO) {
-        http.request<ReVancedAsset> {
+        http.request<BundleInfo> {
             url(endpoint)
         }.getOrThrow()
     }
@@ -67,5 +98,22 @@ class APIPatchBundle(name: String, id: Int, directory: File, endpoint: String) :
     RemotePatchBundle(name, id, directory, endpoint) {
     private val api: ReVancedAPI by inject()
 
-    override suspend fun getLatestInfo() = api.getPatchesUpdate().getOrThrow()
+    override suspend fun getLatestInfo() = coroutineScope {
+        fun getAssetAsync(repo: String, mime: String) = async(Dispatchers.IO) {
+            api
+                .getRelease(repo)
+                .getOrThrow()
+                .let {
+                    BundleAsset(it.metadata.tag, it.findAssetByType(mime).downloadUrl)
+                }
+        }
+
+        val patches = getAssetAsync("revanced-patches", JAR_MIMETYPE)
+        val integrations = getAssetAsync("revanced-integrations", APK_MIMETYPE)
+
+        BundleInfo(
+            patches.await(),
+            integrations.await()
+        )
+    }
 }

app/src/main/java/app/revanced/manager/domain/installer/RootInstaller.kt

@@ -1,181 +0,0 @@
-package app.revanced.manager.domain.installer
-
-import android.app.Application
-import android.content.ComponentName
-import android.content.Intent
-import android.content.ServiceConnection
-import android.os.IBinder
-import app.revanced.manager.IRootSystemService
-import app.revanced.manager.service.ManagerRootService
-import app.revanced.manager.util.PM
-import com.topjohnwu.superuser.Shell
-import com.topjohnwu.superuser.ipc.RootService
-import com.topjohnwu.superuser.nio.FileSystemManager
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.time.withTimeoutOrNull
-import kotlinx.coroutines.withContext
-import java.io.File
-import java.time.Duration
-
-class RootInstaller(
-    private val app: Application,
-    private val pm: PM
-) : ServiceConnection {
-    private var remoteFS = CompletableDeferred<FileSystemManager>()
-
-    override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
-        val ipc = IRootSystemService.Stub.asInterface(service)
-        val binder = ipc.fileSystemService
-
-        remoteFS.complete(FileSystemManager.getRemote(binder))
-    }
-
-    override fun onServiceDisconnected(name: ComponentName?) {
-        remoteFS = CompletableDeferred()
-    }
-
-    private suspend fun awaitRemoteFS(): FileSystemManager {
-        if (remoteFS.isActive) {
-            withContext(Dispatchers.Main) {
-                val intent = Intent(app, ManagerRootService::class.java)
-                RootService.bind(intent, this@RootInstaller)
-            }
-        }
-
-        return withTimeoutOrNull(Duration.ofSeconds(20L)) {
-            remoteFS.await()
-        } ?: throw RootServiceException()
-    }
-
-    private suspend fun getShell() = with(CompletableDeferred<Shell>()) {
-        Shell.getShell(::complete)
-
-        await()
-    }
-
-    suspend fun execute(vararg commands: String) = getShell().newJob().add(*commands).exec()
-
-    fun hasRootAccess() = Shell.isAppGrantedRoot() ?: false
-
-    fun isDeviceRooted() = System.getenv("PATH")?.split(":")?.any { path ->
-        File(path, "su").canExecute()
-    } ?: false
-
-    suspend fun isAppInstalled(packageName: String) =
-        awaitRemoteFS().getFile("$modulesPath/$packageName-revanced").exists()
-
-    suspend fun isAppMounted(packageName: String) = withContext(Dispatchers.IO) {
-        pm.getPackageInfo(packageName)?.applicationInfo?.sourceDir?.let {
-            execute("mount | grep \"$it\"").isSuccess
-        } ?: false
-    }
-
-    suspend fun mount(packageName: String) {
-        if (isAppMounted(packageName)) return
-
-        withContext(Dispatchers.IO) {
-            val stockAPK = pm.getPackageInfo(packageName)?.applicationInfo?.sourceDir
-                ?: throw Exception("Failed to load application info")
-            val patchedAPK = "$modulesPath/$packageName-revanced/$packageName.apk"
-
-            execute("mount -o bind \"$patchedAPK\" \"$stockAPK\"").assertSuccess("Failed to mount APK")
-        }
-    }
-
-    suspend fun unmount(packageName: String) {
-        if (!isAppMounted(packageName)) return
-
-        withContext(Dispatchers.IO) {
-            val stockAPK = pm.getPackageInfo(packageName)?.applicationInfo?.sourceDir
-                ?: throw Exception("Failed to load application info")
-
-            execute("umount -l \"$stockAPK\"").assertSuccess("Failed to unmount APK")
-        }
-    }
-
-    suspend fun install(
-        patchedAPK: File,
-        stockAPK: File?,
-        packageName: String,
-        version: String,
-        label: String
-    ) = withContext(Dispatchers.IO) {
-        val remoteFS = awaitRemoteFS()
-        val assets = app.assets
-        val modulePath = "$modulesPath/$packageName-revanced"
-
-        unmount(packageName)
-
-        stockAPK?.let { stockApp ->
-            pm.getPackageInfo(packageName)?.let { packageInfo ->
-                // TODO: get user id programmatically
-                if (pm.getVersionCode(packageInfo) <= pm.getVersionCode(
-                        pm.getPackageInfo(patchedAPK)
-                            ?: error("Failed to get package info for patched app")
-                    )
-                )
-                    execute("pm uninstall -k --user 0 $packageName").assertSuccess("Failed to uninstall stock app")
-            }
-
-            execute("pm install \"${stockApp.absolutePath}\"").assertSuccess("Failed to install stock app")
-        }
-
-        remoteFS.getFile(modulePath).mkdir()
-
-        listOf(
-            "service.sh",
-            "module.prop",
-        ).forEach { file ->
-            assets.open("root/$file").use { inputStream ->
-                remoteFS.getFile("$modulePath/$file").newOutputStream()
-                    .use { outputStream ->
-                        val content = String(inputStream.readBytes())
-                            .replace("__PKG_NAME__", packageName)
-                            .replace("__VERSION__", version)
-                            .replace("__LABEL__", label)
-                            .toByteArray()
-
-                        outputStream.write(content)
-                    }
-            }
-        }
-
-        "$modulePath/$packageName.apk".let { apkPath ->
-
-            remoteFS.getFile(patchedAPK.absolutePath)
-                .also { if (!it.exists()) throw Exception("File doesn't exist") }
-                .newInputStream().use { inputStream ->
-                    remoteFS.getFile(apkPath).newOutputStream().use { outputStream ->
-                        inputStream.copyTo(outputStream)
-                    }
-                }
-
-            execute(
-                "chmod 644 $apkPath",
-                "chown system:system $apkPath",
-                "chcon u:object_r:apk_data_file:s0 $apkPath",
-                "chmod +x $modulePath/service.sh"
-            ).assertSuccess("Failed to set file permissions")
-        }
-    }
-
-    suspend fun uninstall(packageName: String) {
-        val remoteFS = awaitRemoteFS()
-        if (isAppMounted(packageName))
-            unmount(packageName)
-
-        remoteFS.getFile("$modulesPath/$packageName-revanced").deleteRecursively()
-            .also { if (!it) throw Exception("Failed to delete files") }
-    }
-
-    companion object {
-        const val modulesPath = "/data/adb/modules"
-
-        private fun Shell.Result.assertSuccess(errorMessage: String) {
-            if (!isSuccess) throw Exception(errorMessage)
-        }
-    }
-}
-
-class RootServiceException : Exception("Root not available")

app/src/main/java/app/revanced/manager/domain/manager/KeystoreManager.kt

@@ -2,83 +2,57 @@ package app.revanced.manager.domain.manager
 
 import android.app.Application
 import android.content.Context
-import app.revanced.library.ApkSigner
-import app.revanced.library.ApkUtils
+import app.revanced.manager.util.signing.Signer
+import app.revanced.manager.util.signing.SigningOptions
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import java.io.ByteArrayInputStream
 import java.io.File
-import java.io.InputStream
 import java.io.OutputStream
 import java.nio.file.Files
-import java.security.UnrecoverableKeyException
-import java.util.Date
-import kotlin.time.Duration.Companion.days
+import java.nio.file.Path
+import java.nio.file.StandardCopyOption
+import kotlin.io.path.exists
 
 class KeystoreManager(app: Application, private val prefs: PreferencesManager) {
-    companion object Constants {
+    companion object {
         /**
          * Default alias and password for the keystore.
          */
         const val DEFAULT = "ReVanced"
-        private val eightYearsFromNow get() = Date(System.currentTimeMillis() + (365.days * 8).inWholeMilliseconds * 24)
     }
 
     private val keystorePath =
-        app.getDir("signing", Context.MODE_PRIVATE).resolve("manager.keystore")
+        app.getDir("signing", Context.MODE_PRIVATE).resolve("manager.keystore").toPath()
 
     private suspend fun updatePrefs(cn: String, pass: String) = prefs.edit {
         prefs.keystoreCommonName.value = cn
         prefs.keystorePass.value = pass
     }
 
-    private suspend fun signingDetails(path: File = keystorePath) = ApkUtils.KeyStoreDetails(
-        keyStore = path,
-        keyStorePassword = null,
-        alias = prefs.keystoreCommonName.get(),
-        password = prefs.keystorePass.get()
-    )
-
     suspend fun sign(input: File, output: File) = withContext(Dispatchers.Default) {
-        ApkUtils.signApk(input, output, prefs.keystoreCommonName.get(), signingDetails())
+        Signer(
+            SigningOptions(
+                prefs.keystoreCommonName.get(),
+                prefs.keystorePass.get(),
+                keystorePath
+            )
+        ).signApk(
+            input,
+            output
+        )
     }
 
     suspend fun regenerate() = withContext(Dispatchers.Default) {
-        val keyCertPair = ApkSigner.newPrivateKeyCertificatePair(
-            prefs.keystoreCommonName.get(),
-            eightYearsFromNow
-        )
-        val ks = ApkSigner.newKeyStore(
-            setOf(
-                ApkSigner.KeyStoreEntry(
-                    DEFAULT, DEFAULT, keyCertPair
-                )
-            )
-        )
-        withContext(Dispatchers.IO) {
-            keystorePath.outputStream().use {
-                ks.store(it, null)
-            }
-        }
-
+        Signer(SigningOptions(DEFAULT, DEFAULT, keystorePath)).regenerateKeystore()
         updatePrefs(DEFAULT, DEFAULT)
     }
 
-    suspend fun import(cn: String, pass: String, keystore: InputStream): Boolean {
-        val keystoreData = withContext(Dispatchers.IO) { keystore.readBytes() }
-
-        try {
-            val ks = ApkSigner.readKeyStore(ByteArrayInputStream(keystoreData), null)
-
-            ApkSigner.readPrivateKeyCertificatePair(ks, cn, pass)
-        } catch (_: UnrecoverableKeyException) {
-            return false
-        } catch (_: IllegalArgumentException) {
+    suspend fun import(cn: String, pass: String, keystore: Path): Boolean {
+        if (!Signer(SigningOptions(cn, pass, keystore)).canUnlock()) {
             return false
         }
-
         withContext(Dispatchers.IO) {
-            Files.write(keystorePath.toPath(), keystoreData)
+            Files.copy(keystore, keystorePath, StandardCopyOption.REPLACE_EXISTING)
         }
 
         updatePrefs(cn, pass)
@@ -89,7 +63,7 @@ class KeystoreManager(app: Application, private val prefs: PreferencesManager) {
 
     suspend fun export(target: OutputStream) {
         withContext(Dispatchers.IO) {
-            Files.copy(keystorePath.toPath(), target)
+            Files.copy(keystorePath, target)
         }
     }
 }

app/src/main/java/app/revanced/manager/domain/manager/PreferencesManager.kt

@@ -12,20 +12,13 @@ class PreferencesManager(
 
     val api = stringPreference("api_url", "https://api.revanced.app")
 
-    val useProcessRuntime = booleanPreference("use_process_runtime", false)
-    val patcherProcessMemoryLimit = intPreference("process_runtime_memory_limit", 700)
+    val allowExperimental = booleanPreference("allow_experimental", false)
 
     val keystoreCommonName = stringPreference("keystore_cn", KeystoreManager.DEFAULT)
     val keystorePass = stringPreference("keystore_pass", KeystoreManager.DEFAULT)
 
-    val firstLaunch = booleanPreference("first_launch", true)
+    val preferSplits = booleanPreference("prefer_splits", false)
+
+    val showAutoUpdatesDialog = booleanPreference("show_auto_updates_dialog", true)
     val managerAutoUpdates = booleanPreference("manager_auto_updates", false)
-    val showManagerUpdateDialogOnLaunch = booleanPreference("show_manager_update_dialog_on_launch", true)
-
-    val disablePatchVersionCompatCheck = booleanPreference("disable_patch_version_compatibility_check", false)
-    val disableSelectionWarning = booleanPreference("disable_selection_warning", false)
-    val disableUniversalPatchWarning = booleanPreference("disable_universal_patch_warning", false)
-    val suggestedVersionSafeguard = booleanPreference("suggested_version_safeguard", true)
-
-    val acknowledgedDownloaderPlugins = stringSetPreference("acknowledged_downloader_plugins", emptySet())
 }

app/src/main/java/app/revanced/manager/domain/manager/base/BasePreferencesManager.kt

@@ -26,9 +26,6 @@ abstract class BasePreferencesManager(private val context: Context, name: String
     protected fun stringPreference(key: String, default: String) =
         StringPreference(dataStore, key, default)
 
-    protected fun stringSetPreference(key: String, default: Set<String>) =
-        StringSetPreference(dataStore, key, default)
-
     protected fun booleanPreference(key: String, default: Boolean) =
         BooleanPreference(dataStore, key, default)
 
@@ -55,15 +52,11 @@ class EditorContext(private val prefs: MutablePreferences) {
     var <T> Preference<T>.value
         get() = prefs.run { read() }
         set(value) = prefs.run { write(value) }
-
-    operator fun Preference<Set<String>>.plusAssign(value: String) = prefs.run {
-        write(read() + value)
-    }
 }
 
 abstract class Preference<T>(
     private val dataStore: DataStore<Preferences>,
-    val default: T
+    protected val default: T
 ) {
     internal abstract fun Preferences.read(): T
     internal abstract fun MutablePreferences.write(value: T)
@@ -72,12 +65,10 @@ abstract class Preference<T>(
 
     suspend fun get() = flow.first()
     fun getBlocking() = runBlocking { get() }
-
     @Composable
     fun getAsState() = flow.collectAsStateWithLifecycle(initialValue = remember {
         getBlocking()
     })
-
     suspend fun update(value: T) = dataStore.editor {
         this@Preference.value = value
     }
@@ -117,14 +108,6 @@ class StringPreference(
     override val key = stringPreferencesKey(key)
 }
 
-class StringSetPreference(
-    dataStore: DataStore<Preferences>,
-    key: String,
-    default: Set<String>
-) : BasePreference<Set<String>>(dataStore, default) {
-    override val key = stringSetPreferencesKey(key)
-}
-
 class BooleanPreference(
     dataStore: DataStore<Preferences>,
     key: String,

app/src/main/java/app/revanced/manager/domain/repository/DownloadedAppRepository.kt

@@ -1,131 +1,34 @@
 package app.revanced.manager.domain.repository
 
-import android.app.Application
-import android.content.Context
-import android.os.Parcelable
 import app.revanced.manager.data.room.AppDatabase
-import app.revanced.manager.data.room.AppDatabase.Companion.generateUid
 import app.revanced.manager.data.room.apps.downloaded.DownloadedApp
-import app.revanced.manager.network.downloader.LoadedDownloaderPlugin
-import app.revanced.manager.plugin.downloader.OutputDownloadScope
-import app.revanced.manager.util.PM
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.channelFlow
-import kotlinx.coroutines.flow.conflate
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.flowOn
 import java.io.File
-import java.io.FilterOutputStream
-import java.nio.file.StandardOpenOption
-import java.util.concurrent.atomic.AtomicLong
-import kotlin.io.path.outputStream
 
 class DownloadedAppRepository(
-    private val app: Application,
-    db: AppDatabase,
-    private val pm: PM
+    db: AppDatabase
 ) {
-    private val dir = app.getDir("downloaded-apps", Context.MODE_PRIVATE)
     private val dao = db.downloadedAppDao()
 
     fun getAll() = dao.getAllApps().distinctUntilChanged()
 
-    fun getApkFileForApp(app: DownloadedApp): File =
-        getApkFileForDir(dir.resolve(app.directory))
+    suspend fun get(packageName: String, version: String) = dao.get(packageName, version)
 
-    private fun getApkFileForDir(directory: File) = directory.listFiles()!!.first()
-
-    suspend fun download(
-        plugin: LoadedDownloaderPlugin,
-        data: Parcelable,
-        expectedPackageName: String,
-        expectedVersion: String?,
-        onDownload: suspend (downloadProgress: Pair<Long, Long?>) -> Unit,
-    ): File {
-        // Converted integers cannot contain / or .. unlike the package name or version, so they are safer to use here.
-        val relativePath = File(generateUid().toString())
-        val saveDir = dir.resolve(relativePath).also { it.mkdirs() }
-        val targetFile = saveDir.resolve("base.apk").toPath()
-
-        try {
-            val downloadSize = AtomicLong(0)
-            val downloadedBytes = AtomicLong(0)
-
-            channelFlow {
-                val scope = object : OutputDownloadScope {
-                    override val pluginPackageName = plugin.packageName
-                    override val hostPackageName = app.packageName
-                    override suspend fun reportSize(size: Long) {
-                        require(size > 0) { "Size must be greater than zero" }
-                        require(
-                            downloadSize.compareAndSet(
-                                0,
-                                size
-                            )
-                        ) { "Download size has already been set" }
-                        send(downloadedBytes.get() to size)
-                    }
-                }
-
-                fun emitProgress(bytes: Long) {
-                    val newValue = downloadedBytes.addAndGet(bytes)
-                    val totalSize = downloadSize.get()
-                    if (totalSize < 1) return
-                    trySend(newValue to totalSize).getOrThrow()
-                }
-
-                targetFile.outputStream(StandardOpenOption.CREATE_NEW).buffered().use {
-                    val stream = object : FilterOutputStream(it) {
-                        override fun write(b: Int) = out.write(b).also { emitProgress(1) }
-
-                        override fun write(b: ByteArray?, off: Int, len: Int) =
-                            out.write(b, off, len).also {
-                                emitProgress(
-                                    (len - off).toLong()
-                                )
-                            }
-                    }
-                    plugin.download(scope, data, stream)
-                }
-            }
-                .conflate()
-                .flowOn(Dispatchers.IO)
-                .collect { (downloaded, size) -> onDownload(downloaded to size) }
-
-            if (downloadedBytes.get() < 1) error("Downloader did not download anything.")
-            val pkgInfo =
-                pm.getPackageInfo(targetFile.toFile()) ?: error("Downloaded APK file is invalid")
-            if (pkgInfo.packageName != expectedPackageName) error("Downloaded APK has the wrong package name. Expected: $expectedPackageName, Actual: ${pkgInfo.packageName}")
-            if (expectedVersion != null && pkgInfo.versionName != expectedVersion) error("Downloaded APK has the wrong version. Expected: $expectedVersion, Actual: ${pkgInfo.versionName}")
-
-            // Delete the previous copy (if present).
-            dao.get(pkgInfo.packageName, pkgInfo.versionName!!)?.directory?.let {
-                if (!dir.resolve(it).deleteRecursively()) throw Exception("Failed to delete existing directory")
-            }
-            dao.upsert(
-                DownloadedApp(
-                    packageName = pkgInfo.packageName,
-                    version = pkgInfo.versionName!!,
-                    directory = relativePath,
-                )
-            )
-        } catch (e: Exception) {
-            saveDir.deleteRecursively()
-            throw e
-        }
-
-        // Return the Apk file.
-        return getApkFileForDir(saveDir)
-    }
-
-    suspend fun get(packageName: String, version: String, markUsed: Boolean = false) =
-        dao.get(packageName, version)?.also {
-            if (markUsed) dao.markUsed(packageName, version)
-        }
+    suspend fun add(
+        packageName: String,
+        version: String,
+        file: File
+    ) = dao.insert(
+        DownloadedApp(
+            packageName = packageName,
+            version = version,
+            file = file
+        )
+    )
 
     suspend fun delete(downloadedApps: Collection<DownloadedApp>) {
         downloadedApps.forEach {
-            dir.resolve(it.directory).deleteRecursively()
+            it.file.deleteRecursively()
         }
 
         dao.delete(downloadedApps)

app/src/main/java/app/revanced/manager/domain/repository/DownloaderPluginRepository.kt

@@ -1,168 +0,0 @@
-package app.revanced.manager.domain.repository
-
-import android.app.Application
-import android.content.pm.PackageManager
-import android.os.Parcelable
-import android.util.Log
-import app.revanced.manager.data.room.AppDatabase
-import app.revanced.manager.data.room.plugins.TrustedDownloaderPlugin
-import app.revanced.manager.domain.manager.PreferencesManager
-import app.revanced.manager.network.downloader.DownloaderPluginState
-import app.revanced.manager.network.downloader.LoadedDownloaderPlugin
-import app.revanced.manager.network.downloader.ParceledDownloaderData
-import app.revanced.manager.plugin.downloader.DownloaderBuilder
-import app.revanced.manager.plugin.downloader.PluginHostApi
-import app.revanced.manager.plugin.downloader.Scope
-import app.revanced.manager.util.PM
-import app.revanced.manager.util.tag
-import dalvik.system.PathClassLoader
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.withContext
-import java.lang.reflect.Modifier
-
-@OptIn(PluginHostApi::class)
-class DownloaderPluginRepository(
-    private val pm: PM,
-    private val prefs: PreferencesManager,
-    private val app: Application,
-    db: AppDatabase
-) {
-    private val trustDao = db.trustedDownloaderPluginDao()
-    private val _pluginStates = MutableStateFlow(emptyMap<String, DownloaderPluginState>())
-    val pluginStates = _pluginStates.asStateFlow()
-    val loadedPluginsFlow = pluginStates.map { states ->
-        states.values.filterIsInstance<DownloaderPluginState.Loaded>().map { it.plugin }
-    }
-
-    private val acknowledgedDownloaderPlugins = prefs.acknowledgedDownloaderPlugins
-    private val installedPluginPackageNames = MutableStateFlow(emptySet<String>())
-    val newPluginPackageNames = combine(
-        installedPluginPackageNames,
-        acknowledgedDownloaderPlugins.flow
-    ) { installed, acknowledged ->
-        installed subtract acknowledged
-    }
-
-    suspend fun reload() {
-        val plugins =
-            withContext(Dispatchers.IO) {
-                pm.getPackagesWithFeature(PLUGIN_FEATURE)
-                    .associate { it.packageName to loadPlugin(it.packageName) }
-            }
-
-        _pluginStates.value = plugins
-        installedPluginPackageNames.value = plugins.keys
-
-        val acknowledgedPlugins = acknowledgedDownloaderPlugins.get()
-        val uninstalledPlugins = acknowledgedPlugins subtract installedPluginPackageNames.value
-        if (uninstalledPlugins.isNotEmpty()) {
-            Log.d(tag, "Uninstalled plugins: ${uninstalledPlugins.joinToString(", ")}")
-            acknowledgedDownloaderPlugins.update(acknowledgedPlugins subtract uninstalledPlugins)
-            trustDao.removeAll(uninstalledPlugins)
-        }
-    }
-
-    fun unwrapParceledData(data: ParceledDownloaderData): Pair<LoadedDownloaderPlugin, Parcelable> {
-        val plugin =
-            (_pluginStates.value[data.pluginPackageName] as? DownloaderPluginState.Loaded)?.plugin
-                ?: throw Exception("Downloader plugin with name ${data.pluginPackageName} is not available")
-
-        return plugin to data.unwrapWith(plugin)
-    }
-
-    private suspend fun loadPlugin(packageName: String): DownloaderPluginState {
-        try {
-            if (!verify(packageName)) return DownloaderPluginState.Untrusted
-        } catch (e: CancellationException) {
-            throw e
-        } catch (e: Exception) {
-            Log.e(tag, "Got exception while verifying plugin $packageName", e)
-            return DownloaderPluginState.Failed(e)
-        }
-
-        return try {
-            val packageInfo = pm.getPackageInfo(packageName, flags = PackageManager.GET_META_DATA)!!
-            val className = packageInfo.applicationInfo!!.metaData.getString(METADATA_PLUGIN_CLASS)
-                ?: throw Exception("Missing metadata attribute $METADATA_PLUGIN_CLASS")
-
-            val classLoader =
-                PathClassLoader(packageInfo.applicationInfo!!.sourceDir, app.classLoader)
-            val pluginContext = app.createPackageContext(packageName, 0)
-
-            val downloader = classLoader
-                .loadClass(className)
-                .getDownloaderBuilder()
-                .build(
-                    scopeImpl = object : Scope {
-                        override val hostPackageName = app.packageName
-                        override val pluginPackageName = pluginContext.packageName
-                    },
-                    context = pluginContext
-                )
-
-            DownloaderPluginState.Loaded(
-                LoadedDownloaderPlugin(
-                    packageName,
-                    with(pm) { packageInfo.label() },
-                    packageInfo.versionName!!,
-                    downloader.get,
-                    downloader.download,
-                    classLoader
-                )
-            )
-        } catch (e: CancellationException) {
-            throw e
-        } catch (t: Throwable) {
-            Log.e(tag, "Failed to load plugin $packageName", t)
-            DownloaderPluginState.Failed(t)
-        }
-    }
-
-    suspend fun trustPackage(packageName: String) {
-        trustDao.upsertTrust(
-            TrustedDownloaderPlugin(
-                packageName,
-                pm.getSignature(packageName).toByteArray()
-            )
-        )
-
-        reload()
-        prefs.edit {
-            acknowledgedDownloaderPlugins += packageName
-        }
-    }
-
-    suspend fun revokeTrustForPackage(packageName: String) =
-        trustDao.remove(packageName).also { reload() }
-
-    suspend fun acknowledgeAllNewPlugins() =
-        acknowledgedDownloaderPlugins.update(installedPluginPackageNames.value)
-
-    private suspend fun verify(packageName: String): Boolean {
-        val expectedSignature =
-            trustDao.getTrustedSignature(packageName) ?: return false
-
-        return pm.hasSignature(packageName, expectedSignature)
-    }
-
-    private companion object {
-        const val PLUGIN_FEATURE = "app.revanced.manager.plugin.downloader"
-        const val METADATA_PLUGIN_CLASS = "app.revanced.manager.plugin.downloader.class"
-
-        const val PUBLIC_STATIC = Modifier.PUBLIC or Modifier.STATIC
-        val Int.isPublicStatic get() = (this and PUBLIC_STATIC) == PUBLIC_STATIC
-        val Class<*>.isDownloaderBuilder get() = DownloaderBuilder::class.java.isAssignableFrom(this)
-
-        @Suppress("UNCHECKED_CAST")
-        fun Class<*>.getDownloaderBuilder() =
-            declaredMethods
-                .firstOrNull { it.modifiers.isPublicStatic && it.returnType.isDownloaderBuilder && it.parameterTypes.isEmpty() }
-                ?.let { it(null) as DownloaderBuilder<Parcelable> }
-                ?: throw Exception("Could not find a valid downloader implementation in class $canonicalName")
-    }
-}

app/src/main/java/app/revanced/manager/domain/repository/GithubRepository.kt

@@ -0,0 +1,8 @@
+package app.revanced.manager.domain.repository
+
+import app.revanced.manager.network.service.GithubService
+
+// TODO: delete this when the revanced api adds download count.
+class GithubRepository(private val service: GithubService) {
+    suspend fun getChangelog(repo: String) = service.getChangelog(repo)
+}

app/src/main/java/app/revanced/manager/domain/repository/InstalledAppRepository.kt

@@ -4,7 +4,7 @@ import app.revanced.manager.data.room.AppDatabase
 import app.revanced.manager.data.room.apps.installed.AppliedPatch
 import app.revanced.manager.data.room.apps.installed.InstallType
 import app.revanced.manager.data.room.apps.installed.InstalledApp
-import app.revanced.manager.util.PatchSelection
+import app.revanced.manager.util.PatchesSelection
 import kotlinx.coroutines.flow.distinctUntilChanged
 
 class InstalledAppRepository(
@@ -16,24 +16,24 @@ class InstalledAppRepository(
 
     suspend fun get(packageName: String) = dao.get(packageName)
 
-    suspend fun getAppliedPatches(packageName: String): PatchSelection =
+    suspend fun getAppliedPatches(packageName: String): PatchesSelection =
         dao.getPatchesSelection(packageName).mapValues { (_, patches) -> patches.toSet() }
 
-    suspend fun addOrUpdate(
+    suspend fun add(
         currentPackageName: String,
         originalPackageName: String,
         version: String,
         installType: InstallType,
-        patchSelection: PatchSelection
+        patchesSelection: PatchesSelection
     ) {
-        dao.upsertApp(
+        dao.insertApp(
             InstalledApp(
                 currentPackageName = currentPackageName,
                 originalPackageName = originalPackageName,
                 version = version,
                 installType = installType
             ),
-            patchSelection.flatMap { (uid, patches) ->
+            patchesSelection.flatMap { (uid, patches) ->
                 patches.map { patch ->
                     AppliedPatch(
                         packageName = currentPackageName,

app/src/main/java/app/revanced/manager/domain/repository/PatchBundlePersistenceRepository.kt

@@ -4,6 +4,8 @@ import app.revanced.manager.data.room.AppDatabase
 import app.revanced.manager.data.room.AppDatabase.Companion.generateUid
 import app.revanced.manager.data.room.bundles.PatchBundleEntity
 import app.revanced.manager.data.room.bundles.Source
+import app.revanced.manager.data.room.bundles.VersionInfo
+import io.ktor.http.*
 import kotlinx.coroutines.flow.distinctUntilChanged
 
 class PatchBundlePersistenceRepository(db: AppDatabase) {
@@ -21,11 +23,12 @@ class PatchBundlePersistenceRepository(db: AppDatabase) {
 
     suspend fun reset() = dao.reset()
 
+
     suspend fun create(name: String, source: Source, autoUpdate: Boolean = false) =
         PatchBundleEntity(
             uid = generateUid(),
             name = name,
-            version = null,
+            versionInfo = VersionInfo(),
             source = source,
             autoUpdate = autoUpdate
         ).also {
@@ -34,20 +37,18 @@ class PatchBundlePersistenceRepository(db: AppDatabase) {
 
     suspend fun delete(uid: Int) = dao.remove(uid)
 
-    suspend fun updateVersion(uid: Int, version: String?) =
-        dao.updateVersion(uid, version)
+    suspend fun updateVersion(uid: Int, patches: String, integrations: String) =
+        dao.updateVersion(uid, patches, integrations)
 
     suspend fun setAutoUpdate(uid: Int, value: Boolean) = dao.setAutoUpdate(uid, value)
 
-    suspend fun setName(uid: Int, name: String) = dao.setName(uid, name)
-
     fun getProps(id: Int) = dao.getPropsById(id).distinctUntilChanged()
 
     private companion object {
         val defaultSource = PatchBundleEntity(
             uid = 0,
-            name = "",
-            version = null,
+            name = "Main",
+            versionInfo = VersionInfo(),
             source = Source.API,
             autoUpdate = false
         )

app/src/main/java/app/revanced/manager/domain/repository/PatchBundleRepository.kt

@@ -3,8 +3,6 @@ package app.revanced.manager.domain.repository
 import android.app.Application
 import android.content.Context
 import android.util.Log
-import app.revanced.library.mostCommonCompatibleVersions
-import app.revanced.manager.R
 import app.revanced.manager.data.platform.NetworkInfo
 import app.revanced.manager.data.room.bundles.PatchBundleEntity
 import app.revanced.manager.domain.bundles.APIPatchBundle
@@ -13,26 +11,22 @@ import app.revanced.manager.data.room.bundles.Source as SourceInfo
 import app.revanced.manager.domain.bundles.LocalPatchBundle
 import app.revanced.manager.domain.bundles.RemotePatchBundle
 import app.revanced.manager.domain.bundles.PatchBundleSource
-import app.revanced.manager.domain.manager.PreferencesManager
-import app.revanced.manager.patcher.patch.PatchInfo
 import app.revanced.manager.util.flatMapLatestAndCombine
 import app.revanced.manager.util.tag
-import app.revanced.manager.util.uiSafe
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.supervisorScope
 import kotlinx.coroutines.withContext
 import java.io.InputStream
 
 class PatchBundleRepository(
-    private val app: Application,
+    app: Application,
     private val persistenceRepo: PatchBundlePersistenceRepository,
     private val networkInfo: NetworkInfo,
-    private val prefs: PreferencesManager,
 ) {
     private val bundlesDir = app.getDir("patch_bundles", Context.MODE_PRIVATE)
 
@@ -51,37 +45,6 @@ class PatchBundleRepository(
         it.state.map { state -> it.uid to state }
     }
 
-    val suggestedVersions = bundles.map {
-        val allPatches =
-            it.values.flatMap { bundle -> bundle.patches.map(PatchInfo::toPatcherPatch) }.toSet()
-
-        allPatches.mostCommonCompatibleVersions(countUnusedPatches = true)
-            .mapValues { (_, versions) ->
-                if (versions.keys.size < 2)
-                    return@mapValues versions.keys.firstOrNull()
-
-                // The entries are ordered from most compatible to least compatible.
-                // If there are entries with the same number of compatible patches, older versions will be first, which is undesirable.
-                // This means we have to pick the last entry we find that has the highest patch count.
-                // The order may change in future versions of ReVanced Library.
-                var currentHighestPatchCount = -1
-                versions.entries.last { (_, patchCount) ->
-                    if (patchCount >= currentHighestPatchCount) {
-                        currentHighestPatchCount = patchCount
-                        true
-                    } else false
-                }.key
-            }
-    }
-
-    suspend fun isVersionAllowed(packageName: String, version: String) =
-        withContext(Dispatchers.Default) {
-            if (!prefs.suggestedVersionSafeguard.get()) return@withContext true
-
-            val suggestedVersion = suggestedVersions.first()[packageName] ?: return@withContext true
-            suggestedVersion == version
-        }
-
     /**
      * Get the directory of the [PatchBundleSource] with the specified [uid], creating it if needed.
      */
@@ -137,16 +100,16 @@ class PatchBundleRepository(
     private fun addBundle(patchBundle: PatchBundleSource) =
         _sources.update { it.toMutableMap().apply { put(patchBundle.uid, patchBundle) } }
 
-    suspend fun createLocal(patches: InputStream) = withContext(Dispatchers.Default) {
-        val uid = persistenceRepo.create("", SourceInfo.Local).uid
-        val bundle = LocalPatchBundle("", uid, directoryOf(uid))
+    suspend fun createLocal(name: String, patches: InputStream, integrations: InputStream?) {
+        val id = persistenceRepo.create(name, SourceInfo.Local).uid
+        val bundle = LocalPatchBundle(name, id, directoryOf(id))
 
-        bundle.replace(patches)
+        bundle.replace(patches, integrations)
         addBundle(bundle)
     }
 
-    suspend fun createRemote(url: String, autoUpdate: Boolean) = withContext(Dispatchers.Default) {
-        val entity = persistenceRepo.create("", SourceInfo.from(url), autoUpdate)
+    suspend fun createRemote(name: String, url: String, autoUpdate: Boolean) {
+        val entity = persistenceRepo.create(name, SourceInfo.from(url), autoUpdate)
         addBundle(entity.load())
     }
 
@@ -161,24 +124,20 @@ class PatchBundleRepository(
         reload()
     }
 
-    suspend fun redownloadRemoteBundles() =
-        getBundlesByType<RemotePatchBundle>().forEach { it.downloadLatest() }
+    suspend fun redownloadRemoteBundles() = getBundlesByType<RemotePatchBundle>().forEach { it.downloadLatest() }
 
-    suspend fun updateCheck() =
-        uiSafe(app, R.string.source_download_fail, "Failed to update bundles") {
-            coroutineScope {
-                if (!networkInfo.isSafe()) {
-                    Log.d(tag, "Skipping update check because the network is down or metered.")
-                    return@coroutineScope
-                }
+    suspend fun updateCheck() = supervisorScope {
+        if (!networkInfo.isSafe()) {
+            Log.d(tag, "Skipping update check because the network is down or metered.")
+            return@supervisorScope
+        }
 
-                getBundlesByType<RemotePatchBundle>().forEach {
-                    launch {
-                        if (!it.getProps().autoUpdate) return@launch
-                        Log.d(tag, "Updating patch bundle: ${it.getName()}")
-                        it.update()
-                    }
-                }
+        getBundlesByType<RemotePatchBundle>().forEach {
+            launch {
+                if (!it.propsFlow().first().autoUpdate) return@launch
+                Log.d(tag, "Updating patch bundle: ${it.name}")
+                it.update()
             }
         }
+    }
 }

app/src/main/java/app/revanced/manager/domain/repository/PatchOptionsRepository.kt

@@ -1,82 +0,0 @@
-package app.revanced.manager.domain.repository
-
-import android.util.Log
-import app.revanced.manager.data.room.AppDatabase
-import app.revanced.manager.data.room.options.Option
-import app.revanced.manager.data.room.options.OptionGroup
-import app.revanced.manager.patcher.patch.PatchInfo
-import app.revanced.manager.util.Options
-import app.revanced.manager.util.tag
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.map
-
-class PatchOptionsRepository(db: AppDatabase) {
-    private val dao = db.optionDao()
-
-    private suspend fun getOrCreateGroup(bundleUid: Int, packageName: String) =
-        dao.getGroupId(bundleUid, packageName) ?: OptionGroup(
-            uid = AppDatabase.generateUid(),
-            patchBundle = bundleUid,
-            packageName = packageName
-        ).also { dao.createOptionGroup(it) }.uid
-
-    suspend fun getOptions(
-        packageName: String,
-        bundlePatches: Map<Int, Map<String, PatchInfo>>
-    ): Options {
-        val options = dao.getOptions(packageName)
-        // Bundle -> Patches
-        return buildMap<Int, MutableMap<String, MutableMap<String, Any?>>>(options.size) {
-            options.forEach { (sourceUid, bundlePatchOptionsList) ->
-                // Patches -> Patch options
-                this[sourceUid] =
-                    bundlePatchOptionsList.fold(mutableMapOf()) { bundlePatchOptions, dbOption ->
-                        val deserializedPatchOptions =
-                            bundlePatchOptions.getOrPut(dbOption.patchName, ::mutableMapOf)
-
-                        val option =
-                            bundlePatches[sourceUid]?.get(dbOption.patchName)?.options?.find { it.key == dbOption.key }
-                        if (option != null) {
-                            try {
-                                deserializedPatchOptions[option.key] =
-                                    dbOption.value.deserializeFor(option)
-                            } catch (e: Option.SerializationException) {
-                                Log.w(
-                                    tag,
-                                    "Option ${dbOption.patchName}:${option.key} could not be deserialized",
-                                    e
-                                )
-                            }
-                        }
-
-                        bundlePatchOptions
-                    }
-            }
-        }
-    }
-
-    suspend fun saveOptions(packageName: String, options: Options) =
-        dao.updateOptions(options.entries.associate { (sourceUid, bundlePatchOptions) ->
-            val groupId = getOrCreateGroup(sourceUid, packageName)
-
-            groupId to bundlePatchOptions.flatMap { (patchName, patchOptions) ->
-                patchOptions.mapNotNull { (key, value) ->
-                    val serialized = try {
-                        Option.SerializedValue.fromValue(value)
-                    } catch (e: Option.SerializationException) {
-                        Log.e(tag, "Option $patchName:$key could not be serialized", e)
-                        return@mapNotNull null
-                    }
-
-                    Option(groupId, patchName, key, serialized)
-                }
-            }
-        })
-
-    fun getPackagesWithSavedOptions() =
-        dao.getPackagesWithOptions().map(Iterable<String>::toSet).distinctUntilChanged()
-
-    suspend fun clearOptionsForPackage(packageName: String) = dao.clearForPackage(packageName)
-    suspend fun clearOptionsForPatchBundle(uid: Int) = dao.clearForPatchBundle(uid)
-    suspend fun reset() = dao.reset()
-}

app/src/main/java/app/revanced/manager/domain/repository/PatchSelectionRepository.kt

@@ -25,10 +25,6 @@ class PatchSelectionRepository(db: AppDatabase) {
             )
         })
 
-    suspend fun clearSelection(packageName: String) {
-        dao.clearForPackage(packageName)
-    }
-
     suspend fun reset() = dao.reset()
 
     suspend fun export(bundleUid: Int): SerializedSelection = dao.exportSelection(bundleUid)

app/src/main/java/app/revanced/manager/network/api/ReVancedAPI.kt

@@ -1,42 +1,26 @@
 package app.revanced.manager.network.api
 
-import android.os.Build
 import app.revanced.manager.domain.manager.PreferencesManager
-import app.revanced.manager.network.dto.ReVancedAsset
-import app.revanced.manager.network.dto.ReVancedGitRepository
-import app.revanced.manager.network.dto.ReVancedInfo
-import app.revanced.manager.network.service.HttpService
-import app.revanced.manager.network.utils.APIResponse
+import app.revanced.manager.network.dto.Asset
+import app.revanced.manager.network.dto.ReVancedLatestRelease
+import app.revanced.manager.network.dto.ReVancedRelease
+import app.revanced.manager.network.service.ReVancedService
 import app.revanced.manager.network.utils.getOrThrow
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import io.ktor.client.request.url
+import app.revanced.manager.network.utils.transform
 
 class ReVancedAPI(
-    private val client: HttpService,
+    private val service: ReVancedService,
     private val prefs: PreferencesManager
 ) {
     private suspend fun apiUrl() = prefs.api.get()
 
-    private suspend inline fun <reified T> request(api: String, route: String): APIResponse<T> =
-        withContext(
-            Dispatchers.IO
-        ) {
-            client.request {
-                url("$api/v4/$route")
-            }
-        }
+    suspend fun getContributors() = service.getContributors(apiUrl()).transform { it.repositories }
 
-    private suspend inline fun <reified T> request(route: String) = request<T>(apiUrl(), route)
+    suspend fun getRelease(name: String) = service.getRelease(apiUrl(), name).transform { it.release }
 
-    suspend fun getAppUpdate() =
-        getLatestAppInfo().getOrThrow().takeIf { it.version != Build.VERSION.RELEASE }
+    companion object Extensions {
+        fun ReVancedRelease.findAssetByType(mime: String) = assets.singleOrNull { it.contentType == mime } ?: throw MissingAssetException(mime)
+    }
+}
 
-    suspend fun getLatestAppInfo() = request<ReVancedAsset>("manager")
-
-    suspend fun getPatchesUpdate() = request<ReVancedAsset>("patches")
-
-    suspend fun getContributors() = request<List<ReVancedGitRepository>>("contributors")
-
-    suspend fun getInfo(api: String? = null) = request<ReVancedInfo>(api ?: apiUrl(), "about")
-}
+class MissingAssetException(type: String) : Exception("No asset with type $type")

app/src/main/java/app/revanced/manager/network/downloader/APKMirror.kt

@@ -0,0 +1,289 @@
+package app.revanced.manager.network.downloader
+
+import android.os.Build.SUPPORTED_ABIS
+import app.revanced.manager.network.service.HttpService
+import io.ktor.client.plugins.onDownload
+import io.ktor.client.request.parameter
+import io.ktor.client.request.url
+import it.skrape.selects.html5.a
+import it.skrape.selects.html5.div
+import it.skrape.selects.html5.form
+import it.skrape.selects.html5.h5
+import it.skrape.selects.html5.input
+import it.skrape.selects.html5.p
+import it.skrape.selects.html5.span
+import kotlinx.coroutines.flow.flow
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.get
+import org.koin.core.component.inject
+import java.io.File
+
+class APKMirror : AppDownloader, KoinComponent {
+    private val httpClient: HttpService = get()
+
+    enum class APKType {
+        APK,
+        BUNDLE
+    }
+
+    data class Variant(
+        val apkType: APKType,
+        val arch: String,
+        val link: String
+    )
+
+    private suspend fun getAppLink(packageName: String): String {
+        val searchResults = httpClient.getHtml { url("$apkMirror/?post_type=app_release&searchtype=app&s=$packageName") }
+            .div {
+                withId = "content"
+                findFirst {
+                    div {
+                        withClass = "listWidget"
+                        findAll {
+
+                            find {
+                                it.children.first().text.contains(packageName)
+                            }!!.children.mapNotNull {
+                                if (it.classNames.isEmpty()) {
+                                    it.h5 {
+                                        withClass = "appRowTitle"
+                                        findFirst {
+                                            a {
+                                                findFirst {
+                                                    attribute("href")
+                                                }
+                                            }
+                                        }
+                                    }
+                                } else null
+                            }
+
+                        }
+                    }
+                }
+            }
+
+        return searchResults.find { url ->
+            httpClient.getHtml { url(apkMirror + url) }
+                .div {
+                    withId = "primary"
+                    findFirst {
+                        div {
+                            withClass = "tab-buttons"
+                            findFirst {
+                                div {
+                                    withClass = "tab-button-positioning"
+                                    findFirst {
+                                        children.any {
+                                            it.attribute("href") == "https://play.google.com/store/apps/details?id=$packageName"
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+        } ?: throw Exception("App isn't available for download")
+    }
+
+    override fun getAvailableVersions(packageName: String, versionFilter: Set<String>) = flow<AppDownloader.App> {
+
+        // Vanced music uses the same package name so we have to hardcode...
+        val appCategory = if (packageName == "com.google.android.apps.youtube.music")
+            "youtube-music"
+        else
+            getAppLink(packageName).split("/")[3]
+
+        var page = 1
+
+        val versions = mutableListOf<String>()
+
+        while (
+            if (versionFilter.isNotEmpty())
+                versions.size < versionFilter.size && page <= 7
+            else
+                page <= 1
+        ) {
+            httpClient.getHtml {
+                url("$apkMirror/uploads/page/$page/")
+                parameter("appcategory", appCategory)
+            }.div {
+                withClass = "widget_appmanager_recentpostswidget"
+                findFirst {
+                    div {
+                        withClass = "listWidget"
+                        findFirst {
+                            children.mapNotNull { element ->
+                                if (element.className.isEmpty()) {
+
+                                    APKMirrorApp(
+                                        packageName = packageName,
+                                        version = element.div {
+                                            withClass = "infoSlide"
+                                            findFirst {
+                                                p {
+                                                    findFirst {
+                                                        span {
+                                                            withClass = "infoSlide-value"
+                                                            findFirst {
+                                                                text
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }.also {
+                                            if (it in versionFilter)
+                                                versions.add(it)
+                                        },
+                                        downloadLink = element.findFirst {
+                                            a {
+                                                withClass = "downloadLink"
+                                                findFirst {
+                                                    attribute("href")
+                                                }
+                                            }
+                                        }
+                                    )
+
+                                } else null
+                            }
+                        }
+                    }
+                }
+            }.onEach { version -> emit(version) }
+
+            page++
+        }
+    }
+
+    @Parcelize
+    private class APKMirrorApp(
+        override val packageName: String,
+        override val version: String,
+        private val downloadLink: String,
+    ) : AppDownloader.App, KoinComponent {
+        @IgnoredOnParcel private val httpClient: HttpService by inject()
+
+        override suspend fun download(
+            saveDirectory: File,
+            preferSplit: Boolean,
+            onDownload: suspend (downloadProgress: Pair<Float, Float>?) -> Unit
+        ): File {
+            val variants = httpClient.getHtml { url(apkMirror + downloadLink) }
+                .div {
+                    withClass = "variants-table"
+                    findFirst { // list of variants
+                        children.drop(1).map {
+                            Variant(
+                                apkType = it.div {
+                                    findFirst {
+                                        span {
+                                            findFirst {
+                                                enumValueOf(text)
+                                            }
+                                        }
+                                    }
+                                },
+                                arch = it.div {
+                                    findSecond {
+                                        text
+                                    }
+                                },
+                                link = it.div {
+                                    findFirst {
+                                        a {
+                                            findFirst {
+                                                attribute("href")
+                                            }
+                                        }
+                                    }
+                                }
+                            )
+                        }
+                    }
+                }
+
+            val orderedAPKTypes = mutableListOf(APKType.APK, APKType.BUNDLE)
+                .also { if (preferSplit) it.reverse() }
+
+            val variant = orderedAPKTypes.firstNotNullOfOrNull { apkType ->
+                supportedArches.firstNotNullOfOrNull { arch ->
+                    variants.find { it.arch == arch && it.apkType == apkType }
+                }
+            } ?: throw Exception("No compatible variant found")
+
+            if (variant.apkType == APKType.BUNDLE) throw Exception("Split apks are not supported yet") // TODO
+
+            val downloadPage = httpClient.getHtml { url(apkMirror + variant.link) }
+                .a {
+                    withClass = "downloadButton"
+                    findFirst {
+                        attribute("href")
+                    }
+                }
+
+            val downloadLink = httpClient.getHtml { url(apkMirror + downloadPage) }
+                .form {
+                    withId = "filedownload"
+                    findFirst {
+                        val apkLink = attribute("action")
+                        val id = input {
+                            withAttribute = "name" to "id"
+                            findFirst {
+                                attribute("value")
+                            }
+                        }
+                        val key = input {
+                            withAttribute = "name" to "key"
+                            findFirst {
+                                attribute("value")
+                            }
+                        }
+                        "$apkLink?id=$id&key=$key"
+                    }
+                }
+
+            val saveLocation = if (variant.apkType == APKType.BUNDLE)
+                saveDirectory.resolve(version).also { it.mkdirs() }
+            else
+                saveDirectory.resolve("$version.apk")
+
+            try {
+                val downloadLocation = if (variant.apkType == APKType.BUNDLE)
+                    saveLocation.resolve("temp.zip")
+                else
+                    saveLocation
+
+                httpClient.download(downloadLocation) {
+                    url(apkMirror + downloadLink)
+                    onDownload { bytesSentTotal, contentLength ->
+                        onDownload(bytesSentTotal.div(100000).toFloat().div(10) to contentLength.div(100000).toFloat().div(10))
+                    }
+                }
+
+                if (variant.apkType == APKType.BUNDLE) {
+                    // TODO: Extract temp.zip
+
+                    downloadLocation.delete()
+                }
+            } catch (e: Exception) {
+                saveLocation.deleteRecursively()
+                throw e
+            } finally {
+                onDownload(null)
+            }
+
+            return saveLocation
+        }
+    }
+
+    companion object {
+        const val apkMirror = "https://www.apkmirror.com"
+
+        val supportedArches = listOf("universal", "noarch") + SUPPORTED_ABIS
+    }
+
+}

app/src/main/java/app/revanced/manager/network/downloader/AppDownloader.kt

@@ -0,0 +1,28 @@
+package app.revanced.manager.network.downloader
+
+import android.os.Parcelable
+import kotlinx.coroutines.flow.Flow
+import java.io.File
+
+interface AppDownloader {
+
+    /**
+     * Returns all downloadable apps.
+     *
+     * @param packageName The package name of the app.
+     * @param versionFilter A set of versions to filter.
+     */
+    fun getAvailableVersions(packageName: String, versionFilter: Set<String>): Flow<App>
+
+    interface App : Parcelable {
+        val packageName: String
+        val version: String
+
+        suspend fun download(
+            saveDirectory: File,
+            preferSplit: Boolean,
+            onDownload: suspend (downloadProgress: Pair<Float, Float>?) -> Unit = {}
+        ): File
+    }
+
+}

app/src/main/java/app/revanced/manager/network/downloader/DownloaderPluginState.kt

@@ -1,9 +0,0 @@
-package app.revanced.manager.network.downloader
-
-sealed interface DownloaderPluginState {
-    data object Untrusted : DownloaderPluginState
-
-    data class Loaded(val plugin: LoadedDownloaderPlugin) : DownloaderPluginState
-
-    data class Failed(val throwable: Throwable) : DownloaderPluginState
-}

app/src/main/java/app/revanced/manager/network/downloader/LoadedDownloaderPlugin.kt

@@ -1,15 +0,0 @@
-package app.revanced.manager.network.downloader
-
-import android.os.Parcelable
-import app.revanced.manager.plugin.downloader.OutputDownloadScope
-import app.revanced.manager.plugin.downloader.GetScope
-import java.io.OutputStream
-
-class LoadedDownloaderPlugin(
-    val packageName: String,
-    val name: String,
-    val version: String,
-    val get: suspend GetScope.(packageName: String, version: String?) -> Pair<Parcelable, String?>?,
-    val download: suspend OutputDownloadScope.(data: Parcelable, outputStream: OutputStream) -> Unit,
-    val classLoader: ClassLoader
-)

app/src/main/java/app/revanced/manager/network/downloader/ParceledDownloaderData.kt

@@ -1,45 +0,0 @@
-package app.revanced.manager.network.downloader
-
-import android.os.Build
-import android.os.Bundle
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-/**
- * A container for [Parcelable] data returned from downloaders. Instances of this class can be safely stored in a bundle without needing to set the [ClassLoader].
- */
-class ParceledDownloaderData private constructor(
-    val pluginPackageName: String,
-    private val bundle: Bundle
-) : Parcelable {
-    constructor(plugin: LoadedDownloaderPlugin, data: Parcelable) : this(
-        plugin.packageName,
-        createBundle(data)
-    )
-
-    fun unwrapWith(plugin: LoadedDownloaderPlugin): Parcelable {
-        bundle.classLoader = plugin.classLoader
-
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            val className = bundle.getString(CLASS_NAME_KEY)!!
-            val clazz = plugin.classLoader.loadClass(className)
-
-            bundle.getParcelable(DATA_KEY, clazz)!! as Parcelable
-        } else @Suppress("Deprecation") bundle.getParcelable(DATA_KEY)!!
-    }
-
-    private companion object {
-        const val CLASS_NAME_KEY = "class"
-        const val DATA_KEY = "data"
-
-        fun createBundle(data: Parcelable) = Bundle().apply {
-            putParcelable(DATA_KEY, data)
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) putString(
-                CLASS_NAME_KEY,
-                data::class.java.canonicalName
-            )
-        }
-    }
-}

app/src/main/java/app/revanced/manager/network/dto/BundleInfo.kt

@@ -0,0 +1,9 @@
+package app.revanced.manager.network.dto
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class BundleInfo(val patches: BundleAsset, val integrations: BundleAsset)
+
+@Serializable
+data class BundleAsset(val version: String, val url: String)

app/src/main/java/app/revanced/manager/network/dto/GithubChangelog.kt

@@ -0,0 +1,16 @@
+package app.revanced.manager.network.dto
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GithubChangelog(
+    @SerialName("tag_name") val version: String,
+    @SerialName("body") val body: String,
+    @SerialName("assets") val assets: List<GithubAsset>
+)
+
+@Serializable
+data class GithubAsset(
+    @SerialName("download_count") val downloadCount: Int,
+)

app/src/main/java/app/revanced/manager/network/dto/ReVancedAsset.kt

@@ -1,18 +0,0 @@
-package app.revanced.manager.network.dto
-
-import kotlinx.datetime.LocalDateTime
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class ReVancedAsset (
-    @SerialName("download_url")
-    val downloadUrl: String,
-    @SerialName("created_at")
-    val createdAt: LocalDateTime,
-    @SerialName("signature_download_url")
-    val signatureDownloadUrl: String? = null,
-    val description: String,
-    val version: String,
-)
-

app/src/main/java/app/revanced/manager/network/dto/ReVancedContributors.kt

@@ -3,15 +3,19 @@ package app.revanced.manager.network.dto
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
+@Serializable
+data class ReVancedGitRepositories(
+    val repositories: List<ReVancedGitRepository>,
+)
+
 @Serializable
 data class ReVancedGitRepository(
     val name: String,
-    val url: String,
     val contributors: List<ReVancedContributor>,
 )
 
 @Serializable
 data class ReVancedContributor(
-    @SerialName("name") val username: String,
+    val username: String,
     @SerialName("avatar_url") val avatarUrl: String,
-)
+)

app/src/main/java/app/revanced/manager/network/dto/ReVancedInfo.kt

@@ -1,53 +0,0 @@
-package app.revanced.manager.network.dto
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class ReVancedInfo(
-    val name: String,
-    val about: String,
-    val branding: ReVancedBranding,
-    val contact: ReVancedContact,
-    val socials: List<ReVancedSocial>,
-    val donations: ReVancedDonation,
-)
-
-@Serializable
-data class ReVancedBranding(
-    val logo: String,
-)
-
-@Serializable
-data class ReVancedContact(
-    val email: String,
-)
-
-@Serializable
-data class ReVancedSocial(
-    val name: String,
-    val url: String,
-    val preferred: Boolean,
-)
-
-@Serializable
-data class ReVancedDonation(
-    val wallets: List<ReVancedWallet>,
-    val links: List<ReVancedDonationLink>,
-)
-
-@Serializable
-data class ReVancedWallet(
-    val network: String,
-    @SerialName("currency_code")
-    val currencyCode: String,
-    val address: String,
-    val preferred: Boolean
-)
-
-@Serializable
-data class ReVancedDonationLink(
-    val name: String,
-    val url: String,
-    val preferred: Boolean,
-)

app/src/main/java/app/revanced/manager/network/dto/ReVancedRelease.kt

@@ -0,0 +1,32 @@
+package app.revanced.manager.network.dto
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ReVancedLatestRelease(
+    val release: ReVancedRelease,
+)
+
+@Serializable
+data class ReVancedRelease(
+    val metadata: ReVancedReleaseMeta,
+    val assets: List<Asset>
+)
+
+@Serializable
+data class ReVancedReleaseMeta(
+    @SerialName("tag_name") val tag: String,
+    val name: String,
+    val draft: Boolean,
+    val prerelease: Boolean,
+    @SerialName("created_at") val createdAt: String,
+    @SerialName("published_at") val publishedAt: String
+)
+
+@Serializable
+data class Asset(
+    val name: String,
+    @SerialName("browser_download_url") val downloadUrl: String,
+    @SerialName("content_type") val contentType: String
+)

app/src/main/java/app/revanced/manager/network/service/GithubService.kt

@@ -0,0 +1,15 @@
+package app.revanced.manager.network.service
+
+import app.revanced.manager.network.dto.GithubChangelog
+import app.revanced.manager.network.utils.APIResponse
+import io.ktor.client.request.url
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+class GithubService(private val client: HttpService) {
+    suspend fun getChangelog(repo: String): APIResponse<GithubChangelog> = withContext(Dispatchers.IO) {
+        client.request {
+            url("https://api.github.com/repos/revanced/$repo/releases/latest")
+        }
+    }
+}

app/src/main/java/app/revanced/manager/network/service/HttpService.kt

@@ -18,11 +18,8 @@ import io.ktor.utils.io.ByteReadChannel
 import io.ktor.utils.io.core.isNotEmpty
 import io.ktor.utils.io.core.readBytes
 import it.skrape.core.htmlDocument
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import kotlinx.serialization.json.Json
 import java.io.File
-import java.io.OutputStream
 
 /**
  * @author Aliucord Authors, DiamondMiner88
@@ -52,10 +49,7 @@ class HttpService(
                     null
                 }
 
-                Log.e(
-                    tag,
-                    "Failed to fetch: API error, http status: ${response.status}, body: $body"
-                )
+                Log.e(tag, "Failed to fetch: API error, http status: ${response.status}, body: $body")
                 APIResponse.Error(APIError(response.status, body))
             }
         } catch (t: Throwable) {
@@ -65,19 +59,20 @@ class HttpService(
         return response
     }
 
-    suspend fun streamTo(
-        outputStream: OutputStream,
+    suspend fun download(
+        saveLocation: File,
         builder: HttpRequestBuilder.() -> Unit
     ) {
         http.prepareGet(builder).execute { httpResponse ->
             if (httpResponse.status.isSuccess()) {
-                val channel: ByteReadChannel = httpResponse.body()
-                withContext(Dispatchers.IO) {
+
+                saveLocation.outputStream().use { stream ->
+                    val channel: ByteReadChannel = httpResponse.body()
                     while (!channel.isClosedForRead) {
                         val packet = channel.readRemaining(DEFAULT_BUFFER_SIZE.toLong())
                         while (packet.isNotEmpty) {
                             val bytes = packet.readBytes()
-                            outputStream.write(bytes)
+                            stream.write(bytes)
                         }
                     }
                 }
@@ -88,11 +83,6 @@ class HttpService(
         }
     }
 
-    suspend fun download(
-        saveLocation: File,
-        builder: HttpRequestBuilder.() -> Unit
-    ) = saveLocation.outputStream().use { streamTo(it, builder) }
-
     suspend fun getHtml(builder: HttpRequestBuilder.() -> Unit) = htmlDocument(
         html = http.get(builder).bodyAsText()
     )

app/src/main/java/app/revanced/manager/network/service/ReVancedService.kt

@@ -0,0 +1,26 @@
+package app.revanced.manager.network.service
+
+import app.revanced.manager.network.dto.ReVancedLatestRelease
+import app.revanced.manager.network.dto.ReVancedGitRepositories
+import app.revanced.manager.network.utils.APIResponse
+import io.ktor.client.request.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+class ReVancedService(
+    private val client: HttpService,
+) {
+    suspend fun getRelease(api: String, repo: String): APIResponse<ReVancedLatestRelease> =
+        withContext(Dispatchers.IO) {
+            client.request {
+                url("$api/v2/$repo/releases/latest")
+            }
+        }
+
+    suspend fun getContributors(api: String): APIResponse<ReVancedGitRepositories> =
+        withContext(Dispatchers.IO) {
+            client.request {
+                url("$api/contributors")
+            }
+        }
+}

app/src/main/java/app/revanced/manager/patcher/Aligning.kt

@@ -0,0 +1,38 @@
+package app.revanced.manager.patcher
+
+import app.revanced.manager.patcher.alignment.ZipAligner
+import app.revanced.manager.patcher.alignment.zip.ZipFile
+import app.revanced.manager.patcher.alignment.zip.structures.ZipEntry
+import app.revanced.patcher.PatcherResult
+import java.io.File
+
+// This is the same aligner used by the CLI.
+// It will be removed eventually.
+object Aligning {
+    fun align(result: PatcherResult, inputFile: File, outputFile: File) {
+        // logger.info("Aligning ${inputFile.name} to ${outputFile.name}")
+
+        if (outputFile.exists()) outputFile.delete()
+
+        ZipFile(outputFile).use { file ->
+            result.dexFiles.forEach {
+                file.addEntryCompressData(
+                    ZipEntry.createWithName(it.name),
+                    it.stream.readBytes()
+                )
+            }
+
+            result.resourceFile?.let {
+                file.copyEntriesFromFileAligned(
+                    ZipFile(it),
+                    ZipAligner::getEntryAlignment
+                )
+            }
+
+            file.copyEntriesFromFileAligned(
+                ZipFile(inputFile, readonly = true),
+                ZipAligner::getEntryAlignment
+            )
+        }
+    }
+}

app/src/main/java/app/revanced/manager/patcher/LibraryResolver.kt

@@ -1,10 +0,0 @@
-package app.revanced.manager.patcher
-
-import android.content.Context
-import java.io.File
-
-abstract class LibraryResolver {
-    protected fun findLibrary(context: Context, searchTerm: String): File? = File(context.applicationInfo.nativeLibraryDir).run {
-        list { _, f -> !File(f).isDirectory && f.contains(searchTerm) }?.firstOrNull()?.let { resolve(it) }
-    }
-}

app/src/main/java/app/revanced/manager/patcher/Session.kt

@@ -1,14 +1,10 @@
 package app.revanced.manager.patcher
 
-import android.content.Context
-import app.revanced.library.ApkUtils.applyTo
-import app.revanced.manager.R
-import app.revanced.manager.patcher.logger.Logger
-import app.revanced.manager.ui.model.State
 import app.revanced.patcher.Patcher
-import app.revanced.patcher.PatcherConfig
+import app.revanced.patcher.PatcherOptions
+import app.revanced.patcher.data.Context
+import app.revanced.patcher.logging.Logger
 import app.revanced.patcher.patch.Patch
-import app.revanced.patcher.patch.PatchResult
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.Closeable
@@ -16,121 +12,70 @@ import java.io.File
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption
 
-internal typealias PatchList = List<Patch<*>>
+internal typealias PatchClass = Class<out Patch<Context>>
+internal typealias PatchList = List<PatchClass>
 
 class Session(
     cacheDir: String,
     frameworkDir: String,
     aaptPath: String,
-    private val androidContext: Context,
     private val logger: Logger,
     private val input: File,
-    private val onPatchCompleted: suspend () -> Unit,
-    private val onProgress: (name: String?, state: State?, message: String?) -> Unit
+    private val onStepSucceeded: suspend () -> Unit
 ) : Closeable {
-    private fun updateProgress(name: String? = null, state: State? = null, message: String? = null) =
-        onProgress(name, state, message)
-
-    private val tempDir = File(cacheDir).resolve("patcher").also { it.mkdirs() }
+    private val temporary = File(cacheDir).resolve("manager").also { it.mkdirs() }
     private val patcher = Patcher(
-        PatcherConfig(
-            apkFile = input,
-            temporaryFilesPath = tempDir,
-            frameworkFileDirectory = frameworkDir,
-            aaptBinaryPath = aaptPath
+        PatcherOptions(
+            inputFile = input,
+            resourceCacheDirectory = temporary.resolve("aapt-resources").path,
+            frameworkDirectory = frameworkDir,
+            aaptPath = aaptPath,
+            logger = logger,
         )
     )
 
-    private suspend fun Patcher.applyPatchesVerbose(selectedPatches: PatchList) {
-        var nextPatchIndex = 0
-
-        updateProgress(
-            name = androidContext.getString(R.string.executing_patch, selectedPatches[nextPatchIndex]),
-            state = State.RUNNING
-        )
-
-        this().collect { (patch, exception) ->
-            if (patch !in selectedPatches) return@collect
-
-            if (exception != null) {
-                updateProgress(
-                    name = androidContext.getString(R.string.failed_to_execute_patch, patch.name),
-                    state = State.FAILED,
-                    message = exception.stackTraceToString()
-                )
-
-                logger.error("${patch.name} failed:")
-                logger.error(exception.stackTraceToString())
-                throw exception
+    private suspend fun Patcher.applyPatchesVerbose() {
+        this.executePatches(true).forEach { (patch, result) ->
+            if (result.isSuccess) {
+                logger.info("$patch succeeded")
+                onStepSucceeded()
+                return@forEach
             }
+            logger.error("$patch failed:")
+            result.exceptionOrNull()!!.let {
+                logger.error(result.exceptionOrNull()!!.stackTraceToString())
 
-            nextPatchIndex++
-
-            onPatchCompleted()
-
-            selectedPatches.getOrNull(nextPatchIndex)?.let { nextPatch ->
-                updateProgress(
-                    name = androidContext.getString(R.string.executing_patch, nextPatch.name)
-                )
+                throw it
             }
-
-            logger.info("${patch.name} succeeded")
         }
-
-        updateProgress(
-            state = State.COMPLETED,
-            name = androidContext.resources.getQuantityString(
-                R.plurals.patches_executed,
-                selectedPatches.size,
-                selectedPatches.size
-            )
-        )
     }
 
-    suspend fun run(output: File, selectedPatches: PatchList) {
-        updateProgress(state = State.COMPLETED) // Unpacking
-
-        java.util.logging.Logger.getLogger("").apply {
-            handlers.forEach {
-                it.close()
-                removeHandler(it)
-            }
-
-            addHandler(logger.handler)
-        }
-
+    suspend fun run(output: File, selectedPatches: PatchList, integrations: List<File>) {
+        onStepSucceeded() // Unpacking
         with(patcher) {
             logger.info("Merging integrations")
-            this += selectedPatches.toSet()
+            addIntegrations(integrations) {}
+            addPatches(selectedPatches)
+            onStepSucceeded() // Merging
 
             logger.info("Applying patches...")
-            applyPatchesVerbose(selectedPatches.sortedBy { it.name })
+            applyPatchesVerbose()
         }
 
         logger.info("Writing patched files...")
-        val result = patcher.get()
+        val result = patcher.save()
 
-        val patched = tempDir.resolve("result.apk")
-        withContext(Dispatchers.IO) {
-            Files.copy(input.toPath(), patched.toPath(), StandardCopyOption.REPLACE_EXISTING)
-        }
-        result.applyTo(patched)
+        val aligned = temporary.resolve("aligned.apk").also { Aligning.align(result, input, it) }
 
-        logger.info("Patched apk saved to $patched")
+        logger.info("Patched apk saved to $aligned")
 
         withContext(Dispatchers.IO) {
-            Files.move(patched.toPath(), output.toPath(), StandardCopyOption.REPLACE_EXISTING)
+            Files.move(aligned.toPath(), output.toPath(), StandardCopyOption.REPLACE_EXISTING)
         }
-        updateProgress(state = State.COMPLETED) // Saving
+        onStepSucceeded() // Saving
     }
 
     override fun close() {
-        tempDir.deleteRecursively()
-        patcher.close()
-    }
-
-    companion object {
-        operator fun PatchResult.component1() = patch
-        operator fun PatchResult.component2() = exception
+        temporary.delete()
     }
 }

app/src/main/java/app/revanced/manager/patcher/aapt/Aapt.kt

@@ -1,12 +1,13 @@
 package app.revanced.manager.patcher.aapt
 
 import android.content.Context
-import app.revanced.manager.patcher.LibraryResolver
-import android.os.Build.SUPPORTED_ABIS as DEVICE_ABIS
-object Aapt : LibraryResolver() {
-    private val WORKING_ABIS = setOf("arm64-v8a", "x86", "x86_64", "armeabi-v7a")
+import java.io.File
 
-    fun supportsDevice() = (DEVICE_ABIS intersect WORKING_ABIS).isNotEmpty()
-
-    fun binary(context: Context) = findLibrary(context, "aapt")
+object Aapt {
+    fun binary(context: Context): File? {
+        return File(context.applicationInfo.nativeLibraryDir).resolveAapt()
+    }
 }
+
+private fun File.resolveAapt() =
+    list { _, f -> !File(f).isDirectory && f.contains("aapt") }?.firstOrNull()?.let { resolve(it) }

app/src/main/java/app/revanced/manager/patcher/alignment/ZipAlign.kt

@@ -0,0 +1,11 @@
+package app.revanced.manager.patcher.alignment
+
+import app.revanced.manager.patcher.alignment.zip.structures.ZipEntry
+
+internal object ZipAligner {
+    private const val DEFAULT_ALIGNMENT = 4
+    private const val LIBRARY_ALIGNMENT = 4096
+
+    fun getEntryAlignment(entry: ZipEntry): Int? =
+        if (entry.compression.toUInt() != 0u) null else if (entry.fileName.endsWith(".so")) LIBRARY_ALIGNMENT else DEFAULT_ALIGNMENT
+}

app/src/main/java/app/revanced/manager/patcher/alignment/zip/Extensions.kt

@@ -0,0 +1,33 @@
+package app.revanced.manager.patcher.alignment.zip
+
+import java.io.DataInput
+import java.io.DataOutput
+import java.nio.ByteBuffer
+
+fun UInt.toLittleEndian() =
+    (((this.toInt() and 0xff000000.toInt()) shr 24) or ((this.toInt() and 0x00ff0000) shr 8) or ((this.toInt() and 0x0000ff00) shl 8) or (this.toInt() shl 24)).toUInt()
+
+fun UShort.toLittleEndian() = (this.toUInt() shl 16).toLittleEndian().toUShort()
+
+fun UInt.toBigEndian() = (((this.toInt() and 0xff) shl 24) or ((this.toInt() and 0xff00) shl 8)
+        or ((this.toInt() and 0x00ff0000) ushr 8) or (this.toInt() ushr 24)).toUInt()
+
+fun UShort.toBigEndian() = (this.toUInt() shl 16).toBigEndian().toUShort()
+
+fun ByteBuffer.getUShort() = this.getShort().toUShort()
+fun ByteBuffer.getUInt() = this.getInt().toUInt()
+
+fun ByteBuffer.putUShort(ushort: UShort) = this.putShort(ushort.toShort())
+fun ByteBuffer.putUInt(uint: UInt) = this.putInt(uint.toInt())
+
+fun DataInput.readUShort() = this.readShort().toUShort()
+fun DataInput.readUInt() = this.readInt().toUInt()
+
+fun DataOutput.writeUShort(ushort: UShort) = this.writeShort(ushort.toInt())
+fun DataOutput.writeUInt(uint: UInt) = this.writeInt(uint.toInt())
+
+fun DataInput.readUShortLE() = this.readUShort().toBigEndian()
+fun DataInput.readUIntLE() = this.readUInt().toBigEndian()
+
+fun DataOutput.writeUShortLE(ushort: UShort) = this.writeUShort(ushort.toLittleEndian())
+fun DataOutput.writeUIntLE(uint: UInt) = this.writeUInt(uint.toLittleEndian())

app/src/main/java/app/revanced/manager/patcher/alignment/zip/ZipFile.kt

@@ -0,0 +1,188 @@
+package app.revanced.manager.patcher.alignment.zip
+
+import app.revanced.manager.patcher.alignment.zip.structures.ZipEndRecord
+import app.revanced.manager.patcher.alignment.zip.structures.ZipEntry
+
+import java.io.Closeable
+import java.io.File
+import java.io.IOException
+import java.io.RandomAccessFile
+import java.nio.ByteBuffer
+import java.nio.channels.FileChannel
+import java.util.zip.CRC32
+import java.util.zip.Deflater
+
+class ZipFile(file: File, private val readonly: Boolean = false) : Closeable {
+    var entries: MutableList<ZipEntry> = mutableListOf()
+
+    private val filePointer: RandomAccessFile = RandomAccessFile(file, if (readonly) "r" else "rw")
+    private var CDNeedsRewrite = false
+
+    private val compressionLevel = 5
+
+    init {
+        //if file isn't empty try to load entries
+        if (file.length() > 0) {
+            val endRecord = findEndRecord()
+
+            if (endRecord.diskNumber > 0u || endRecord.totalEntries != endRecord.diskEntries)
+                throw IllegalArgumentException("Multi-file archives are not supported")
+
+            entries = readEntries(endRecord).toMutableList()
+        }
+
+        //seek back to start for writing
+        filePointer.seek(0)
+    }
+
+    private fun assertWritable() {
+        if (readonly) throw IOException("Archive is read-only")
+    }
+
+    private fun findEndRecord(): ZipEndRecord {
+        //look from end to start since end record is at the end
+        for (i in filePointer.length() - 1 downTo 0) {
+            filePointer.seek(i)
+            //possible beginning of signature
+            if (filePointer.readByte() == 0x50.toByte()) {
+                //seek back to get the full int
+                filePointer.seek(i)
+                val possibleSignature = filePointer.readUIntLE()
+                if (possibleSignature == ZipEndRecord.ECD_SIGNATURE) {
+                    filePointer.seek(i)
+                    return ZipEndRecord.fromECD(filePointer)
+                }
+            }
+        }
+
+        throw Exception("Couldn't find end record")
+    }
+
+    private fun readEntries(endRecord: ZipEndRecord): List<ZipEntry> {
+        filePointer.seek(endRecord.centralDirectoryStartOffset.toLong())
+
+        val numberOfEntries = endRecord.diskEntries.toInt()
+
+        return buildList(numberOfEntries) {
+            for (i in 1..numberOfEntries) {
+                add(
+                    ZipEntry.fromCDE(filePointer).also
+                    {
+                        //for some reason the local extra field can be different from the central one
+                        it.readLocalExtra(
+                            filePointer.channel.map(
+                                FileChannel.MapMode.READ_ONLY,
+                                it.localHeaderOffset.toLong() + 28,
+                                2
+                            )
+                        )
+                    })
+            }
+        }
+    }
+
+    private fun writeCD() {
+        val CDStart = filePointer.channel.position().toUInt()
+
+        entries.forEach {
+            filePointer.channel.write(it.toCDE())
+        }
+
+        val entriesCount = entries.size.toUShort()
+
+        val endRecord = ZipEndRecord(
+            0u,
+            0u,
+            entriesCount,
+            entriesCount,
+            filePointer.channel.position().toUInt() - CDStart,
+            CDStart,
+            ""
+        )
+
+        filePointer.channel.write(endRecord.toECD())
+    }
+
+    private fun addEntry(entry: ZipEntry, data: ByteBuffer) {
+        CDNeedsRewrite = true
+
+        entry.localHeaderOffset = filePointer.channel.position().toUInt()
+
+        filePointer.channel.write(entry.toLFH())
+        filePointer.channel.write(data)
+
+        entries.add(entry)
+    }
+
+    fun addEntryCompressData(entry: ZipEntry, data: ByteArray) {
+        assertWritable()
+
+        val compressor = Deflater(compressionLevel, true)
+        compressor.setInput(data)
+        compressor.finish()
+
+        val uncompressedSize = data.size
+        val compressedData =
+            ByteArray(uncompressedSize) //i'm guessing compression won't make the data bigger
+
+        val compressedDataLength = compressor.deflate(compressedData)
+        val compressedBuffer =
+            ByteBuffer.wrap(compressedData.take(compressedDataLength).toByteArray())
+
+        compressor.end()
+
+        val crc = CRC32()
+        crc.update(data)
+
+        entry.compression = 8u //deflate compression
+        entry.uncompressedSize = uncompressedSize.toUInt()
+        entry.compressedSize = compressedDataLength.toUInt()
+        entry.crc32 = crc.value.toUInt()
+
+        addEntry(entry, compressedBuffer)
+    }
+
+    private fun addEntryCopyData(entry: ZipEntry, data: ByteBuffer, alignment: Int? = null) {
+        assertWritable()
+
+        alignment?.let {
+            //calculate where data would end up
+            val dataOffset = filePointer.filePointer + entry.LFHSize
+
+            val mod = dataOffset % alignment
+
+            //wrong alignment
+            if (mod != 0L) {
+                //add padding at end of extra field
+                entry.localExtraField =
+                    entry.localExtraField.copyOf((entry.localExtraField.size + (alignment - mod)).toInt())
+            }
+        }
+
+        addEntry(entry, data)
+    }
+
+    fun getDataForEntry(entry: ZipEntry): ByteBuffer {
+        return filePointer.channel.map(
+            FileChannel.MapMode.READ_ONLY,
+            entry.dataOffset.toLong(),
+            entry.compressedSize.toLong()
+        )
+    }
+
+    fun copyEntriesFromFileAligned(file: ZipFile, entryAlignment: (entry: ZipEntry) -> Int?) {
+        assertWritable()
+
+        for (entry in file.entries) {
+            if (entries.any { it.fileName == entry.fileName }) continue //don't add duplicates
+
+            val data = file.getDataForEntry(entry)
+            addEntryCopyData(entry, data, entryAlignment(entry))
+        }
+    }
+
+    override fun close() {
+        if (CDNeedsRewrite) writeCD()
+        filePointer.close()
+    }
+}

app/src/main/java/app/revanced/manager/patcher/alignment/zip/structures/ZipEndRecord.kt

@@ -0,0 +1,77 @@
+package app.revanced.manager.patcher.alignment.zip.structures
+
+import app.revanced.manager.patcher.alignment.zip.putUInt
+import app.revanced.manager.patcher.alignment.zip.putUShort
+import app.revanced.manager.patcher.alignment.zip.readUIntLE
+import app.revanced.manager.patcher.alignment.zip.readUShortLE
+import java.io.DataInput
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+data class ZipEndRecord(
+    val diskNumber: UShort,
+    val startingDiskNumber: UShort,
+    val diskEntries: UShort,
+    val totalEntries: UShort,
+    val centralDirectorySize: UInt,
+    val centralDirectoryStartOffset: UInt,
+    val fileComment: String,
+) {
+
+    companion object {
+        const val ECD_HEADER_SIZE = 22
+        const val ECD_SIGNATURE = 0x06054b50u
+
+        fun fromECD(input: DataInput): ZipEndRecord {
+            val signature = input.readUIntLE()
+
+            if (signature != ECD_SIGNATURE)
+                throw IllegalArgumentException("Input doesn't start with end record signature")
+
+            val diskNumber = input.readUShortLE()
+            val startingDiskNumber = input.readUShortLE()
+            val diskEntries = input.readUShortLE()
+            val totalEntries = input.readUShortLE()
+            val centralDirectorySize = input.readUIntLE()
+            val centralDirectoryStartOffset = input.readUIntLE()
+            val fileCommentLength = input.readUShortLE()
+            var fileComment = ""
+
+            if (fileCommentLength > 0u) {
+                val fileCommentBytes = ByteArray(fileCommentLength.toInt())
+                input.readFully(fileCommentBytes)
+                fileComment = fileCommentBytes.toString(Charsets.UTF_8)
+            }
+
+            return ZipEndRecord(
+                diskNumber,
+                startingDiskNumber,
+                diskEntries,
+                totalEntries,
+                centralDirectorySize,
+                centralDirectoryStartOffset,
+                fileComment
+            )
+        }
+    }
+
+    fun toECD(): ByteBuffer {
+        val commentBytes = fileComment.toByteArray(Charsets.UTF_8)
+
+        val buffer = ByteBuffer.allocate(ECD_HEADER_SIZE + commentBytes.size).also { it.order(ByteOrder.LITTLE_ENDIAN) }
+
+        buffer.putUInt(ECD_SIGNATURE)
+        buffer.putUShort(diskNumber)
+        buffer.putUShort(startingDiskNumber)
+        buffer.putUShort(diskEntries)
+        buffer.putUShort(totalEntries)
+        buffer.putUInt(centralDirectorySize)
+        buffer.putUInt(centralDirectoryStartOffset)
+        buffer.putUShort(commentBytes.size.toUShort())
+
+        buffer.put(commentBytes)
+
+        buffer.flip()
+        return buffer
+    }
+}

app/src/main/java/app/revanced/manager/patcher/alignment/zip/structures/ZipEntry.kt

@@ -0,0 +1,189 @@
+package app.revanced.manager.patcher.alignment.zip.structures
+
+import app.revanced.manager.patcher.alignment.zip.*
+import java.io.DataInput
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+data class ZipEntry(
+    val version: UShort,
+    val versionNeeded: UShort,
+    val flags: UShort,
+    var compression: UShort,
+    val modificationTime: UShort,
+    val modificationDate: UShort,
+    var crc32: UInt,
+    var compressedSize: UInt,
+    var uncompressedSize: UInt,
+    val diskNumber: UShort,
+    val internalAttributes: UShort,
+    val externalAttributes: UInt,
+    var localHeaderOffset: UInt,
+    val fileName: String,
+    val extraField: ByteArray,
+    val fileComment: String,
+    var localExtraField: ByteArray = ByteArray(0), //separate for alignment
+) {
+    val LFHSize: Int
+        get() = LFH_HEADER_SIZE + fileName.toByteArray(Charsets.UTF_8).size + localExtraField.size
+
+    val dataOffset: UInt
+        get() = localHeaderOffset + LFHSize.toUInt()
+
+    companion object {
+        const val CDE_HEADER_SIZE = 46
+        const val CDE_SIGNATURE = 0x02014b50u
+
+        const val LFH_HEADER_SIZE = 30
+        const val LFH_SIGNATURE = 0x04034b50u
+
+        fun createWithName(fileName: String): ZipEntry {
+            return ZipEntry(
+                0x1403u, //made by unix, version 20
+                0u,
+                0u,
+                0u,
+                0x0821u, //seems to be static time google uses, no idea
+                0x0221u, //same as above
+                0u,
+                0u,
+                0u,
+                0u,
+                0u,
+                0u,
+                0u,
+                fileName,
+                ByteArray(0),
+                ""
+            )
+        }
+
+        fun fromCDE(input: DataInput): ZipEntry {
+            val signature = input.readUIntLE()
+
+            if (signature != CDE_SIGNATURE)
+                throw IllegalArgumentException("Input doesn't start with central directory entry signature")
+
+            val version = input.readUShortLE()
+            val versionNeeded = input.readUShortLE()
+            var flags = input.readUShortLE()
+            val compression = input.readUShortLE()
+            val modificationTime = input.readUShortLE()
+            val modificationDate = input.readUShortLE()
+            val crc32 = input.readUIntLE()
+            val compressedSize = input.readUIntLE()
+            val uncompressedSize = input.readUIntLE()
+            val fileNameLength = input.readUShortLE()
+            var fileName = ""
+            val extraFieldLength = input.readUShortLE()
+            val extraField = ByteArray(extraFieldLength.toInt())
+            val fileCommentLength = input.readUShortLE()
+            var fileComment = ""
+            val diskNumber = input.readUShortLE()
+            val internalAttributes = input.readUShortLE()
+            val externalAttributes = input.readUIntLE()
+            val localHeaderOffset = input.readUIntLE()
+
+            val variableFieldsLength =
+                fileNameLength.toInt() + extraFieldLength.toInt() + fileCommentLength.toInt()
+
+            if (variableFieldsLength > 0) {
+                val fileNameBytes = ByteArray(fileNameLength.toInt())
+                input.readFully(fileNameBytes)
+                fileName = fileNameBytes.toString(Charsets.UTF_8)
+
+                input.readFully(extraField)
+
+                val fileCommentBytes = ByteArray(fileCommentLength.toInt())
+                input.readFully(fileCommentBytes)
+                fileComment = fileCommentBytes.toString(Charsets.UTF_8)
+            }
+
+            flags = (flags and 0b1000u.inv()
+                .toUShort()) //disable data descriptor flag as they are not used
+
+            return ZipEntry(
+                version,
+                versionNeeded,
+                flags,
+                compression,
+                modificationTime,
+                modificationDate,
+                crc32,
+                compressedSize,
+                uncompressedSize,
+                diskNumber,
+                internalAttributes,
+                externalAttributes,
+                localHeaderOffset,
+                fileName,
+                extraField,
+                fileComment,
+            )
+        }
+    }
+
+    fun readLocalExtra(buffer: ByteBuffer) {
+        buffer.order(ByteOrder.LITTLE_ENDIAN)
+        localExtraField = ByteArray(buffer.getUShort().toInt())
+    }
+
+    fun toLFH(): ByteBuffer {
+        val nameBytes = fileName.toByteArray(Charsets.UTF_8)
+
+        val buffer = ByteBuffer.allocate(LFH_HEADER_SIZE + nameBytes.size + localExtraField.size)
+            .also { it.order(ByteOrder.LITTLE_ENDIAN) }
+
+        buffer.putUInt(LFH_SIGNATURE)
+        buffer.putUShort(versionNeeded)
+        buffer.putUShort(flags)
+        buffer.putUShort(compression)
+        buffer.putUShort(modificationTime)
+        buffer.putUShort(modificationDate)
+        buffer.putUInt(crc32)
+        buffer.putUInt(compressedSize)
+        buffer.putUInt(uncompressedSize)
+        buffer.putUShort(nameBytes.size.toUShort())
+        buffer.putUShort(localExtraField.size.toUShort())
+
+        buffer.put(nameBytes)
+        buffer.put(localExtraField)
+
+        buffer.flip()
+        return buffer
+    }
+
+    fun toCDE(): ByteBuffer {
+        val nameBytes = fileName.toByteArray(Charsets.UTF_8)
+        val commentBytes = fileComment.toByteArray(Charsets.UTF_8)
+
+        val buffer =
+            ByteBuffer.allocate(CDE_HEADER_SIZE + nameBytes.size + extraField.size + commentBytes.size)
+                .also { it.order(ByteOrder.LITTLE_ENDIAN) }
+
+        buffer.putUInt(CDE_SIGNATURE)
+        buffer.putUShort(version)
+        buffer.putUShort(versionNeeded)
+        buffer.putUShort(flags)
+        buffer.putUShort(compression)
+        buffer.putUShort(modificationTime)
+        buffer.putUShort(modificationDate)
+        buffer.putUInt(crc32)
+        buffer.putUInt(compressedSize)
+        buffer.putUInt(uncompressedSize)
+        buffer.putUShort(nameBytes.size.toUShort())
+        buffer.putUShort(extraField.size.toUShort())
+        buffer.putUShort(commentBytes.size.toUShort())
+        buffer.putUShort(diskNumber)
+        buffer.putUShort(internalAttributes)
+        buffer.putUInt(externalAttributes)
+        buffer.putUInt(localHeaderOffset)
+
+        buffer.put(nameBytes)
+        buffer.put(extraField)
+        buffer.put(commentBytes)
+
+        buffer.flip()
+        return buffer
+    }
+}

app/src/main/java/app/revanced/manager/patcher/logger/Logger.kt

@@ -1,37 +0,0 @@
-package app.revanced.manager.patcher.logger
-
-import java.util.logging.Handler
-import java.util.logging.Level
-import java.util.logging.LogRecord
-
-abstract class Logger {
-    abstract fun log(level: LogLevel, message: String)
-
-    fun trace(msg: String) = log(LogLevel.TRACE, msg)
-    fun info(msg: String) = log(LogLevel.INFO, msg)
-    fun warn(msg: String) = log(LogLevel.WARN, msg)
-    fun error(msg: String) = log(LogLevel.ERROR, msg)
-
-    val handler = object : Handler() {
-        override fun publish(record: LogRecord) {
-            val msg = record.message
-
-            when (record.level) {
-                Level.INFO -> info(msg)
-                Level.SEVERE -> error(msg)
-                Level.WARNING -> warn(msg)
-                else -> trace(msg)
-            }
-        }
-
-        override fun flush() = Unit
-        override fun close() = Unit
-    }
-}
-
-enum class LogLevel {
-    TRACE,
-    INFO,
-    WARN,
-    ERROR,
-}

app/src/main/java/app/revanced/manager/patcher/patch/PatchBundle.kt

@@ -1,25 +1,30 @@
 package app.revanced.manager.patcher.patch
 
 import android.util.Log
+import app.revanced.manager.patcher.PatchClass
 import app.revanced.manager.util.tag
-import app.revanced.patcher.patch.Patch
-import app.revanced.patcher.patch.PatchLoader
+import app.revanced.patcher.Patcher
+import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
+import app.revanced.patcher.util.patch.PatchBundle
+import dalvik.system.PathClassLoader
 import java.io.File
-import java.io.IOException
-import java.util.jar.JarFile
 
-class PatchBundle(val patchesJar: File) {
-    private val loader = object : Iterable<Patch<*>> {
-        private fun load(): Iterable<Patch<*>> {
-            patchesJar.setReadOnly()
-            return PatchLoader.Dex(setOf(patchesJar))
-        }
+class PatchBundle(private val loader: Iterable<PatchClass>, val integrations: File?) {
+    constructor(bundleJar: File, integrations: File?) : this(
+        object : Iterable<PatchClass> {
+            private fun load(): List<PatchClass> {
+                val path = bundleJar.absolutePath
+                return PatchBundle.Dex(
+                    path,
+                    PathClassLoader(path, Patcher::class.java.classLoader)
+                ).loadPatches()
+            }
 
-        override fun iterator(): Iterator<Patch<*>> = load().iterator()
-    }
-
-    init {
-        Log.d(tag, "Loaded patch bundle: $patchesJar")
+            override fun iterator() = load().iterator()
+        },
+        integrations
+    ) {
+        Log.d(tag, "Loaded patch bundle: $bundleJar")
     }
 
     /**
@@ -27,26 +32,15 @@ class PatchBundle(val patchesJar: File) {
      */
     val patches = loader.map(::PatchInfo)
 
-    /**
-     * The [java.util.jar.Manifest] of [patchesJar].
-     */
-    private val manifest = try {
-        JarFile(patchesJar).use { it.manifest }
-    } catch (_: IOException) {
-        null
-    }
-
-    fun readManifestAttribute(name: String) = manifest?.mainAttributes?.getValue(name)
-
     /**
      * Load all patches compatible with the specified package.
      */
-    fun patches(packageName: String) = loader.filter { patch ->
+    fun patchClasses(packageName: String) = loader.filter { patch ->
         val compatiblePackages = patch.compatiblePackages
             ?: // The patch has no compatibility constraints, which means it is universal.
             return@filter true
 
-        if (!compatiblePackages.any { (name, _) -> name == packageName }) {
+        if (!compatiblePackages.any { it.name == packageName }) {
             // Patch is not compatible with this package.
             return@filter false
         }