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

# [2.191.0-dev.11](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.10...v2.191.0-dev.11) (2023-09-25)

### Features

* Add notice for thumbnails for age restricted or paid videos ([fb60603](fb60603782))

CHANGELOG.md

@@ -1,3 +1,24 @@
+# [2.191.0-dev.11](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.10...v2.191.0-dev.11) (2023-09-25)
+
+
+### Features
+
+* Add notice for thumbnails for age restricted or paid videos ([f7cf70b](https://github.com/ReVanced/revanced-patches/commit/f7cf70b5d3f415411fa767931a33e84df9df6c16))
+
+# [2.191.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.9...v2.191.0-dev.10) (2023-09-25)
+
+
+### Bug Fixes
+
+* **YouTube - Client spoof:** Restore seekbar thumbnails ([bf4a115](https://github.com/ReVanced/revanced-patches/commit/bf4a1159ff745f8f91e11f30db4651d85769227b))
+
+# [2.191.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.8...v2.191.0-dev.9) (2023-09-25)
+
+
+### Features
+
+* **Strava:** Add `Disable subscription suggestions` patch ([#2997](https://github.com/ReVanced/revanced-patches/issues/2997)) ([af02175](https://github.com/ReVanced/revanced-patches/commit/af0217594d9c7526f550fc7e6f09f8a9232e72cf))
+
 # [2.191.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.7...v2.191.0-dev.8) (2023-09-24)
 
 

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 2.191.0-dev.8
+version = 2.191.0-dev.11

src/main/kotlin/app/revanced/patches/strava/subscription/UnlockSubscriptionPatch.kt

@@ -10,7 +10,7 @@ import app.revanced.patches.strava.subscription.fingerprints.GetSubscribedFinger
 
 @Patch(
     name = "Unlock subscription features",
-    description = "Unlocks \"Matched Runs\" and \"Segment Efforts\".",
+    description = "Unlocks \"Routes\", \"Matched Runs\" and \"Segment Efforts\".",
     compatiblePackages = [CompatiblePackage("com.strava", ["320.12"])]
 )
 @Suppress("unused")
@@ -19,4 +19,4 @@ object UnlockSubscriptionPatch : BytecodePatch(setOf(GetSubscribedFingerprint))
         val isSubscribedIndex = result.scanResult.patternScanResult!!.startIndex
         result.mutableMethod.replaceInstruction(isSubscribedIndex, "const/4 v0, 0x1")
     } ?: throw GetSubscribedFingerprint.exception
-}
+}

src/main/kotlin/app/revanced/patches/strava/subscription/fingerprints/GetSubscribedFingerprint.kt

@@ -6,6 +6,6 @@ import com.android.tools.smali.dexlib2.Opcode
 object GetSubscribedFingerprint : MethodFingerprint(
     opcodes = listOf(Opcode.IGET_BOOLEAN),
     customFingerprint = { methodDef, classDef ->
-        classDef.type.endsWith("SubscriptionDetailResponse;") && methodDef.name == "getSubscribed"
+        classDef.type.endsWith("/SubscriptionDetailResponse;") && methodDef.name == "getSubscribed"
     }
 )

src/main/kotlin/app/revanced/patches/strava/upselling/DisableSubscriptionSuggestionsPatch.kt

@@ -0,0 +1,72 @@
+package app.revanced.patches.strava.upselling
+
+import app.revanced.extensions.exception
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
+import app.revanced.patches.strava.upselling.fingerprints.GetModulesFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
+import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
+
+@Patch(
+    name = "Disable subscription suggestions",
+    compatiblePackages = [CompatiblePackage("com.strava", ["320.12"])]
+)
+@Suppress("unused")
+object DisableSubscriptionSuggestionsPatch : BytecodePatch(
+    setOf(GetModulesFingerprint)
+) {
+    private const val HELPER_METHOD_NAME = "getModulesIfNotUpselling"
+    private const val PAGE_SUFFIX = "_upsell"
+    private const val LABEL = "original"
+
+    override fun execute(context: BytecodeContext) = GetModulesFingerprint.result?.let { result ->
+        val className = result.classDef.type
+        val originalMethod = result.mutableMethod
+        val returnType = originalMethod.returnType
+
+        result.mutableClass.methods.add(ImmutableMethod(
+            className,
+            HELPER_METHOD_NAME,
+            emptyList(),
+            returnType,
+            AccessFlags.PRIVATE.value,
+            null,
+            null,
+            MutableMethodImplementation(3)
+        ).toMutable().apply {
+            addInstructions(
+                """
+                    iget-object v0, p0, $className->page:Ljava/lang/String;
+                    const-string v1, "$PAGE_SUFFIX"
+                    invoke-virtual {v0, v1}, Ljava/lang/String;->endsWith(Ljava/lang/String;)Z
+                    move-result v0
+                    if-eqz v0, :$LABEL
+                    invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
+                    move-result-object v0
+                    return-object v0
+                    :$LABEL
+                    iget-object v0, p0, $className->modules:Ljava/util/List;
+                    return-object v0
+                """
+            )
+        })
+
+        val getModulesIndex = result.scanResult.patternScanResult!!.startIndex
+        with(originalMethod) {
+            removeInstruction(getModulesIndex)
+            addInstructions(
+                getModulesIndex,
+                """
+                    invoke-direct {p0}, $className->$HELPER_METHOD_NAME()$returnType
+                    move-result-object v0
+                """
+            )
+        }
+    } ?: throw GetModulesFingerprint.exception
+}

src/main/kotlin/app/revanced/patches/strava/upselling/fingerprints/GetModulesFingerprint.kt

@@ -0,0 +1,11 @@
+package app.revanced.patches.strava.upselling.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import com.android.tools.smali.dexlib2.Opcode
+
+object GetModulesFingerprint : MethodFingerprint(
+    opcodes = listOf(Opcode.IGET_OBJECT),
+    customFingerprint = { methodDef, classDef ->
+        classDef.type.endsWith("/GenericLayoutEntry;") && methodDef.name == "getModules"
+    }
+)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofSignaturePatch.kt

@@ -3,40 +3,42 @@ package app.revanced.patches.youtube.misc.fix.playback
 import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.youtube.misc.fix.playback.fingerprints.ProtobufParameterBuilderFingerprint
-import app.revanced.patches.youtube.misc.fix.playback.fingerprints.ScrubbedPreviewLayoutFingerprint
-import app.revanced.patches.youtube.misc.fix.playback.fingerprints.StoryboardThumbnailFingerprint
-import app.revanced.patches.youtube.misc.fix.playback.fingerprints.StoryboardThumbnailParentFingerprint
+import app.revanced.patcher.util.smali.ExternalLabel
+import app.revanced.patches.youtube.misc.fix.playback.fingerprints.*
 import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.misc.playertype.PlayerTypeHookPatch
-import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
+import app.revanced.patches.youtube.video.information.VideoInformationPatch
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch(
     description = "Spoofs the signature to prevent playback issues.",
     dependencies = [
         SpoofSignatureResourcePatch::class,
         IntegrationsPatch::class,
-        PlayerTypeHookPatch::class
+        PlayerTypeHookPatch::class,
+        VideoInformationPatch::class
     ]
 )
 object SpoofSignaturePatch : BytecodePatch(
     setOf(
         ProtobufParameterBuilderFingerprint,
         StoryboardThumbnailParentFingerprint,
-        ScrubbedPreviewLayoutFingerprint
+        StoryboardRendererSpecFingerprint,
+        PlayerResponseModelImplFingerprint
     )
 ) {
     private const val INTEGRATIONS_CLASS_DESCRIPTOR =
-        "Lapp/revanced/integrations/patches/SpoofSignaturePatch;"
+        "Lapp/revanced/integrations/patches/spoof/SpoofSignaturePatch;"
 
     override fun execute(context: BytecodeContext) {
-        // hook parameter
+        // Hook parameter.
         ProtobufParameterBuilderFingerprint.result?.let {
             val setParamMethod = context
                 .toMethodWalker(it.method)
@@ -55,51 +57,71 @@ object SpoofSignaturePatch : BytecodePatch(
             }
         } ?: throw ProtobufParameterBuilderFingerprint.exception
 
-
         // When signature spoofing is enabled, the seekbar when tapped does not show
         // the video time, chapter names, or the video thumbnail.
         // Changing the value returned of this method forces all of these to show up,
         // except the thumbnails are blank, which is handled with the patch below.
-        StoryboardThumbnailParentFingerprint.result ?: throw StoryboardThumbnailParentFingerprint.exception
-        StoryboardThumbnailFingerprint.resolve(context, StoryboardThumbnailParentFingerprint.result!!.classDef)
-        StoryboardThumbnailFingerprint.result?.apply {
-            val endIndex = scanResult.patternScanResult!!.endIndex
-            // Replace existing instruction to preserve control flow label.
-            // The replaced return instruction always returns false
-            // (it is the 'no thumbnails found' control path),
-            // so there is no need to pass the existing return value to integrations.
-            mutableMethod.replaceInstruction(
-                endIndex,
-                """
-                    invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->getSeekbarThumbnailOverrideValue()Z
-                """
-            )
-            // Since this is end of the method must replace one line then add the rest.
-            mutableMethod.addInstructions(
-                endIndex + 1,
-                """
-                move-result v0
-                return v0
-            """
-            )
-        } ?: throw StoryboardThumbnailFingerprint.exception
-
-
-        // Seekbar thumbnail now show up but are always a blank image.
-        // Additional changes are needed to force the client to generate the thumbnails (assuming it's possible),
-        // but for now hide the empty thumbnail.
-        ScrubbedPreviewLayoutFingerprint.result?.apply {
-            val endIndex = scanResult.patternScanResult!!.endIndex
-            mutableMethod.apply {
-                val imageViewFieldName = getInstruction<ReferenceInstruction>(endIndex).reference
-                addInstructions(
-                    implementation!!.instructions.lastIndex,
+        StoryboardThumbnailParentFingerprint.result?.classDef?.let { classDef ->
+            StoryboardThumbnailFingerprint.also {
+                it.resolve(
+                    context,
+                    classDef
+                )
+            }.result?.let {
+                val endIndex = it.scanResult.patternScanResult!!.endIndex
+                // Replace existing instruction to preserve control flow label.
+                // The replaced return instruction always returns false
+                // (it is the 'no thumbnails found' control path),
+                // so there is no need to pass the existing return value to integrations.
+                it.mutableMethod.replaceInstruction(
+                    endIndex,
                     """
-                        iget-object v0, p0, $imageViewFieldName   # copy imageview field to a register
-                        invoke-static {v0}, $INTEGRATIONS_CLASS_DESCRIPTOR->seekbarImageViewCreated(Landroid/widget/ImageView;)V
+                        invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->getSeekbarThumbnailOverrideValue()Z
                     """
                 )
-            }
-        } ?: throw ScrubbedPreviewLayoutFingerprint.exception
+                // Since this is end of the method must replace one line then add the rest.
+                it.mutableMethod.addInstructions(
+                    endIndex + 1,
+                    """
+                    move-result v0
+                    return v0
+                """
+                )
+            } ?: throw StoryboardThumbnailFingerprint.exception
+
+            /**
+             * Hook StoryBoard renderer url
+             */
+            PlayerResponseModelImplFingerprint.result?.let {
+                it.mutableMethod.apply {
+                    val getStoryBoardIndex = it.scanResult.patternScanResult!!.endIndex
+                    val getStoryBoardRegister = getInstruction<OneRegisterInstruction>(getStoryBoardIndex).registerA
+
+                    addInstructions(
+                        getStoryBoardIndex,
+                        """
+                        invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->getStoryboardRendererSpec()Ljava/lang/String;
+                        move-result-object v$getStoryBoardRegister
+                    """
+                    )
+                }
+            } ?: throw PlayerResponseModelImplFingerprint.exception
+
+            StoryboardRendererSpecFingerprint.result?.let {
+                it.mutableMethod.apply {
+                    val storyBoardUrlParams = 0
+
+                    addInstructionsWithLabels(
+                        0,
+                        """
+                        if-nez p$storyBoardUrlParams, :ignore
+                        invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->getStoryboardRendererSpec()Ljava/lang/String;
+                        move-result-object p$storyBoardUrlParams
+                    """,
+                        ExternalLabel("ignore", getInstruction(0))
+                    )
+                }
+            } ?: throw StoryboardRendererSpecFingerprint.exception
+        }
     }
-}
+}

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofSignatureResourcePatch.kt

@@ -30,8 +30,8 @@ object SpoofSignatureResourcePatch : ResourcePatch() {
                             "App signature spoofed\\n\\n"
                                     + "Side effects include:\\n"
                                     + "• No ambient mode\\n"
-                                    + "• Videos can't be downloaded\\n"
-                                    + "• Seekbar thumbnails are hidden"
+                                    + "• Videos cannot be downloaded\\n"
+                                    + "• Low quality seekbar thumbnails (No thumbnails for age restricted or paid videos)"
                         ),
                         StringResource(
                             "revanced_spoof_signature_verification_enabled_summary_off",

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/PlayerResponseModelImplFingerprint.kt

@@ -0,0 +1,23 @@
+package app.revanced.patches.youtube.misc.fix.playback.fingerprints
+
+import app.revanced.extensions.containsConstantInstructionValue
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+object PlayerResponseModelImplFingerprint : MethodFingerprint(
+    returnType = "Ljava/lang/String;",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = emptyList(),
+    opcodes = listOf(
+        Opcode.RETURN_OBJECT,
+        Opcode.CONST_4,
+        Opcode.RETURN_OBJECT
+    ),
+    customFingerprint = handler@{ methodDef, _ ->
+        if (!methodDef.definingClass.endsWith("/PlayerResponseModelImpl;")) return@handler false
+
+        methodDef.containsConstantInstructionValue(55735497)
+    }
+)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/ProtobufParameterBuilderFingerprint.kt

@@ -10,4 +10,4 @@ object ProtobufParameterBuilderFingerprint : MethodFingerprint(
         Opcode.IPUT_OBJECT
     ),
     strings = listOf("Unexpected empty videoId.", "Prefetch request are disabled.")
-)
+)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/ScrubbedPreviewLayoutFingerprint.kt

@@ -1,27 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.youtube.misc.fix.playback.SpoofSignatureResourcePatch
-import app.revanced.util.patch.LiteralValueFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-object ScrubbedPreviewLayoutFingerprint : LiteralValueFingerprint(
-    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
-    returnType = "V",
-    parameters = listOf("Landroid/content/Context;", "Landroid/util/AttributeSet;", "I", "I"),
-    opcodes = listOf(
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.CONST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.IPUT_OBJECT, // preview imageview
-    ),
-    // This resource is used in ~ 40 different locations, but this method has a distinct list of parameters to match to.
-    literalSupplier = { SpoofSignatureResourcePatch.scrubbedPreviewThumbnailResourceId }
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StoryboardRendererSpecFingerprint.kt

@@ -0,0 +1,12 @@
+package app.revanced.patches.youtube.misc.fix.playback.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+object StoryboardRendererSpecFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
+    returnType = "L",
+    parameters = listOf("Ljava/lang/String;", "J"),
+    strings = listOf("\\|"),
+)

src/main/kotlin/app/revanced/patches/youtube/video/quality/RememberVideoQualityPatch.kt

@@ -122,7 +122,6 @@ object RememberVideoQualityPatch : BytecodePatch(
          * It also hooks the method which is called when the video quality to set is determined.
          * Conveniently, at this point the video quality is overridden to the remembered playback speed.
          */
-
         VideoInformationPatch.onCreateHook(INTEGRATIONS_CLASS_DESCRIPTOR, "newVideoStarted")
 
 

src/main/kotlin/app/revanced/patches/youtube/video/videoid/VideoIdPatch.kt

@@ -59,7 +59,7 @@ object VideoIdPatch : BytecodePatch(
     }
 
 
-    /**
+        /**
          * Adds an invoke-static instruction, called with the new id when the video changes.
          *
          * Supports all videos (regular videos, Shorts and Stories).