fix(Komoot): Updated patches to support version 2025.38.2

Author: brosssh

patches/src/main/kotlin/app/revanced/patches/komoot/premium/Fingerprints.kt

@@ -2,32 +2,41 @@ package app.revanced.patches.komoot.premium
 
 import app.revanced.patcher.fingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
 
 internal val premiumConfigFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
-    opcodes(
-        Opcode.MOVE_OBJECT,
-        Opcode.INVOKE_DIRECT
+    parameters(
+        "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L",
+        "L", "L", "L", "L", "L", "L", "L", "L", "L" ,"L",
+        "Ljava/lang/Boolean;", "L"
     )
     custom { _, classDef ->
         classDef.endsWith("api/model/AppConfigV3;")
     }
 }
 
-internal val displayPremiumFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    parameters("L")
-    returns("L")
+internal val publicUserInitFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
+    parameters("L", "L", "L", "L", "Z")
+    custom { _, classDef ->
+        classDef.endsWith("api/model/PublicUserProfileV7;")
+    }
+}
+
+private const val routingPermissionClassName = "Lde/komoot/android/services/api/model/RoutingPermission"
+
+internal val routingPermissionInitFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
+    parameters("$routingPermissionClassName${"$"}StatusPermission;")
     custom { _, classDef ->
-        classDef.endsWith("PublicUserProfileV7\$Companion;")
+        classDef.type == "$routingPermissionClassName;"
     }
 }
 
-internal val routingPermissionFingerprint = fingerprint {
+internal val routingPermissionInitJsonFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
-    parameters("L")
+    parameters("Lorg/json/JSONObject;")
     custom { _, classDef ->
-        classDef.endsWith("api/model/RoutingPermission;")
+        classDef.type == "$routingPermissionClassName;"
     }
 }

patches/src/main/kotlin/app/revanced/patches/komoot/premium/UnlockPremiumFeaturesPatch.kt

@@ -1,55 +1,48 @@
 package app.revanced.patches.komoot.premium
 
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.util.addInstructionsAtControlFlowLabel
+import app.revanced.util.indexOfFirstInstructionReversed
 import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
 
 @Suppress("unused")
 val unlockProPatch = bytecodePatch(
     name = "Unlock Premium features",
     description = "Unlock Premium features. Some features are not possible to patch (server sided), " +
             "such as saving a multi-days hike."
 ) {
-    compatibleWith("de.komoot.android"("2024.29.3"))
+    compatibleWith("de.komoot.android"("2025.38.2"))
 
     execute {
         premiumConfigFingerprint.method.apply {
-            val index = implementation!!.instructions.indexOfLast{
-                Opcode.MOVE_OBJECT_FROM16 == it.opcode
-            }
-
-            addInstructions(
-                index,
-                """
-                    sget-object v1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
-                    iput-object v1, v0, Lde/komoot/android/services/api/model/AppConfigV3;->v:Ljava/lang/Boolean;
-                """
+            addInstruction(
+                0,
+                "sget-object p22, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;"
             )
         }
 
-        displayPremiumFingerprint.method.apply {
-            val index = implementation!!.instructions.indexOfLast{
-                Opcode.INVOKE_DIRECT_RANGE == it.opcode
-            }
+        publicUserInitFingerprint.method.addInstruction(
+                0,
+                "const/4 p5, 0x1"
+        )
+
+        fun MutableMethod.grantRoutingPermission() {
+            val index = indexOfFirstInstructionReversed(Opcode.IPUT_OBJECT)
 
-            addInstructions(
+            val routingStatusRegister = getInstruction<TwoRegisterInstruction>(index).registerA
+
+            addInstructionsAtControlFlowLabel(
                 index,
-                """
-                    const/4 v0, 0x1
-                    move v6, v0
-                """
+                "sget-object v$routingStatusRegister, Lde/komoot/android/services/api/model/RoutingPermission\$StatusPermission;->GRANTED:Lde/komoot/android/services/api/model/RoutingPermission\$StatusPermission;",
             )
         }
 
-        routingPermissionFingerprint.method.apply {
-            val index = implementation!!.instructions.indexOfLast{
-                Opcode.MOVE_RESULT_OBJECT == it.opcode
-            }
+        routingPermissionInitJsonFingerprint.method.grantRoutingPermission()
 
-            addInstructions(
-                index + 1,
-                "sget-object p1, Lde/komoot/android/services/api/model/RoutingPermission\$StatusPermission;->GRANTED:Lde/komoot/android/services/api/model/RoutingPermission\$StatusPermission;",
-            )
-        }
+        routingPermissionInitFingerprint.method.grantRoutingPermission()
     }
 }