From 649f06b19dd4d2a3f3216a0b3ea947b9fe0d475f Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Mon, 11 Nov 2024 23:29:43 +0100 Subject: [PATCH 1/4] fix: Detect if app is installed by fixing inversion --- .../revanced/library/installation/installer/RootInstaller.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/commonMain/kotlin/app/revanced/library/installation/installer/RootInstaller.kt b/src/commonMain/kotlin/app/revanced/library/installation/installer/RootInstaller.kt index 9fd4fac..2a3514a 100644 --- a/src/commonMain/kotlin/app/revanced/library/installation/installer/RootInstaller.kt +++ b/src/commonMain/kotlin/app/revanced/library/installation/installer/RootInstaller.kt @@ -122,13 +122,12 @@ abstract class RootInstaller internal constructor( * @throws FailedToFindInstalledPackageException If the package is not installed. */ private fun String.assertInstalled() { - if (INSTALLED_APK_PATH(this)().output.isNotEmpty()) { + if (INSTALLED_APK_PATH(this)().output.isEmpty()) { throw FailedToFindInstalledPackageException(this) } } - internal class FailedToFindInstalledPackageException internal constructor(packageName: String) : - Exception("Failed to find installed package \"$packageName\" because no activity was found") + internal class FailedToFindInstalledPackageException internal constructor(packageName: String) : Exception("Failed to find installed package \"$packageName\" because no activity was found") internal class PackageNameRequiredException internal constructor() : Exception("Package name is required") internal class NoRootPermissionException internal constructor() : Exception("No root permission") From e7a98b5795d70e957c196732374ec7650c1c5772 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 11 Nov 2024 22:32:39 +0000 Subject: [PATCH 2/4] chore: Release v3.0.3-dev.1 [skip ci] ## [3.0.3-dev.1](https://github.com/ReVanced/revanced-library/compare/v3.0.2...v3.0.3-dev.1) (2024-11-11) ### Bug Fixes * Detect if app is installed by fixing inversion ([649f06b](https://github.com/ReVanced/revanced-library/commit/649f06b19dd4d2a3f3216a0b3ea947b9fe0d475f)) --- CHANGELOG.md | 7 +++++++ gradle.properties | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e5a874..a740dd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [3.0.3-dev.1](https://github.com/ReVanced/revanced-library/compare/v3.0.2...v3.0.3-dev.1) (2024-11-11) + + +### Bug Fixes + +* Detect if app is installed by fixing inversion ([649f06b](https://github.com/ReVanced/revanced-library/commit/649f06b19dd4d2a3f3216a0b3ea947b9fe0d475f)) + ## [3.0.2](https://github.com/ReVanced/revanced-library/compare/v3.0.1...v3.0.2) (2024-11-05) ## [3.0.2-dev.1](https://github.com/ReVanced/revanced-library/compare/v3.0.1...v3.0.2-dev.1) (2024-11-05) diff --git a/gradle.properties b/gradle.properties index 83bbbb1..7b11191 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version = 3.0.2 +version = 3.0.3-dev.1 #Gradle org.gradle.jvmargs = -Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options="-Xmx2048M" org.gradle.caching = true From 7ec650461935faf2a8fbb667db3cf137157b70b5 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Mon, 25 Nov 2024 22:20:32 +0100 Subject: [PATCH 3/4] feat: Warn when option could not be set because the option does not exist --- src/commonMain/kotlin/app/revanced/library/Options.kt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/commonMain/kotlin/app/revanced/library/Options.kt b/src/commonMain/kotlin/app/revanced/library/Options.kt index 32ada70..2e1bd39 100644 --- a/src/commonMain/kotlin/app/revanced/library/Options.kt +++ b/src/commonMain/kotlin/app/revanced/library/Options.kt @@ -19,11 +19,16 @@ private val logger = Logger.getLogger("Options") * @param options The options to set. The key is the patch name and the value is a map of option keys to option values. */ fun Set>.setOptions(options: PatchesOptions) = filter { it.name != null }.forEach { patch -> - val patchOptions = options[patch.name] ?: return@forEach + options[patch.name]?.forEach setOption@{ (optionKey, optionValue) -> + if (optionKey !in patch.options) { + return@setOption logger.warning( + "Could not set option for the \"${patch.name}\" patch because " + + "option with key \"${optionKey}\" does not exist", + ) + } - patch.options.forEach option@{ option -> try { - patch.options[option.key] = patchOptions[option.key] ?: return@option + patch.options[optionKey] = optionValue } catch (e: OptionException) { logger.warning("Could not set option value for the \"${patch.name}\" patch: ${e.message}") } From 2328902b6b17964115d8afe71129377c2c85a06f Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 25 Nov 2024 21:30:09 +0000 Subject: [PATCH 4/4] chore: Release v3.1.0-dev.1 [skip ci] # [3.1.0-dev.1](https://github.com/ReVanced/revanced-library/compare/v3.0.3-dev.1...v3.1.0-dev.1) (2024-11-25) ### Features * Warn when option could not be set because the option does not exist ([7ec6504](https://github.com/ReVanced/revanced-library/commit/7ec650461935faf2a8fbb667db3cf137157b70b5)) --- CHANGELOG.md | 7 +++++++ gradle.properties | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a740dd3..2e495fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [3.1.0-dev.1](https://github.com/ReVanced/revanced-library/compare/v3.0.3-dev.1...v3.1.0-dev.1) (2024-11-25) + + +### Features + +* Warn when option could not be set because the option does not exist ([7ec6504](https://github.com/ReVanced/revanced-library/commit/7ec650461935faf2a8fbb667db3cf137157b70b5)) + ## [3.0.3-dev.1](https://github.com/ReVanced/revanced-library/compare/v3.0.2...v3.0.3-dev.1) (2024-11-11) diff --git a/gradle.properties b/gradle.properties index 7b11191..fd422c4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version = 3.0.3-dev.1 +version = 3.1.0-dev.1 #Gradle org.gradle.jvmargs = -Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options="-Xmx2048M" org.gradle.caching = true