chore(release): 2.185.0-dev.4 [skip ci]

# [2.185.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v2.185.0-dev.3...v2.185.0-dev.4) (2023-07-19)

### Bug Fixes

* **TikTok - Show seekbar:** fix seekbar not always showing ([#2660](https://github.com/ReVanced/revanced-patches/issues/2660)) ([e4adaeb](e4adaebad4))

CHANGELOG.md

@@ -1,3 +1,17 @@
+# [2.185.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v2.185.0-dev.3...v2.185.0-dev.4) (2023-07-19)
+
+
+### Bug Fixes
+
+* **TikTok - Show seekbar:** fix seekbar not always showing ([#2660](https://github.com/ReVanced/revanced-patches/issues/2660)) ([f2742f1](https://github.com/ReVanced/revanced-patches/commit/f2742f1ba117809971a10780823fca99c19a4f34))
+
+# [2.185.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v2.185.0-dev.2...v2.185.0-dev.3) (2023-07-17)
+
+
+### Bug Fixes
+
+* **Sync for Reddit - Disable ads:** fix compatibility with latest version ([1456577](https://github.com/ReVanced/revanced-patches/commit/1456577f11c4a7e49d6c1ba0103b919dc487f4cf))
+
 # [2.185.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v2.185.0-dev.1...v2.185.0-dev.2) (2023-07-15)
 
 

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 2.185.0-dev.2
+version = 2.185.0-dev.4

src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/detection/piracy/fingerprints/PiracyDetectionFingerprint.kt

@@ -1,11 +1,10 @@
-package app.revanced.patches.syncforreddit.detection.piracy.fingerprints
+package app.revanced.patches.reddit.customclients.syncforreddit.detection.piracy.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.TypeReference
 
 object PiracyDetectionFingerprint : MethodFingerprint(
     returnType = "V",

src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt

@@ -1,19 +1,18 @@
 package app.revanced.patches.reddit.customclients.syncforreddit.detection.piracy.patch
 
-import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.syncforreddit.detection.piracy.fingerprints.PiracyDetectionFingerprint
+import app.revanced.patches.reddit.customclients.syncforreddit.detection.piracy.fingerprints.PiracyDetectionFingerprint
 
 @Description("Disables detection of modified versions.")
-@Version("0.0.1")
 class DisablePiracyDetectionPatch : BytecodePatch(listOf(PiracyDetectionFingerprint)) {
     override fun execute(context: BytecodeContext): PatchResult {
+        // Do not return an error if the fingerprint is not resolved.
+        // This is fine because new versions of the target app do not need this patch.
         PiracyDetectionFingerprint.result?.mutableMethod?.apply {
             addInstruction(
                 0,
@@ -21,7 +20,7 @@ class DisablePiracyDetectionPatch : BytecodePatch(listOf(PiracyDetectionFingerpr
                     return-void
                 """
             )
-        } ?: return PiracyDetectionFingerprint.toErrorResult()
+        }
 
         return PatchResultSuccess()
     }

src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/fingerprints/AwemeGetVideoControlFingerprint.kt

@@ -1,12 +0,0 @@
-package app.revanced.patches.tiktok.interaction.seekbar.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object AwemeGetVideoControlFingerprint : MethodFingerprint(
-    "L",
-    AccessFlags.PUBLIC.value,
-   customFingerprint = { methodDef, _ ->
-       methodDef.definingClass.endsWith("/Aweme;") && methodDef.name == "getVideoControl"
-   }
-)

src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/fingerprints/SetSeekBarShowTypeFingerprint.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.tiktok.interaction.seekbar.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object SetSeekBarShowTypeFingerprint : MethodFingerprint(
+    strings = listOf(
+        "seekbar show type change, change to:"
+    ),
+)

src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/patch/ShowSeekbarPatch.kt

@@ -6,17 +6,14 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.tiktok.interaction.seekbar.annotations.ShowSeekbarCompatibility
-import app.revanced.patches.tiktok.interaction.seekbar.fingerprints.AwemeGetVideoControlFingerprint
+import app.revanced.patches.tiktok.interaction.seekbar.fingerprints.SetSeekBarShowTypeFingerprint
-import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.formats.Instruction22t
-import org.jf.dexlib2.builder.instruction.BuilderInstruction11n
-import org.jf.dexlib2.builder.instruction.BuilderInstruction21t
-import org.jf.dexlib2.builder.instruction.BuilderInstruction22c
 
 @Patch
 @Name("Show seekbar")
@@ -25,27 +22,20 @@ import org.jf.dexlib2.builder.instruction.BuilderInstruction22c
 @Version("0.0.1")
 class ShowSeekbarPatch : BytecodePatch(
     listOf(
-        AwemeGetVideoControlFingerprint
+        SetSeekBarShowTypeFingerprint,
     )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
-        //Get VideoControl FieldReference
+        SetSeekBarShowTypeFingerprint.result?.mutableMethod?.apply {
-        val videoControl = context.findClass { it.type.endsWith("/VideoControl;") }
+            val typeRegister = getInstruction<Instruction22t>(1).registerB
-            ?: return PatchResultError("Can not find target class")
-        val fieldList = videoControl.immutableClass.fields.associateBy { field -> field.name }
 
-        AwemeGetVideoControlFingerprint.result?.mutableMethod?.implementation?.apply {
-            val ifNullLabel = newLabelForIndex(1)
             addInstructions(
-                1,
+                0,
-                listOf(
+                """
-                    BuilderInstruction11n(Opcode.CONST_4, 1, 1),
+                    const/16 v$typeRegister, 0x64
-                    BuilderInstruction21t(Opcode.IF_EQZ, 0, ifNullLabel),
+                """
-                    BuilderInstruction22c(Opcode.IPUT, 1, 0, fieldList["showProgressBar"]!!),
-                    BuilderInstruction22c(Opcode.IPUT, 1, 0, fieldList["draftProgressBar"]!!)
-                )
             )
-        } ?: return AwemeGetVideoControlFingerprint.toErrorResult()
+        } ?: return SetSeekBarShowTypeFingerprint.toErrorResult()
         return PatchResultSuccess()
     }