chore: Merge branch dev to main (ReVanced#3673)

CHANGELOG.md

@@ -1,3 +1,27 @@
+# [4.15.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.14.2-dev.2...v4.15.0-dev.1) (2024-09-22)
+
+
+### Features
+
+* **TikTok:** Bump patches to support the latest version 36.5.4 ([e5dcb72](https://github.com/ReVanced/revanced-patches/commit/e5dcb72597092fb32003f11fdf6f861ede4e7ff3))
+
+## [4.14.2-dev.2](https://github.com/ReVanced/revanced-patches/compare/v4.14.2-dev.1...v4.14.2-dev.2) (2024-09-21)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Change default client type to Android VR ([74c8637](https://github.com/ReVanced/revanced-patches/commit/74c8637943347078955f51325bc6af92a35d4463))
+* **YouTube - Spoof video streams:** Change default client type to Android VR ([#3672](https://github.com/ReVanced/revanced-patches/issues/3672)) ([a3306f6](https://github.com/ReVanced/revanced-patches/commit/a3306f6717a09b734354f00363a96abad0ae14e7))
+
+## [4.14.2-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.14.1...v4.14.2-dev.1) (2024-09-21)
+
+
+### Bug Fixes
+
+* **TikTok - Playback speed:** Prevent crash by fixing invalid patch ([82d53cb](https://github.com/ReVanced/revanced-patches/commit/82d53cbc3bbfa585ba4337fdfaec9f0f19c802e6))
+* **TikTok - Settings:** Prevent crash by fixing invalid patch ([8074032](https://github.com/ReVanced/revanced-patches/commit/8074032fad3eff1c03296a882d2e2820da99b592))
+* **Twitter - Open links with app chooser:** Constrain patch to last working version `10.48.0-release` ([b9955d5](https://github.com/ReVanced/revanced-patches/commit/b9955d5ff6e456593b01f0f25d80ff660d02082a))
+
 ## [4.14.1](https://github.com/ReVanced/revanced-patches/compare/v4.14.0...v4.14.1) (2024-09-18)
 
 

gradle.properties

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

src/main/kotlin/app/revanced/patches/tiktok/feedfilter/FeedFilterPatch.kt

@@ -17,16 +17,16 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @Patch(
  name = "Feed filter",
  description = "Removes ads, livestreams, stories, image videos " +
-  "and videos with a specific amount of views or likes from the feed.",
+ "and videos with a specific amount of views or likes from the feed.",
  dependencies = [IntegrationsPatch::class, SettingsPatch::class],
  compatiblePackages = [
- CompatiblePackage("com.ss.android.ugc.trill", ["32.5.3"]),
- CompatiblePackage("com.zhiliaoapp.musically", ["32.5.3"])
- ]
+ CompatiblePackage("com.ss.android.ugc.trill", ["36.5.4"]),
+ CompatiblePackage("com.zhiliaoapp.musically", ["36.5.4"]),
+ ],
 )
 @Suppress("unused")
 object FeedFilterPatch : BytecodePatch(
- setOf(FeedApiServiceLIZFingerprint, SettingsStatusLoadFingerprint)
+ setOf(FeedApiServiceLIZFingerprint, SettingsStatusLoadFingerprint),
 ) {
  override fun execute(context: BytecodeContext) {
  FeedApiServiceLIZFingerprint.result?.mutableMethod?.apply {
@@ -36,13 +36,13 @@ object FeedFilterPatch : BytecodePatch(
  addInstruction(
  returnFeedItemInstruction.location.index,
  "invoke-static { v$feedItemsRegister }, " +
-  "Lapp/revanced/integrations/tiktok/feedfilter/FeedItemsFilter;->filter(Lcom/ss/android/ugc/aweme/feed/model/FeedItemList;)V"
+ "Lapp/revanced/integrations/tiktok/feedfilter/FeedItemsFilter;->filter(Lcom/ss/android/ugc/aweme/feed/model/FeedItemList;)V",
  )
  } ?: throw FeedApiServiceLIZFingerprint.exception
 
  SettingsStatusLoadFingerprint.result?.mutableMethod?.addInstruction(
  0,
- "invoke-static {}, Lapp/revanced/integrations/tiktok/settings/SettingsStatus;->enableFeedFilter()V"
+ "invoke-static {}, Lapp/revanced/integrations/tiktok/settings/SettingsStatus;->enableFeedFilter()V",
  ) ?: throw SettingsStatusLoadFingerprint.exception
  }
 }

src/main/kotlin/app/revanced/patches/tiktok/interaction/cleardisplay/RememberClearModePatch.kt → src/main/kotlin/app/revanced/patches/tiktok/interaction/cleardisplay/RememberClearDisplayPatch.kt

@@ -9,7 +9,7 @@ import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.tiktok.interaction.cleardisplay.fingerprints.OnClearDisplayEventFingerprint
-import app.revanced.patches.tiktok.interaction.cleardisplay.fingerprints.OnRenderFirstFrameFingerprint
+import app.revanced.patches.tiktok.shared.fingerprints.OnRenderFirstFrameFingerprint
 import app.revanced.util.exception
 import app.revanced.util.indexOfFirstInstructionOrThrow
 import com.android.tools.smali.dexlib2.Opcode
@@ -19,16 +19,16 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction22c
  name = "Remember clear display",
  description = "Remembers the clear display configurations in between videos.",
  compatiblePackages = [
- CompatiblePackage("com.ss.android.ugc.trill", ["32.5.3"]),
- CompatiblePackage("com.zhiliaoapp.musically", ["32.5.3"])
- ]
+ CompatiblePackage("com.ss.android.ugc.trill", ["36.5.4"]),
+ CompatiblePackage("com.zhiliaoapp.musically", ["36.5.4"]),
+ ],
 )
 @Suppress("unused")
 object RememberClearDisplayPatch : BytecodePatch(
  setOf(
  OnClearDisplayEventFingerprint,
- OnRenderFirstFrameFingerprint
- )
+ OnRenderFirstFrameFingerprint,
+ ),
 ) {
  override fun execute(context: BytecodeContext) {
  OnClearDisplayEventFingerprint.result?.mutableMethod?.let {
@@ -40,7 +40,7 @@ object RememberClearDisplayPatch : BytecodePatch(
  it.addInstructions(
  isEnabledIndex,
  "invoke-static { v$isEnabledRegister }, " +
-  "Lapp/revanced/integrations/tiktok/cleardisplay/RememberClearDisplayPatch;->rememberClearDisplayState(Z)V"
+ "Lapp/revanced/integrations/tiktok/cleardisplay/RememberClearDisplayPatch;->rememberClearDisplayState(Z)V",
  )
 
  // endregion
@@ -54,22 +54,25 @@ object RememberClearDisplayPatch : BytecodePatch(
  """
  # Create a new clearDisplayEvent and post it to the EventBus (https://github.com/greenrobot/EventBus)
 
- # The state of clear display.
- invoke-static { }, Lapp/revanced/integrations/tiktok/cleardisplay/RememberClearDisplayPatch;->getClearDisplayState()Z
- move-result v3
- if-eqz v3, :clear_display_disabled
-
  # Clear display type such as 0 = LONG_PRESS, 1 = SCREEN_RECORD etc.
  const/4 v1, 0x0
 
+ # Enter method (Such as "pinch", "swipe_exit", or an empty string (unknown, what it means)).
+ const-string v2, ""
+
  # Name of the clear display type which is equivalent to the clear display type.
- const-string v2, "long_press"
+ const-string v3, "long_press"
+ 
+ # The state of clear display.
+ invoke-static { }, Lapp/revanced/integrations/tiktok/cleardisplay/RememberClearDisplayPatch;->getClearDisplayState()Z
+ move-result v4
+ if-eqz v4, :clear_display_disabled
 
  new-instance v0, $clearDisplayEventClass
- invoke-direct { v0, v1, v2, v3 }, $clearDisplayEventClass-><init>(ILjava/lang/String;Z)V
+ invoke-direct { v0, v1, v2, v3, v4 }, $clearDisplayEventClass-><init>(ILjava/lang/String;Ljava/lang/String;Z)V
  invoke-virtual { v0 }, $clearDisplayEventClass->post()Lcom/ss/android/ugc/governance/eventbus/IEvent;
  """,
- ExternalLabel("clear_display_disabled", getInstruction(0))
+ ExternalLabel("clear_display_disabled", getInstruction(0)),
  )
  } ?: throw OnRenderFirstFrameFingerprint.exception
 

src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/DownloadsPatch.kt

@@ -13,34 +13,33 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint2
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint3
-import app.revanced.patches.tiktok.interaction.downloads.fingerprints.DownloadPathParentFingerprint
+import app.revanced.patches.tiktok.interaction.downloads.fingerprints.DownloadUriFingerprint
 import app.revanced.patches.tiktok.misc.integrations.IntegrationsPatch
 import app.revanced.patches.tiktok.misc.settings.SettingsPatch
 import app.revanced.patches.tiktok.misc.settings.fingerprints.SettingsStatusLoadFingerprint
 import app.revanced.util.exception
+import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 
 @Patch(
  name = "Downloads",
  description = "Removes download restrictions and changes the default path to download to.",
  dependencies = [IntegrationsPatch::class, SettingsPatch::class],
  compatiblePackages = [
- CompatiblePackage("com.ss.android.ugc.trill", ["32.5.3"]),
- CompatiblePackage("com.zhiliaoapp.musically", ["32.5.3"])
- ]
+ CompatiblePackage("com.ss.android.ugc.trill", ["36.5.4"]),
+ CompatiblePackage("com.zhiliaoapp.musically", ["36.5.4"]),
+ ],
 )
 @Suppress("unused")
 object DownloadsPatch : BytecodePatch(
  setOf(
  ACLCommonShareFingerprint,
  ACLCommonShareFingerprint2,
  ACLCommonShareFingerprint3,
- DownloadPathParentFingerprint,
- SettingsStatusLoadFingerprint
- )
+ DownloadUriFingerprint,
+ SettingsStatusLoadFingerprint,
+ ),
 ) {
  override fun execute(context: BytecodeContext) {
  fun MethodFingerprint.getMethod() = result?.mutableMethod ?: throw exception
@@ -52,7 +51,7 @@ object DownloadsPatch : BytecodePatch(
  """
  const/4 v0, 0x0
  return v0
- """
+ """,
  )
  },
  ACLCommonShareFingerprint2 to {
@@ -61,7 +60,7 @@ object DownloadsPatch : BytecodePatch(
  """
  const/4 v0, 0x2
  return v0
- """
+ """,
  )
  },
  // Download videos without watermark.
@@ -76,48 +75,40 @@ object DownloadsPatch : BytecodePatch(
  return v0
  :noremovewatermark
  nop
- """
+ """,
  )
  },
  // Change the download path patch.
- DownloadPathParentFingerprint to {
- val targetIndex = indexOfFirstInstructionOrThrow { opcode == Opcode.INVOKE_STATIC }
- val downloadUriMethod = context
- .toMethodWalker(this)
- .nextMethod(targetIndex, true)
- .getMethod() as MutableMethod
-
- val firstIndex = downloadUriMethod.indexOfFirstInstructionOrThrow {
- opcode == Opcode.INVOKE_DIRECT && ((this as Instruction35c).reference as MethodReference).name == "<init>"
+ DownloadUriFingerprint to {
+ val firstIndex = indexOfFirstInstructionOrThrow {
+ getReference<MethodReference>()?.name == "<init>"
  }
- val secondIndex = downloadUriMethod.indexOfFirstInstructionOrThrow {
- opcode == Opcode.INVOKE_STATIC && ((this as Instruction35c).reference as MethodReference).returnType.contains(
- "Uri"
- )
+ val secondIndex = indexOfFirstInstructionOrThrow {
+ getReference<MethodReference>()?.returnType?.contains("Uri") == true
  }
 
- downloadUriMethod.addInstructions(
+ addInstructions(
  secondIndex,
  """
- invoke-static {}, Lapp/revanced/integrations/tiktok/download/DownloadsPatch;->getDownloadPath()Ljava/lang/String;
- move-result-object v0
- """
+  invoke-static {}, Lapp/revanced/integrations/tiktok/download/DownloadsPatch;->getDownloadPath()Ljava/lang/String;
+  move-result-object v0
+  """,
  )
 
- downloadUriMethod.addInstructions(
+ addInstructions(
  firstIndex,
  """
- invoke-static {}, Lapp/revanced/integrations/tiktok/download/DownloadsPatch;->getDownloadPath()Ljava/lang/String;
- move-result-object v0
- """
+  invoke-static {}, Lapp/revanced/integrations/tiktok/download/DownloadsPatch;->getDownloadPath()Ljava/lang/String;
+  move-result-object v0
+  """,
  )
  },
  SettingsStatusLoadFingerprint to {
  addInstruction(
  0,
- "invoke-static {}, Lapp/revanced/integrations/tiktok/settings/SettingsStatus;->enableDownload()V"
+ "invoke-static {}, Lapp/revanced/integrations/tiktok/settings/SettingsStatus;->enableDownload()V",
  )
- }
+ },
  ).forEach { (fingerprint, patch) ->
  fingerprint.getMethod().patch()
  }

src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/DownloadPathParentFingerprint.kt → src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/DownloadUriFingerprint.kt

@@ -3,22 +3,18 @@ package app.revanced.patches.tiktok.interaction.downloads.fingerprints
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
 
-internal object DownloadPathParentFingerprint : MethodFingerprint(
- "L",
+internal object DownloadUriFingerprint : MethodFingerprint(
+ "Landroid/net/Uri;",
  AccessFlags.PUBLIC or AccessFlags.STATIC,
  strings = listOf(
- "video/mp4"
+ "/",
+ "/Camera",
+ "/Camera/",
+ "video/mp4",
  ),
  parameters = listOf(
- "L",
- "L"
+ "Landroid/content/Context;",
+ "Ljava/lang/String;",
  ),
- opcodes = listOf(
- Opcode.CONST_STRING,
- Opcode.INVOKE_STATIC,
- Opcode.MOVE_RESULT_OBJECT,
- Opcode.RETURN_OBJECT
- )
-)
+)