Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/kotlin/app/morphe/cli/command/PatchCommand.kt
Original file line number Diff line number Diff line change
Expand Up @@ -544,19 +544,19 @@ internal object PatchCommand : Callable<Int> {
packageVersion: String,
): Set<Patch<*>> = buildSet {
val enabledPatchesByName =
selection.mapNotNull { it.enabled?.selector?.name }.toSet()
selection.mapNotNull { it.enabled?.selector?.name?.lowercase() }.toSet()
val enabledPatchesByIndex =
selection.mapNotNull { it.enabled?.selector?.index }.toSet()

val disabledPatches =
selection.mapNotNull { it.disable?.selector?.name }.toSet()
selection.mapNotNull { it.disable?.selector?.name?.lowercase() }.toSet()
val disabledPatchesByIndex =
selection.mapNotNull { it.disable?.selector?.index }.toSet()

this@filterPatchSelection.withIndex().forEach patchLoop@{ (i, patch) ->
val patchName = patch.name!!

val isManuallyDisabled = patchName in disabledPatches || i in disabledPatchesByIndex
val isManuallyDisabled = patchName.lowercase() in disabledPatches || i in disabledPatchesByIndex
if (isManuallyDisabled) return@patchLoop logger.info("\"$patchName\" disabled manually")

// Make sure the patch is compatible with the supplied APK files package name and version.
Expand Down Expand Up @@ -588,7 +588,7 @@ internal object PatchCommand : Callable<Int> {
} ?: logger.fine("\"$patchName\" has no package constraints")

val isEnabled = !exclusive && patch.use
val isManuallyEnabled = patchName in enabledPatchesByName || i in enabledPatchesByIndex
val isManuallyEnabled = patchName.lowercase() in enabledPatchesByName || i in enabledPatchesByIndex

if (!(isEnabled || isManuallyEnabled)) {
return@patchLoop logger.info("\"$patchName\" disabled")
Expand Down
Loading