diff --git a/android/app/build.gradle b/android/app/build.gradle index 25e10445..42a9a7d0 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -85,7 +85,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" // ReVanced - implementation "app.revanced:revanced-patcher:16.0.2" + implementation "app.revanced:revanced-patcher:17.0.0" // Signing & aligning implementation("org.bouncycastle:bcpkix-jdk15on:1.70") diff --git a/android/app/src/main/kotlin/app/revanced/manager/flutter/MainActivity.kt b/android/app/src/main/kotlin/app/revanced/manager/flutter/MainActivity.kt index b88abb82..77d08d1d 100644 --- a/android/app/src/main/kotlin/app/revanced/manager/flutter/MainActivity.kt +++ b/android/app/src/main/kotlin/app/revanced/manager/flutter/MainActivity.kt @@ -22,7 +22,6 @@ import org.json.JSONObject import java.io.File import java.io.PrintWriter import java.io.StringWriter -import java.lang.Error import java.util.logging.LogRecord import java.util.logging.Logger @@ -55,6 +54,7 @@ class MainActivity : FlutterActivity() { val outFilePath = call.argument("outFilePath") val integrationsPath = call.argument("integrationsPath") val selectedPatches = call.argument>("selectedPatches") + val options = call.argument>>("options") val cacheDirPath = call.argument("cacheDirPath") val keyStoreFilePath = call.argument("keyStoreFilePath") val keystorePassword = call.argument("keystorePassword") @@ -66,6 +66,7 @@ class MainActivity : FlutterActivity() { outFilePath != null && integrationsPath != null && selectedPatches != null && + options != null && cacheDirPath != null && keyStoreFilePath != null && keystorePassword != null @@ -79,6 +80,7 @@ class MainActivity : FlutterActivity() { outFilePath, integrationsPath, selectedPatches, + options, cacheDirPath, keyStoreFilePath, keystorePassword @@ -127,6 +129,28 @@ class MainActivity : FlutterActivity() { put(compatiblePackageJson) } }) + put("options", JSONArray().apply { + it.options.values.forEach { option -> + val optionJson = JSONObject().apply option@{ + put("key", option.key) + put("title", option.title) + put("description", option.description) + put("required", option.required) + + when (val value = option.value) { + null -> put("value", null) + is Array<*> -> put("value", JSONArray().apply { + + value.forEach { put(it) } + }) + else -> put("value", option.value) + } + + put("optionClassType", option::class.simpleName) + } + put(optionJson) + } + }) }.let(::put) } }.toString().let(result::success) @@ -145,6 +169,7 @@ class MainActivity : FlutterActivity() { outFilePath: String, integrationsPath: String, selectedPatches: List, + options: Map>, cacheDirPath: String, keyStoreFilePath: String, keystorePassword: String @@ -182,7 +207,7 @@ class MainActivity : FlutterActivity() { object : java.util.logging.Handler() { override fun publish(record: LogRecord) { - if (record.loggerName?.startsWith("app.revanced") != true) return + if (record.loggerName?.startsWith("app.revanced") != true || cancel) return updateProgress(-1.0, "", record.message) } @@ -215,6 +240,7 @@ class MainActivity : FlutterActivity() { cacheDir, Aapt.binary(applicationContext).absolutePath, cacheDir.path, + true // TODO: Add option to disable this ) ) @@ -234,6 +260,10 @@ class MainActivity : FlutterActivity() { isCompatible || patch.compatiblePackages.isNullOrEmpty() compatibleOrUniversal && selectedPatches.any { it == patch.name } + }.onEach { patch -> + options[patch.name]?.forEach { (key, value) -> + patch.options[key] = value + } } if (cancel) { diff --git a/android/build.gradle b/android/build.gradle index bfe266a7..0165e070 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -16,11 +16,7 @@ allprojects { google() mavenCentral() maven { - url = uri("https://maven.pkg.github.com/revanced/revanced-patcher") - credentials { - username = (project.findProperty("gpr.user") ?: System.getenv("GITHUB_ACTOR")) as String - password = (project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")) as String - } + url 'https://jitpack.io' } mavenLocal() } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 76777308..3c472b99 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=a01b6587e15fe7ed120a0ee299c25982a1eee045abd6a9dd5e216b2f628ef9ac -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip -networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip diff --git a/assets/i18n/en_US.json b/assets/i18n/en_US.json index a7954b1b..f61c6192 100644 --- a/assets/i18n/en_US.json +++ b/assets/i18n/en_US.json @@ -10,9 +10,11 @@ "yesButton": "Yes", "noButton": "No", "warning": "Warning", + "options": "Options", "notice": "Notice", "noShowAgain": "Don't show this again", - "new": "New", + "add": "Add", + "remove": "Remove", "navigationView": { "dashboardTab": "Dashboard", "patcherTab": "Patcher", @@ -71,7 +73,8 @@ "armv7WarningDialogText": "Patching on ARMv7 devices is not yet supported and might fail. Proceed anyways?", - "removedPatchesWarningDialogText": "The following patches have been removed since the last time you used them.\n\n{patches}\n\nProceed anyways?" + "removedPatchesWarningDialogText": "The following patches have been removed since the last time you used them.\n\n{patches}\n\nProceed anyways?", + "requiredOptionDialogText" : "Some patch options have to be set." }, "appSelectorCard": { "widgetTitle": "Select an application", @@ -114,6 +117,8 @@ "viewTitle": "Select patches", "searchBarHint": "Search patches", "universalPatches": "Universal patches", + "newPatches": "New patches", + "patches": "Patches", "doneButton": "Done", @@ -126,15 +131,29 @@ "loadPatchesSelection": "Load patches selection", "noSavedPatches": "No saved patches for the selected app.\nPress Done to save current selection.", "noPatchesFound": "No patches found for the selected app", + "setRequiredOption": "Some patches require options to be set:\n\n{patches}\n\nPlease set them before continuing.", "selectAllPatchesWarningContent": "You are about to select all patches, that includes non-suggested patches and can cause unwanted behavior." }, + "patchOptionsView": { + "viewTitle": "Patch options", + "saveOptions": "Save", + + "addOptions": "Add options", + "deselectPatch": "Deselect patch", + "tooltip": "More input options", + "selectFilePath": "Select file path", + "selectFolder": "Select folder", + "selectOption": "Select option", + + "requiredOption": "This option is required", + "unsupportedOption": "This option is not supported", + "requiredOptionNull": "The following options have to be set:\n\n{options}" + }, "patchItem": { "unsupportedDialogText": "Selecting this patch may result in patching errors.\n\nApp version: {packageVersion}\nSupported versions:\n{supportedVersions}", "unsupportedPatchVersion": "Patch is not supported for this app version. Enable the experimental toggle in settings to proceed.", - - "newPatchDialogText": "This is a new patch that has been added since the last time you have patched this app.", - "newPatch": "New patch", + "unsupportedRequiredOption": "This patch contains a required option that is not supported by this app", "patchesChangeWarningDialogText": "It is recommended to use the default selection of patches because changing it may cause unexpected issues.\n\nIf you know what you are doing, you can enable \"Enable changing selection\" in the settings.", "patchesChangeWarningDialogButton": "Use default selection" @@ -239,10 +258,17 @@ "resetStoredPatchesLabel": "Reset patches", "resetStoredPatchesHint": "Reset the stored patches selection", + "resetStoredOptionsLabel": "Reset options", + "resetStoredOptionsHint": "Reset all patch options", + "resetStoredPatchesDialogTitle": "Reset patches selection?", "resetStoredPatchesDialogText": "Resetting patches selection will remove all selected patches.", "resetStoredPatches": "Patches selection has been reset", + "resetStoredOptionsDialogTitle": "Reset options?", + "resetStoredOptionsDialogText": "Resetting options will remove all saved options.", + "resetStoredOptions": "Options have been reset", + "deleteLogsLabel": "Delete logs", "deleteLogsHint": "Delete collected manager logs", "deletedLogs": "Logs deleted", diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..249e5832 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..ae04661e --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 00000000..a69d9cb6 --- /dev/null +++ b/gradlew @@ -0,0 +1,240 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..f127cfd4 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,91 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/lib/app/app.dart b/lib/app/app.dart index 76c32b19..0ed666d2 100644 --- a/lib/app/app.dart +++ b/lib/app/app.dart @@ -9,6 +9,8 @@ import 'package:revanced_manager/ui/views/home/home_viewmodel.dart'; import 'package:revanced_manager/ui/views/installer/installer_view.dart'; import 'package:revanced_manager/ui/views/navigation/navigation_view.dart'; import 'package:revanced_manager/ui/views/navigation/navigation_viewmodel.dart'; +import 'package:revanced_manager/ui/views/patch_options/patch_options_view.dart'; +import 'package:revanced_manager/ui/views/patch_options/patch_options_viewmodel.dart'; import 'package:revanced_manager/ui/views/patcher/patcher_view.dart'; import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart'; import 'package:revanced_manager/ui/views/patches_selector/patches_selector_view.dart'; @@ -23,6 +25,7 @@ import 'package:stacked_services/stacked_services.dart'; MaterialRoute(page: PatcherView), MaterialRoute(page: AppSelectorView), MaterialRoute(page: PatchesSelectorView), + MaterialRoute(page: PatchOptionsView), MaterialRoute(page: InstallerView), MaterialRoute(page: SettingsView), MaterialRoute(page: ContributorsView), @@ -32,6 +35,7 @@ import 'package:stacked_services/stacked_services.dart'; LazySingleton(classType: NavigationViewModel), LazySingleton(classType: HomeViewModel), LazySingleton(classType: PatcherViewModel), + LazySingleton(classType: PatchOptionsViewModel), LazySingleton(classType: NavigationService), LazySingleton(classType: ManagerAPI), LazySingleton(classType: PatcherAPI), diff --git a/lib/models/patch.dart b/lib/models/patch.dart index fe2b3c33..59c419e7 100644 --- a/lib/models/patch.dart +++ b/lib/models/patch.dart @@ -9,6 +9,7 @@ class Patch { required this.description, required this.excluded, required this.compatiblePackages, + required this.options, }); factory Patch.fromJson(Map json) => _$PatchFromJson(json); @@ -16,6 +17,7 @@ class Patch { final String? description; final bool excluded; final List compatiblePackages; + final List