chore(release): 2.191.0-dev.23 [skip ci]

# [2.191.0-dev.23](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.22...v2.191.0-dev.23) (2023-09-30) ### Features * **SPB Serviceportal Bund:** Add `Remove root detection` patch ([#3049](https://github.com/ReVanced/revanced-patches/issues/3049)) ([3e9e1e2](3e9e1e2577))
feat(SPB Serviceportal Bund): Add Remove root detection patch (#3049 )
2025-12-07 09:53:55 +01:00 · 2023-09-30 17:25:56 +00:00 · 2023-09-30 19:22:03 +02:00 · 2023-09-28 16:10:57 +00:00 · 2023-09-28 18:07:55 +02:00 · 2023-09-28 13:42:22 +00:00
10 changed files with 92 additions and 34 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,24 @@
+# [2.191.0-dev.23](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.22...v2.191.0-dev.23) (2023-09-30)
+
+
+### Features
+
+* **SPB Serviceportal Bund:** Add `Remove root detection` patch ([#3049](https://github.com/ReVanced/revanced-patches/issues/3049)) ([481bf58](https://github.com/ReVanced/revanced-patches/commit/481bf583afbf954bef1c4e5349a62ea1c623115a))
+
+# [2.191.0-dev.22](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.21...v2.191.0-dev.22) (2023-09-28)
+
+
+### Bug Fixes
+
+* **YouTube - Premium heading:** Correct inverted logic ([#3042](https://github.com/ReVanced/revanced-patches/issues/3042)) ([b33ed75](https://github.com/ReVanced/revanced-patches/commit/b33ed757370653b8eb0002b0977eedfbc73dbe5e))
+
+# [2.191.0-dev.21](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.20...v2.191.0-dev.21) (2023-09-28)
+
+
+### Bug Fixes
+
+* **YouTube - ReturnYouTubeDislike:** Revert support for 18.37.36 ([#3041](https://github.com/ReVanced/revanced-patches/issues/3041)) ([3761073](https://github.com/ReVanced/revanced-patches/commit/37610732da87549c22a430bb62d10793dfa2e696))
+
 # [2.191.0-dev.20](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.19...v2.191.0-dev.20) (2023-09-28)


--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 2.191.0-dev.20
+version = 2.191.0-dev.23
--- a/patches.json
+++ b/patches.json
--- a/src/main/kotlin/app/revanced/patches/serviceportalbund/detection/root/RootDetectionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/serviceportalbund/detection/root/RootDetectionPatch.kt
@@ -0,0 +1,21 @@
+package app.revanced.patches.serviceportalbund.detection.root
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.serviceportalbund.detection.root.fingerprints.RootDetectionFingerprint
+
+@Patch(
+    name = "Remove root detection",
+    description = "Removes the check for root permissions and unlocked bootloader.",
+    compatiblePackages = [CompatiblePackage("at.gv.bka.serviceportal")]
+)
+@Suppress("unused")
+object RootDetectionPatch : BytecodePatch(
+    setOf(RootDetectionFingerprint)
+) {
+    override fun execute(context: BytecodeContext) =
+        RootDetectionFingerprint.result!!.mutableMethod.addInstruction(0, "return-void")
+}
--- a/src/main/kotlin/app/revanced/patches/serviceportalbund/detection/root/fingerprints/RootDetectionFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/serviceportalbund/detection/root/fingerprints/RootDetectionFingerprint.kt
@@ -0,0 +1,12 @@
+package app.revanced.patches.serviceportalbund.detection.root.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+object RootDetectionFingerprint : MethodFingerprint(
+    "V",
+    accessFlags = AccessFlags.PUBLIC.value,
+    customFingerprint = { methodDef, _ ->
+        methodDef.definingClass.endsWith("/DeviceIntegrityCheck;")
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/PremiumHeadingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/PremiumHeadingPatch.kt
@@ -32,9 +32,9 @@ object PremiumHeadingPatch : ResourcePatch() {
        val resDirectory = context["res"]

        val (original, replacement) = if (usePremiumHeading!!)
-            DEFAULT_HEADING_RES to PREMIUM_HEADING_RES
-        else
            PREMIUM_HEADING_RES to DEFAULT_HEADING_RES
+        else
+            DEFAULT_HEADING_RES to PREMIUM_HEADING_RES

        val variants = arrayOf("light", "dark")

--- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikePatch.kt
@@ -31,7 +31,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
        PlayerTypeHookPatch::class,
    ],
    compatiblePackages = [
-        CompatiblePackage("com.google.android.youtube", ["18.37.36"])
+        CompatiblePackage("com.google.android.youtube", ["18.32.39"])
    ]
 )
@Suppress("unused")
@@ -89,40 +89,49 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
                throw TextComponentAtomicReferenceFingerprint.exception
        }?.let { textComponentContextFingerprintResult ->
            val conversionContextIndex = textComponentContextFingerprintResult
-                .scanResult.patternScanResult!!.endIndex
+                .scanResult.patternScanResult!!.startIndex
            val atomicReferenceStartIndex = TextComponentAtomicReferenceFingerprint.result!!
                .scanResult.patternScanResult!!.startIndex

-            val insertIndex = atomicReferenceStartIndex + 9
+            val insertIndex = atomicReferenceStartIndex + 6

            textComponentContextFingerprintResult.mutableMethod.apply {
-                // Get the conversion context obfuscated field name
+                // Get the conversion context obfuscated field name, and the registers for the AtomicReference and CharSequence
                val conversionContextFieldReference =
                    getInstruction<ReferenceInstruction>(conversionContextIndex).reference

-                // Free register to hold the conversion context
+                // Reuse the free register to make room for the atomic reference register.
                val freeRegister =
                    getInstruction<TwoRegisterInstruction>(atomicReferenceStartIndex).registerB

                val atomicReferenceRegister =
-                    getInstruction<FiveRegisterInstruction>(atomicReferenceStartIndex + 6).registerC
+                    getInstruction<FiveRegisterInstruction>(atomicReferenceStartIndex + 1).registerC

-                // Instruction that is replaced, and also has the CharacterSequence register.
-                val moveCharSequenceInstruction = getInstruction<TwoRegisterInstruction>(insertIndex)
+                val moveCharSequenceInstruction = getInstruction<TwoRegisterInstruction>(insertIndex - 1)
                val charSequenceSourceRegister = moveCharSequenceInstruction.registerB
                val charSequenceTargetRegister = moveCharSequenceInstruction.registerA

+                // In order to preserve the atomic reference register, because it is overwritten,
+                // use another free register to store it.
+                replaceInstruction(
+                    atomicReferenceStartIndex + 2,
+                    "move-result-object v$freeRegister"
+                )
+                replaceInstruction(
+                    atomicReferenceStartIndex + 3,
+                    "move-object v$charSequenceSourceRegister, v$freeRegister"
+                )
+
                // Move the current instance to the free register, and get the conversion context from it.
-                // Must replace the instruction to preserve the control flow label.
-                replaceInstruction(insertIndex, "move-object/from16 v$freeRegister, p0")
+                replaceInstruction(insertIndex - 1, "move-object/from16 v$freeRegister, p0")
                addInstructions(
-                    insertIndex + 1,
+                    insertIndex,
                    """
                        # Move context to free register
-                        iget-object v$freeRegister, v$freeRegister, $conversionContextFieldReference
+                        iget-object v$freeRegister, v$freeRegister, $conversionContextFieldReference 
                        invoke-static {v$freeRegister, v$atomicReferenceRegister, v$charSequenceSourceRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->onLithoTextLoaded(Ljava/lang/Object;Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
                        move-result-object v$freeRegister
-                        # Replace the original instruction
+                        # Replace the original char sequence with the modified one.
                        move-object v${charSequenceTargetRegister}, v${freeRegister}
                    """
                )
@@ -141,7 +150,7 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
                val isDisLikesBooleanReference = getInstruction<ReferenceInstruction>(patternResult.endIndex).reference

                val textViewFieldReference = // Like/Dislike button TextView field
-                    getInstruction<ReferenceInstruction>(patternResult.endIndex - 1).reference
+                    getInstruction<ReferenceInstruction>(patternResult.endIndex - 2).reference

                // Check if the hooked TextView object is that of the dislike button.
                // If RYD is disabled, or the TextView object is not that of the dislike button, the execution flow is not interrupted.
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/ShortsTextViewFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/ShortsTextViewFingerprint.kt
@@ -27,6 +27,7 @@ object ShortsTextViewFingerprint : MethodFingerprint(
        Opcode.IF_EQ,
        Opcode.RETURN_VOID,
        Opcode.IGET_OBJECT,     // TextView field
+        Opcode.CHECK_CAST,
        Opcode.IGET_BOOLEAN,    // boolean field
    )
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentAtomicReferenceFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentAtomicReferenceFingerprint.kt
@@ -13,17 +13,13 @@ object TextComponentAtomicReferenceFingerprint : MethodFingerprint(
    accessFlags = AccessFlags.PROTECTED or AccessFlags.FINAL,
    parameters = listOf("L"),
    opcodes = listOf(
-        Opcode.MOVE_OBJECT, // Register B is free register
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.MOVE_OBJECT_FROM16,
+        Opcode.MOVE_OBJECT, // Register A and B is context, use B as context, reuse A as free register
        Opcode.INVOKE_VIRTUAL, // Register C is atomic reference
        Opcode.MOVE_RESULT_OBJECT, // Register A is char sequence
+        Opcode.MOVE_OBJECT,
        Opcode.CHECK_CAST,
-        Opcode.MOVE_OBJECT, // Replace this instruction with patch code
-        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_OBJECT,
+        Opcode.INVOKE_INTERFACE, // Insert hook here
        Opcode.MOVE_RESULT,
        Opcode.IF_EQZ,
        Opcode.INVOKE_INTERFACE,
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentContextFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentContextFingerprint.kt
@@ -13,14 +13,12 @@ object TextComponentContextFingerprint : MethodFingerprint(
    accessFlags = AccessFlags.PROTECTED or AccessFlags.FINAL,
    parameters = listOf("L"),
    opcodes = listOf(
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.INVOKE_STATIC_RANGE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
        Opcode.IGET_OBJECT, // conversion context field name
+        Opcode.IGET_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.IGET_BOOLEAN,
+        Opcode.IGET,
+        Opcode.IGET,
+        Opcode.IGET,
    )
 )
Author	SHA1	Message	Date
semantic-release-bot	928df2428d	chore(release): 2.191.0-dev.23 [skip ci] # [2.191.0-dev.23](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.22...v2.191.0-dev.23) (2023-09-30) ### Features * SPB Serviceportal Bund: Add `Remove root detection` patch ([#3049](https://github.com/ReVanced/revanced-patches/issues/3049)) ([`3e9e1e2`](`3e9e1e2577`))	2023-09-30 17:25:56 +00:00
David Gnedt	3e9e1e2577	feat(SPB Serviceportal Bund): Add `Remove root detection` patch (#3049 )	2023-09-30 19:22:03 +02:00
semantic-release-bot	5ebec9b424	chore(release): 2.191.0-dev.22 [skip ci] # [2.191.0-dev.22](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.21...v2.191.0-dev.22) (2023-09-28) ### Bug Fixes * YouTube - Premium heading: Correct inverted logic ([#3042](https://github.com/ReVanced/revanced-patches/issues/3042)) ([`0204ff6`](`0204ff67a9`))	2023-09-28 16:10:57 +00:00
aliernfrog	0204ff67a9	fix(YouTube - Premium heading): Correct inverted logic (#3042 )	2023-09-28 18:07:55 +02:00
semantic-release-bot	7d2a707030	chore(release): 2.191.0-dev.21 [skip ci] # [2.191.0-dev.21](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.20...v2.191.0-dev.21) (2023-09-28) ### Bug Fixes * YouTube - ReturnYouTubeDislike: Revert support for 18.37.36 ([#3041](https://github.com/ReVanced/revanced-patches/issues/3041)) ([`26e0e4c`](`26e0e4cd1d`))	2023-09-28 13:42:22 +00:00
LisoUseInAIKyrios	26e0e4cd1d	fix(YouTube - ReturnYouTubeDislike): Revert support for 18.37.36 (#3041 )	2023-09-28 17:39:29 +04:00