chore(release): 2.157.0-dev.6 [skip ci]

# [2.157.0-dev.6](https://github.com/revanced/revanced-patches/compare/v2.157.0-dev.5...v2.157.0-dev.6) (2023-01-28)

### Bug Fixes

* **youtube/sponsorblock:** replace missing strings ([69394a6](69394a60b2))

CHANGELOG.md

@@ -1,3 +1,17 @@
+# [2.157.0-dev.6](https://github.com/revanced/revanced-patches/compare/v2.157.0-dev.5...v2.157.0-dev.6) (2023-01-28)
+
+
+### Bug Fixes
+
+* **youtube/sponsorblock:** replace missing strings ([7b8f0db](https://github.com/revanced/revanced-patches/commit/7b8f0db2c17da6488db1ec2c21a21a14ff8466aa))
+
+# [2.157.0-dev.5](https://github.com/revanced/revanced-patches/compare/v2.157.0-dev.4...v2.157.0-dev.5) (2023-01-28)
+
+
+### Features
+
+* **youtube:** show toasts along exceptions ([#1511](https://github.com/revanced/revanced-patches/issues/1511)) ([5817e4d](https://github.com/revanced/revanced-patches/commit/5817e4d27fab692c0e95ab4aa2fa8f13005cb780))
+
 # [2.157.0-dev.4](https://github.com/revanced/revanced-patches/compare/v2.157.0-dev.3...v2.157.0-dev.4) (2023-01-28)
 
 

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.157.0-dev.4
+version = 2.157.0-dev.6

src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/RectangleFieldInvalidatorFingerprint.kt

@@ -0,0 +1,22 @@
+package app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints
+
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.reference.MethodReference
+
+object RectangleFieldInvalidatorFingerprint : MethodFingerprint(
+    "V",
+    customFingerprint = custom@{ methodDef ->
+        val instructions = methodDef.implementation?.instructions!!
+        val instructionCount = instructions.count()
+
+        // the method has definitely more than 5 instructions
+        if (instructionCount < 5) return@custom false
+
+        val referenceInstruction = instructions.elementAt(instructionCount - 2) // the second to last instruction
+        val reference = ((referenceInstruction as? ReferenceInstruction)?.reference as? MethodReference)
+
+        reference?.parameterTypes?.size == 1 && reference.name == "invalidate" // the reference is the invalidate(..) method
+    }
+)

src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt

@@ -7,9 +7,11 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.data.toMethodWalker
 import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 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.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
@@ -17,7 +19,6 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.shared.fingerprints.SeekbarFingerprint
 import app.revanced.patches.shared.fingerprints.SeekbarOnDrawFingerprint
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.youtube.layout.autocaptions.fingerprints.StartVideoInformerFingerprint
 import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility
 import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.*
 import app.revanced.patches.youtube.layout.sponsorblock.resource.patch.SponsorBlockResourcePatch
@@ -29,7 +30,9 @@ import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.*
 import org.jf.dexlib2.iface.instruction.formats.Instruction35c
+import org.jf.dexlib2.iface.reference.FieldReference
 import org.jf.dexlib2.iface.reference.MethodReference
+import org.jf.dexlib2.iface.reference.StringReference
 
 @Patch
 @DependsOn(
@@ -52,7 +55,6 @@ class SponsorBlockBytecodePatch : BytecodePatch(
         NextGenWatchLayoutFingerprint,
         AppendTimeFingerprint,
         PlayerOverlaysLayoutInitFingerprint,
-        StartVideoInformerFingerprint
     )
 ) {
 
@@ -233,6 +235,39 @@ class SponsorBlockBytecodePatch : BytecodePatch(
             "invoke-static {p0}, Lapp/revanced/integrations/sponsorblock/player/ui/SponsorBlockView;->initialize(Ljava/lang/Object;)V"
         )
 
+        // get rectangle field name
+        RectangleFieldInvalidatorFingerprint.resolve(context, seekbarSignatureResult.classDef)
+        val rectangleFieldInvalidatorInstructions =
+            RectangleFieldInvalidatorFingerprint.result!!.method.implementation!!.instructions
+        val rectangleFieldName =
+            ((rectangleFieldInvalidatorInstructions.elementAt(rectangleFieldInvalidatorInstructions.count() - 3) as ReferenceInstruction).reference as FieldReference).name
+
+        // replace the "replaceMeWith*" strings
+        context
+            .proxy(context.classes.first { it.type.endsWith("PlayerController;") })
+            .mutableClass
+            .methods
+            .find { it.name == "setSponsorBarRect" }
+            ?.let { method ->
+                fun MutableMethod.replaceStringInstruction(index: Int, instruction: Instruction, with: String) {
+                    val register = (instruction as OneRegisterInstruction).registerA
+                    this.replaceInstruction(
+                        index, "const-string v$register, \"$with\""
+                    )
+                }
+                for ((index, it) in method.implementation!!.instructions.withIndex()) {
+                    if (it.opcode.ordinal != Opcode.CONST_STRING.ordinal) continue
+
+                    when (((it as ReferenceInstruction).reference as StringReference).string) {
+                        "replaceMeWithsetSponsorBarRect" -> method.replaceStringInstruction(
+                            index,
+                            it,
+                            rectangleFieldName
+                        )
+                    }
+                }
+            } ?: return PatchResultError("Could not find the method which contains the replaceMeWith* strings")
+
         // TODO: isSBChannelWhitelisting implementation
 
         return PatchResultSuccess()

src/main/kotlin/app/revanced/patches/youtube/misc/debugging/patch/DebuggingPatch.kt

@@ -29,7 +29,7 @@ class DebuggingPatch : ResourcePatch {
                 listOf(
                     SwitchPreference(
                         "revanced_debug_enabled",
-                        StringResource("revanced_debug_enabled_title", "Enable debug logs"),
+                        StringResource("revanced_debug_enabled_title", "Debug logging"),
                         false,
                         StringResource("revanced_debug_summary_on", "Debug logs are enabled"),
                         StringResource("revanced_debug_summary_off", "Debug logs are disabled")
@@ -38,11 +38,21 @@ class DebuggingPatch : ResourcePatch {
                         "revanced_debug_stacktrace_enabled",
                         StringResource(
                             "revanced_debug_stacktrace_enabled_title",
-                            "Print stack traces"
+                            "Log stack traces"
                         ),
                         false,
-                        StringResource("revanced_debug_stacktrace_summary_on", "Enabled printing stack traces"),
-                        StringResource("revanced_debug_stacktrace_summary_off", "Disabled printing stack traces")
+                        StringResource("revanced_debug_stacktrace_summary_on", "Debug logs include stack trace"),
+                        StringResource("revanced_debug_stacktrace_summary_off", "Debug logs do not include stack trace")
+                    ),
+                    SwitchPreference(
+                        "revanced_debug_toast_on_error_enabled",
+                        StringResource(
+                            "revanced_debug_toast_on_error_enabled_title",
+                            "Show toast on ReVanced error"
+                        ),
+                        true,
+                        StringResource("revanced_debug_toast_on_error_summary_on", "Toast shown if error occurs"),
+                        StringResource("revanced_debug_toast_on_error_summary_off", "Toast not shown if error occurs")
                     ),
                 ),
                 StringResource("revanced_debug_summary", "Enable or disable debugging options")

src/main/resources/returnyoutubedislike/host/values/strings.xml

@@ -3,10 +3,9 @@
 
     <string name="revanced_ryd_failure_connection_timeout">Dislikes temporarily not available (API timed out)</string>
     <string name="revanced_ryd_failure_client_rate_limit_requested">Dislikes not available (client API limit reached)</string>
-    <string name="revanced_ryd_failure_register_user">ReturnYouTubeDislike failed to register as new user</string>
-    <string name="revanced_ryd_failure_confirm_user">ReturnYouTubeDislike failed to confirm new user</string>
-    <string name="revanced_ryd_failure_send_vote_failed">ReturnYouTubeDislike failed to send vote</string>
-    <string name="revanced_ryd_failure_confirm_vote_failed">ReturnYouTubeDislike failed to confirm vote</string>
+
+    <!-- corner case situation, where user enables RYD while video is playing and then tries to vote for the video -->
+    <string name="revanced_ryd_failure_ryd_enabled_while_playing_video_then_user_voted">Reload video to vote using ReturnYouTubeDislike</string>
 
     <string name="revanced_ryd_enable_title">Return YouTube Dislike</string>
     <string name="revanced_ryd_enable_summary_on">Dislikes are shown</string>
@@ -34,16 +33,16 @@
     <string name="revanced_ryd_statistics_getFetchCallResponseTimeLast_rate_limit_summary">Dislikes temporarily not available - Client API rate limit in effect</string>
 
     <string name="revanced_ryd_statistics_getFetchCallCount_title">API fetch votes, number of calls</string>
-    <string name="revanced_ryd_statistics_getFetchCallCount_zero_summary">No network calls have been made</string>
-    <string name="revanced_ryd_statistics_getFetchCallCount_non_zero_summary">%d network calls have been made</string>
+    <string name="revanced_ryd_statistics_getFetchCallCount_zero_summary">No network calls made</string>
+    <string name="revanced_ryd_statistics_getFetchCallCount_non_zero_summary">%d network calls made</string>
 
     <string name="revanced_ryd_statistics_getFetchCallNumberOfFailures_title">API fetch votes, number of timeouts</string>
-    <string name="revanced_ryd_statistics_getFetchCallNumberOfFailures_zero_summary">No network calls have timed out</string>
+    <string name="revanced_ryd_statistics_getFetchCallNumberOfFailures_zero_summary">No network calls timed out</string>
     <string name="revanced_ryd_statistics_getFetchCallNumberOfFailures_non_zero_summary">%d network calls timed out</string>
 
     <string name="revanced_ryd_statistics_getNumberOfRateLimitRequestsEncountered_title">API client rate limits</string>
-    <string name="revanced_ryd_statistics_getNumberOfRateLimitRequestsEncountered_zero_summary">No client rate limits have been encountered</string>
-    <string name="revanced_ryd_statistics_getNumberOfRateLimitRequestsEncountered_non_zero_summary">Client rate limit was encountered %d times</string>
+    <string name="revanced_ryd_statistics_getNumberOfRateLimitRequestsEncountered_zero_summary">No client rate limits encountered</string>
+    <string name="revanced_ryd_statistics_getNumberOfRateLimitRequestsEncountered_non_zero_summary">Client rate limit encountered %d times</string>
 
     <string name="revanced_ryd_statistics_millisecond_text">%d milliseconds</string>
 </resources>