From 76dcd4c479848bb6520cd99e7c13b33d0ec87eb8 Mon Sep 17 00:00:00 2001 From: naijun0403 Date: Wed, 21 May 2025 02:55:35 +0900 Subject: [PATCH] feat(kakaotalk): rename fingerprint variables for clarity and consistency Going forward, fingerprints will follow the filename of the corresponding patch, but will name the variables that are finely fingerprinted after the functionality of the method for the intended target. This is to promote reusability, and hopefully increase maintainability in the future. --- .../revanced/patches/kakaotalk/ads/RemoveBizBoardPatch.kt | 4 ++-- .../revanced/patches/kakaotalk/ads/RemoveFocusAdPatch.kt | 4 ++-- .../patches/kakaotalk/ads/RemoveOlkChatRoomListAdPatch.kt | 4 ++-- .../ads/fingerprints/RemoveBizBoardFingerprint.kt | 2 +- .../ads/fingerprints/RemoveFocusAdFingerprint.kt | 2 +- .../fingerprints/RemoveOlkChatRoomListAdFingerprint.kt | 2 +- .../patches/kakaotalk/chatlog/Remove99ClampPatch.kt | 4 ++-- .../chatlog/fingerprints/Remove99ClampFingerprint.kt | 2 +- .../patches/kakaotalk/chatroom/Remove300PlusLimitPatch.kt | 8 ++++---- .../fingerprints/Remove300PlusLimitFingerprint.kt | 4 ++-- .../kakaotalk/emoticon/ForceEnableEmoticonPlusPatch.kt | 4 ++-- .../fingerprints/ForceEnableEmoticonPlusFingerprint.kt | 2 +- .../revanced/patches/kakaotalk/ghost/GhostModePatch.kt | 4 ++-- .../kakaotalk/ghost/fingerprints/GhostModeFingerprint.kt | 2 +- .../patches/kakaotalk/integrity/BypassMoatCheckPatch.kt | 8 ++++---- .../kakaotalk/integrity/BypassRequestChecksumsPatch.kt | 4 ++-- .../integrity/fingerprints/BypassMoatCheckFingerprint.kt | 4 ++-- .../fingerprints/BypassRequestChecksumsFingerprint.kt | 2 +- .../revanced/patches/kakaotalk/misc/RemoveShopTabPatch.kt | 4 ++-- .../misc/fingerprints/RemoveShopTabFingerprint.kt | 2 +- 20 files changed, 36 insertions(+), 36 deletions(-) diff --git a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ads/RemoveBizBoardPatch.kt b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ads/RemoveBizBoardPatch.kt index 2695d6749..4274d9a41 100644 --- a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ads/RemoveBizBoardPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ads/RemoveBizBoardPatch.kt @@ -2,7 +2,7 @@ package app.revanced.patches.kakaotalk.ads import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.patch.bytecodePatch -import app.revanced.patches.kakaotalk.ads.fingerprints.removeBizBoardFingerprint +import app.revanced.patches.kakaotalk.ads.fingerprints.measuringBizBoardFingerprint @Suppress("unused") val removeBizBoardPatch = bytecodePatch( @@ -12,7 +12,7 @@ val removeBizBoardPatch = bytecodePatch( compatibleWith("com.kakao.talk"("25.4.2")) execute { - val method = removeBizBoardFingerprint.method + val method = measuringBizBoardFingerprint.method method.addInstructions( 0, diff --git a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ads/RemoveFocusAdPatch.kt b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ads/RemoveFocusAdPatch.kt index 79f77cf07..e92aa892d 100644 --- a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ads/RemoveFocusAdPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ads/RemoveFocusAdPatch.kt @@ -2,7 +2,7 @@ package app.revanced.patches.kakaotalk.ads import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.patch.bytecodePatch -import app.revanced.patches.kakaotalk.ads.fingerprints.removeFocusAdFingerprint +import app.revanced.patches.kakaotalk.ads.fingerprints.loadFocusAdFingerprint val removeFocusAdPatch = bytecodePatch( name = "Remove focus ad", @@ -11,7 +11,7 @@ val removeFocusAdPatch = bytecodePatch( compatibleWith("com.kakao.talk"("25.4.2")) execute { - removeFocusAdFingerprint.method.addInstructions( + loadFocusAdFingerprint.method.addInstructions( 0, """ const/4 v0, 0x1 diff --git a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ads/RemoveOlkChatRoomListAdPatch.kt b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ads/RemoveOlkChatRoomListAdPatch.kt index fa2df6351..edcd937a0 100644 --- a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ads/RemoveOlkChatRoomListAdPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ads/RemoveOlkChatRoomListAdPatch.kt @@ -2,7 +2,7 @@ package app.revanced.patches.kakaotalk.ads import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.patch.bytecodePatch -import app.revanced.patches.kakaotalk.ads.fingerprints.removeOlkChatRoomListAdFingerprint +import app.revanced.patches.kakaotalk.ads.fingerprints.addOlkChatRoomListAdFingerprint import app.revanced.patches.kakaotalk.common.fingerprints.kotlinUnitInstanceFingerprint @Suppress("unused") @@ -16,7 +16,7 @@ val removeOlkChatRoomListAdPatch = bytecodePatch( val findUnit = kotlinUnitInstanceFingerprint.method val unitClass = findUnit.definingClass - val method = removeOlkChatRoomListAdFingerprint.method + val method = addOlkChatRoomListAdFingerprint.method // I tried to find the field name, but it's pretty obvious to me, so I hardcode it. // If it changes, we need to fix it diff --git a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ads/fingerprints/RemoveBizBoardFingerprint.kt b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ads/fingerprints/RemoveBizBoardFingerprint.kt index 10e0e1786..3fb5ba077 100644 --- a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ads/fingerprints/RemoveBizBoardFingerprint.kt +++ b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ads/fingerprints/RemoveBizBoardFingerprint.kt @@ -4,7 +4,7 @@ import app.revanced.patcher.fingerprint import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.Opcode -internal val removeBizBoardFingerprint = fingerprint { +internal val measuringBizBoardFingerprint = fingerprint { accessFlags(AccessFlags.PUBLIC) returns("V") parameters("I", "I") diff --git a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ads/fingerprints/RemoveFocusAdFingerprint.kt b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ads/fingerprints/RemoveFocusAdFingerprint.kt index c1840d920..2187519c6 100644 --- a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ads/fingerprints/RemoveFocusAdFingerprint.kt +++ b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ads/fingerprints/RemoveFocusAdFingerprint.kt @@ -4,7 +4,7 @@ import app.revanced.patcher.fingerprint import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.Opcode -internal val removeFocusAdFingerprint = fingerprint { +internal val loadFocusAdFingerprint = fingerprint { accessFlags(AccessFlags.PUBLIC) parameters("Lcom/kakao/adfit/ads/focus/FocusAdLoader\$OnAdLoadListener;") returns("Z") diff --git a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ads/fingerprints/RemoveOlkChatRoomListAdFingerprint.kt b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ads/fingerprints/RemoveOlkChatRoomListAdFingerprint.kt index f424d383f..468416b83 100644 --- a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ads/fingerprints/RemoveOlkChatRoomListAdFingerprint.kt +++ b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ads/fingerprints/RemoveOlkChatRoomListAdFingerprint.kt @@ -4,7 +4,7 @@ import app.revanced.patcher.fingerprint import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.Opcode -internal val removeOlkChatRoomListAdFingerprint = fingerprint { +internal val addOlkChatRoomListAdFingerprint = fingerprint { accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL) parameters("Ljava/lang/Object;") returns("Ljava/lang/Object;") diff --git a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/chatlog/Remove99ClampPatch.kt b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/chatlog/Remove99ClampPatch.kt index 1e9fdebc5..594d2f9fd 100644 --- a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/chatlog/Remove99ClampPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/chatlog/Remove99ClampPatch.kt @@ -3,7 +3,7 @@ package app.revanced.patches.kakaotalk.chatlog import app.revanced.patcher.extensions.InstructionExtensions.instructions import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction import app.revanced.patcher.patch.bytecodePatch -import app.revanced.patches.kakaotalk.chatlog.fingerprints.remove99ClampFingerprint +import app.revanced.patches.kakaotalk.chatlog.fingerprints.processWatermarkCountFingerprint import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction10t import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction22t @@ -16,7 +16,7 @@ val remove99ClampPatch = bytecodePatch( compatibleWith("com.kakao.talk"("25.4.2")) execute { - val method = remove99ClampFingerprint.method + val method = processWatermarkCountFingerprint.method method.instructions .filterIsInstance() diff --git a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/chatlog/fingerprints/Remove99ClampFingerprint.kt b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/chatlog/fingerprints/Remove99ClampFingerprint.kt index 26708c068..933c356fc 100644 --- a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/chatlog/fingerprints/Remove99ClampFingerprint.kt +++ b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/chatlog/fingerprints/Remove99ClampFingerprint.kt @@ -3,7 +3,7 @@ package app.revanced.patches.kakaotalk.chatlog.fingerprints import app.revanced.patcher.fingerprint import com.android.tools.smali.dexlib2.AccessFlags -internal val remove99ClampFingerprint = fingerprint { +internal val processWatermarkCountFingerprint = fingerprint { accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL) returns("Ljava/lang/Object;") parameters() diff --git a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/chatroom/Remove300PlusLimitPatch.kt b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/chatroom/Remove300PlusLimitPatch.kt index c0a92d43b..faf73310d 100644 --- a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/chatroom/Remove300PlusLimitPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/chatroom/Remove300PlusLimitPatch.kt @@ -3,8 +3,8 @@ package app.revanced.patches.kakaotalk.chatroom import app.revanced.patcher.extensions.InstructionExtensions.instructions import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction import app.revanced.patcher.patch.bytecodePatch -import app.revanced.patches.kakaotalk.chatroom.fingerprints.remove300PlusLimitBaseChatRoomFingerprint -import app.revanced.patches.kakaotalk.chatroom.fingerprints.remove300PlusLimitOpenChatRoomFingerprint +import app.revanced.patches.kakaotalk.chatroom.fingerprints.limit300PlusBaseChatRoomFingerprint +import app.revanced.patches.kakaotalk.chatroom.fingerprints.limit300PlusOpenChatRoomFingerprint import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction10t import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction22t @@ -17,7 +17,7 @@ val remove300PlusLimitBaseChatRoomPatch = bytecodePatch( compatibleWith("com.kakao.talk"("25.4.2")) execute { - val method = remove300PlusLimitBaseChatRoomFingerprint.method + val method = limit300PlusBaseChatRoomFingerprint.method val branches = method.instructions .filterIsInstance() @@ -43,7 +43,7 @@ val remove300PlusLimitOpenChatRoomPatch = bytecodePatch( compatibleWith("com.kakao.talk"("25.4.2")) execute { - val method = remove300PlusLimitOpenChatRoomFingerprint.method + val method = limit300PlusOpenChatRoomFingerprint.method method.instructions .filterIsInstance() diff --git a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/chatroom/fingerprints/Remove300PlusLimitFingerprint.kt b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/chatroom/fingerprints/Remove300PlusLimitFingerprint.kt index f81510d3f..7a01753c6 100644 --- a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/chatroom/fingerprints/Remove300PlusLimitFingerprint.kt +++ b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/chatroom/fingerprints/Remove300PlusLimitFingerprint.kt @@ -4,7 +4,7 @@ import app.revanced.patcher.fingerprint import com.android.tools.smali.dexlib2.AccessFlags @Suppress("unused") -internal val remove300PlusLimitBaseChatRoomFingerprint = fingerprint { +internal val limit300PlusBaseChatRoomFingerprint = fingerprint { accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL) returns("V") parameters("Lcom/kakao/talk/widget/ViewBindable;") @@ -12,7 +12,7 @@ internal val remove300PlusLimitBaseChatRoomFingerprint = fingerprint { } @Suppress("unused") -internal val remove300PlusLimitOpenChatRoomFingerprint = fingerprint { +internal val limit300PlusOpenChatRoomFingerprint = fingerprint { accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL) returns("V") parameters() diff --git a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/emoticon/ForceEnableEmoticonPlusPatch.kt b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/emoticon/ForceEnableEmoticonPlusPatch.kt index 5c4c10ebf..fd19b2f07 100644 --- a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/emoticon/ForceEnableEmoticonPlusPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/emoticon/ForceEnableEmoticonPlusPatch.kt @@ -2,7 +2,7 @@ package app.revanced.patches.kakaotalk.emoticon import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.patch.bytecodePatch -import app.revanced.patches.kakaotalk.emoticon.fingerprints.forceEnableEmoticonPlusFingerprint +import app.revanced.patches.kakaotalk.emoticon.fingerprints.isEnableEmoticonPlusFingerprint @Suppress("unused") val forceEnableEmoticonPlusPatch = bytecodePatch( @@ -12,7 +12,7 @@ val forceEnableEmoticonPlusPatch = bytecodePatch( compatibleWith("com.kakao.talk"("25.4.2")) execute { - forceEnableEmoticonPlusFingerprint.method.addInstructions( + isEnableEmoticonPlusFingerprint.method.addInstructions( 0, """ const/4 v0, 0x1 diff --git a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/emoticon/fingerprints/ForceEnableEmoticonPlusFingerprint.kt b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/emoticon/fingerprints/ForceEnableEmoticonPlusFingerprint.kt index ab6fc8365..149f48a44 100644 --- a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/emoticon/fingerprints/ForceEnableEmoticonPlusFingerprint.kt +++ b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/emoticon/fingerprints/ForceEnableEmoticonPlusFingerprint.kt @@ -4,7 +4,7 @@ import app.revanced.patcher.fingerprint import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.Opcode -internal val forceEnableEmoticonPlusFingerprint = fingerprint { +internal val isEnableEmoticonPlusFingerprint = fingerprint { accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC) returns("Z") parameters() diff --git a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ghost/GhostModePatch.kt b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ghost/GhostModePatch.kt index 4ea5f1deb..008f65e64 100644 --- a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ghost/GhostModePatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ghost/GhostModePatch.kt @@ -3,7 +3,7 @@ package app.revanced.patches.kakaotalk.ghost import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.patch.bytecodePatch import app.revanced.patches.kakaotalk.common.fingerprints.kotlinUnitInstanceFingerprint -import app.revanced.patches.kakaotalk.ghost.fingerprints.ghostModeFingerprint +import app.revanced.patches.kakaotalk.ghost.fingerprints.sendCurrentActionFingerprint @Suppress("unused") val ghostMode = bytecodePatch( @@ -16,7 +16,7 @@ val ghostMode = bytecodePatch( val findUnit = kotlinUnitInstanceFingerprint.method val unitClass = findUnit.definingClass - val method = ghostModeFingerprint.method + val method = sendCurrentActionFingerprint.method // I tried to find the field name, but it's pretty obvious to me, so I hardcode it. // If it changes, we need to fix it diff --git a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ghost/fingerprints/GhostModeFingerprint.kt b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ghost/fingerprints/GhostModeFingerprint.kt index f2ae38496..a5cbb99ac 100644 --- a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ghost/fingerprints/GhostModeFingerprint.kt +++ b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/ghost/fingerprints/GhostModeFingerprint.kt @@ -4,7 +4,7 @@ import app.revanced.patcher.fingerprint import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.Opcode -internal val ghostModeFingerprint = fingerprint { +internal val sendCurrentActionFingerprint = fingerprint { accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL) returns("Ljava/lang/Object;") parameters("Ljava/lang/Object;") diff --git a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/integrity/BypassMoatCheckPatch.kt b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/integrity/BypassMoatCheckPatch.kt index bc5b107bc..9d8c5fa51 100644 --- a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/integrity/BypassMoatCheckPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/integrity/BypassMoatCheckPatch.kt @@ -5,8 +5,8 @@ import app.revanced.patcher.extensions.InstructionExtensions.instructions import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction import app.revanced.patcher.patch.bytecodePatch -import app.revanced.patches.kakaotalk.integrity.fingerprints.bypassMoatCheckFingerprintOne -import app.revanced.patches.kakaotalk.integrity.fingerprints.bypassMoatCheckFingerprintTwo +import app.revanced.patches.kakaotalk.integrity.fingerprints.moatCheckResultFingerprintOne +import app.revanced.patches.kakaotalk.integrity.fingerprints.moatCheckResultFingerprintTwo import app.revanced.patches.kakaotalk.integrity.fingerprints.postprocessMoatCheckFailedFingerprint import app.revanced.util.getReference import com.android.tools.smali.dexlib2.Opcode @@ -73,7 +73,7 @@ val bypassMoatCheckPatch = bytecodePatch( } } - patch(bypassMoatCheckFingerprintOne) - patch(bypassMoatCheckFingerprintTwo) + patch(moatCheckResultFingerprintOne) + patch(moatCheckResultFingerprintTwo) } } \ No newline at end of file diff --git a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/integrity/BypassRequestChecksumsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/integrity/BypassRequestChecksumsPatch.kt index b59a1b8b7..76baf286c 100644 --- a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/integrity/BypassRequestChecksumsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/integrity/BypassRequestChecksumsPatch.kt @@ -3,7 +3,7 @@ package app.revanced.patches.kakaotalk.integrity import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.patch.bytecodePatch import app.revanced.patches.kakaotalk.common.fingerprints.kotlinUnitInstanceFingerprint -import app.revanced.patches.kakaotalk.integrity.fingerprints.bypassRequestChecksumsFingerprint +import app.revanced.patches.kakaotalk.integrity.fingerprints.requestChecksumsFingerprint @Suppress("unused") val bypassRequestChecksumPatch = bytecodePatch( @@ -16,7 +16,7 @@ val bypassRequestChecksumPatch = bytecodePatch( val findUnit = kotlinUnitInstanceFingerprint.method val unitClass = findUnit.definingClass - val method = bypassRequestChecksumsFingerprint.method + val method = requestChecksumsFingerprint.method // I tried to find the field name, but it's pretty obvious to me, so I hardcode it. // If it changes, we need to fix it diff --git a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/integrity/fingerprints/BypassMoatCheckFingerprint.kt b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/integrity/fingerprints/BypassMoatCheckFingerprint.kt index 7692cd653..bb88bd449 100644 --- a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/integrity/fingerprints/BypassMoatCheckFingerprint.kt +++ b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/integrity/fingerprints/BypassMoatCheckFingerprint.kt @@ -4,7 +4,7 @@ import app.revanced.patcher.fingerprint import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.Opcode -internal val bypassMoatCheckFingerprintOne = fingerprint { +internal val moatCheckResultFingerprintOne = fingerprint { accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL) parameters("Ljava/lang/Object;", "Ljava/lang/Object;", "Ljava/lang/Object;") returns("Ljava/lang/Object;") @@ -31,7 +31,7 @@ internal val bypassMoatCheckFingerprintOne = fingerprint { ) } -internal val bypassMoatCheckFingerprintTwo = fingerprint { +internal val moatCheckResultFingerprintTwo = fingerprint { accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL) parameters("Ljava/lang/Object;", "Ljava/lang/Object;", "Ljava/lang/Object;") returns("Ljava/lang/Object;") diff --git a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/integrity/fingerprints/BypassRequestChecksumsFingerprint.kt b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/integrity/fingerprints/BypassRequestChecksumsFingerprint.kt index ac9820864..63cba53da 100644 --- a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/integrity/fingerprints/BypassRequestChecksumsFingerprint.kt +++ b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/integrity/fingerprints/BypassRequestChecksumsFingerprint.kt @@ -4,7 +4,7 @@ import app.revanced.patcher.fingerprint import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.Opcode -internal val bypassRequestChecksumsFingerprint = fingerprint { +internal val requestChecksumsFingerprint = fingerprint { accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL) returns("Ljava/lang/Object;") strings( diff --git a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/misc/RemoveShopTabPatch.kt b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/misc/RemoveShopTabPatch.kt index 7c50ab34c..40925b368 100644 --- a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/misc/RemoveShopTabPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/misc/RemoveShopTabPatch.kt @@ -3,7 +3,7 @@ package app.revanced.patches.kakaotalk.misc import app.revanced.patcher.extensions.InstructionExtensions.instructions import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction import app.revanced.patcher.patch.bytecodePatch -import app.revanced.patches.kakaotalk.misc.fingerprints.removeShopTabFingerprint +import app.revanced.patches.kakaotalk.misc.fingerprints.addNavigationTabFingerprint import app.revanced.util.getReference import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction21c @@ -18,7 +18,7 @@ val removeShopTabPatch = bytecodePatch( compatibleWith("com.kakao.talk"("25.4.2")) execute { - val method = removeShopTabFingerprint.method + val method = addNavigationTabFingerprint.method val insns = method.instructions val matches = insns.mapIndexedNotNull { idx, inst -> diff --git a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/misc/fingerprints/RemoveShopTabFingerprint.kt b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/misc/fingerprints/RemoveShopTabFingerprint.kt index 1fa6bb112..394981932 100644 --- a/patches/src/main/kotlin/app/revanced/patches/kakaotalk/misc/fingerprints/RemoveShopTabFingerprint.kt +++ b/patches/src/main/kotlin/app/revanced/patches/kakaotalk/misc/fingerprints/RemoveShopTabFingerprint.kt @@ -4,7 +4,7 @@ import app.revanced.patcher.fingerprint import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.Opcode -internal val removeShopTabFingerprint = fingerprint { +internal val addNavigationTabFingerprint = fingerprint { accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL) returns("V") parameters()