chore(release): 3.0.0-dev.5 [skip ci]

# [3.0.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v3.0.0-dev.4...v3.0.0-dev.5) (2023-12-04)

### Bug Fixes

* Use correct class loader to load resources ([17f44ca](17f44ca780))

### Features

* **Photomath:** Constrain patches to last working version ([3bd6640](3bd66406cc))

CHANGELOG.md

@@ -1,3 +1,29 @@
+# [3.0.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v3.0.0-dev.4...v3.0.0-dev.5) (2023-12-04)
+
+
+### Bug Fixes
+
+* Use correct class loader to load resources ([1d5f1f8](https://github.com/ReVanced/revanced-patches/commit/1d5f1f83be1f4eb78381887cd59f1649f1ed6d71))
+
+
+### Features
+
+* **Photomath:** Constrain patches to last working version ([f9a5dc6](https://github.com/ReVanced/revanced-patches/commit/f9a5dc6c91f37e9d7018e631739ca61511940d29))
+
+# [3.0.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v3.0.0-dev.3...v3.0.0-dev.4) (2023-12-04)
+
+
+### Bug Fixes
+
+* **YouTube - Minimized playback:** Fix PIP incorrectly shown for some Shorts playback ([#3364](https://github.com/ReVanced/revanced-patches/issues/3364)) ([84607ff](https://github.com/ReVanced/revanced-patches/commit/84607ff5f4bd30d328cdc4e1d46070a86d6c56bf))
+
+# [3.0.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v3.0.0-dev.2...v3.0.0-dev.3) (2023-12-04)
+
+
+### Bug Fixes
+
+* **YouTube - Return YouTube Dislike:** Prevent the first Short opened from freezing the UI ([#3359](https://github.com/ReVanced/revanced-patches/issues/3359)) ([e024409](https://github.com/ReVanced/revanced-patches/commit/e024409219bfbccc32c337d95da24b7146b6c7b7))
+
 # [3.0.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v3.0.0-dev.1...v3.0.0-dev.2) (2023-12-02)
 
 

gradle.properties

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

src/main/kotlin/app/revanced/patches/photomath/detection/deviceid/SpoofDeviceIdPatch.kt

@@ -14,7 +14,7 @@ import kotlin.random.Random
     name = "Spoof device ID",
     description = "Spoofs device ID to mitigate manual bans by developers.",
     dependencies = [SignatureDetectionPatch::class],
-    compatiblePackages = [CompatiblePackage("com.microblink.photomath")]
+    compatiblePackages = [CompatiblePackage("com.microblink.photomath", ["8.32.0"])]
 )
 @Suppress("unused")
 object SpoofDeviceIdPatch : BytecodePatch(

src/main/kotlin/app/revanced/patches/photomath/misc/unlockplus/UnlockPlusPatch.kt

@@ -13,7 +13,7 @@ import app.revanced.patches.photomath.misc.unlockplus.fingerprints.IsPlusUnlocke
 @Patch(
     name = "Unlock plus",
     dependencies = [SignatureDetectionPatch::class, EnableBookpointPatch::class],
-    compatiblePackages = [CompatiblePackage("com.microblink.photomath")]
+    compatiblePackages = [CompatiblePackage("com.microblink.photomath", ["8.32.0"])]
 )
 @Suppress("unused")
 object UnlockPlusPatch : BytecodePatch(

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

@@ -112,7 +112,7 @@ object SpoofSignaturePatch : BytecodePatch(
 
         // Hook the player parameters.
         PlayerResponseMethodHookPatch += PlayerResponseMethodHookPatch.Hook.ProtoBufferParameter(
-            "$INTEGRATIONS_CLASS_DESCRIPTOR->spoofParameter(Ljava/lang/String;)Ljava/lang/String;"
+            "$INTEGRATIONS_CLASS_DESCRIPTOR->spoofParameter(Ljava/lang/String;Z)Ljava/lang/String;"
         )
 
         // Force the seekbar time and chapters to always show up.

src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/MinimizedPlaybackPatch.kt

@@ -17,13 +17,19 @@ import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.Minimize
 import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.MinimizedPlaybackSettingsParentFingerprint
 import app.revanced.patches.youtube.misc.playertype.PlayerTypeHookPatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
+import app.revanced.patches.youtube.video.information.VideoInformationPatch
 import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 
 @Patch(
     name = "Minimized playback",
     description = "Enables minimized and background playback.",
-    dependencies = [IntegrationsPatch::class, PlayerTypeHookPatch::class, SettingsPatch::class],
+    dependencies = [
+        IntegrationsPatch::class,
+        PlayerTypeHookPatch::class,
+        VideoInformationPatch::class,
+        SettingsPatch::class
+    ],
     compatiblePackages = [
         CompatiblePackage(
             "com.google.android.youtube",
@@ -65,7 +71,7 @@ object MinimizedPlaybackPatch : BytecodePatch(
             mutableMethod.addInstructions(
                 0,
                 """
-                    invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->isPlaybackNotShort()Z
+                    invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->playbackIsNotShort()Z
                     move-result v0
                     return v0
                 """

src/main/kotlin/app/revanced/patches/youtube/video/information/VideoInformationPatch.kt

@@ -12,6 +12,7 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.video.information.fingerprints.*
+import app.revanced.patches.youtube.video.playerresponse.PlayerResponseMethodHookPatch
 import app.revanced.patches.youtube.video.videoid.VideoIdPatch
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
@@ -26,7 +27,7 @@ import com.android.tools.smali.dexlib2.util.MethodUtil
 
 @Patch(
     description = "Hooks YouTube to get information about the current playing video.",
-    dependencies = [IntegrationsPatch::class, VideoIdPatch::class]
+    dependencies = [IntegrationsPatch::class, VideoIdPatch::class, PlayerResponseMethodHookPatch::class]
 )
 object VideoInformationPatch : BytecodePatch(
     setOf(
@@ -115,6 +116,10 @@ object VideoInformationPatch : BytecodePatch(
         VideoIdPatch.hookBackgroundPlayVideoId(videoIdMethodDescriptor)
         VideoIdPatch.hookPlayerResponseVideoId(
             "$INTEGRATIONS_CLASS_DESCRIPTOR->setPlayerResponseVideoId(Ljava/lang/String;Z)V")
+        // Call before any other video id hooks,
+        // so they can use VideoInformation and check if the video id is for a Short.
+        PlayerResponseMethodHookPatch += PlayerResponseMethodHookPatch.Hook.ProtoBufferParameterBeforeVideoId(
+            "$INTEGRATIONS_CLASS_DESCRIPTOR->newPlayerResponseSignature(Ljava/lang/String;Z)Ljava/lang/String;")
 
         /*
          * Set the video time method

src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/PlayerResponseMethodHookPatch.kt

@@ -19,7 +19,7 @@ object PlayerResponseMethodHookPatch :
     Closeable,
     MutableSet<PlayerResponseMethodHookPatch.Hook> by mutableSetOf() {
     private const val VIDEO_ID_PARAMETER = 1
-    private const val VIDEO_IS_OPENING_OR_PLAYING_PARAMETER = 11
+    private const val IS_SHORT_AND_OPENING_OR_PLAYING_PARAMETER = 11
     private const val PROTO_BUFFER_PARAMETER_PARAMETER = 3
 
     private lateinit var playerResponseMethod: MutableMethod
@@ -31,13 +31,13 @@ object PlayerResponseMethodHookPatch :
 
     override fun close() {
         fun hookVideoId(hook: Hook) = playerResponseMethod.addInstruction(
-            0, "invoke-static {p$VIDEO_ID_PARAMETER, p$VIDEO_IS_OPENING_OR_PLAYING_PARAMETER}, $hook"
+            0, "invoke-static {p$VIDEO_ID_PARAMETER, p$IS_SHORT_AND_OPENING_OR_PLAYING_PARAMETER}, $hook"
         )
 
         fun hookProtoBufferParameter(hook: Hook) = playerResponseMethod.addInstructions(
             0,
             """
-                invoke-static {p$PROTO_BUFFER_PARAMETER_PARAMETER}, $hook
+                invoke-static {p$PROTO_BUFFER_PARAMETER_PARAMETER, p$IS_SHORT_AND_OPENING_OR_PLAYING_PARAMETER}, $hook
                 move-result-object p$PROTO_BUFFER_PARAMETER_PARAMETER
             """
         )

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

@@ -104,7 +104,7 @@ object VideoIdPatch : BytecodePatch(
      * Supports all videos and functions in all situations.
      *
      * First parameter is the video id.
-     * Second parameter is if the video is being opened or is currently playing.
+     * Second parameter is if the video is a Short AND it is being opened or is currently playing.
      *
      * Hook is always called off the main thread.
      *

src/main/kotlin/app/revanced/util/ResourceUtils.kt

@@ -8,6 +8,8 @@ import org.w3c.dom.Node
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption
 
+private val classLoader = object {}.javaClass.classLoader
+
 /**
  * Recursively traverse the DOM tree starting from the given root node.
  *
@@ -45,7 +47,6 @@ fun ResourceContext.mergeStrings(host: String) {
  * @param resources The resources to copy.
  */
 fun ResourceContext.copyResources(sourceResourceDirectory: String, vararg resources: ResourceGroup) {
-    val classLoader = javaClass.classLoader
     val targetResourceDirectory = this["res"]
 
     for (resourceGroup in resources) {
@@ -77,7 +78,7 @@ fun ResourceContext.iterateXmlNodeChildren(
     targetTag: String,
     callback: (node: Node) -> Unit
 ) =
-    xmlEditor[javaClass.classLoader.getResourceAsStream(resource)!!].use {
+    xmlEditor[classLoader.getResourceAsStream(resource)!!].use {
         val stringsNode = it.file.getElementsByTagName(targetTag).item(0).childNodes
         for (i in 1 until stringsNode.length - 1) callback(stringsNode.item(i))
     }

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

@@ -26,7 +26,7 @@
     <string name="revanced_ryd_compact_layout_summary_on">Like button styled for minimum width</string>
     <string name="revanced_ryd_compact_layout_summary_off">Like button styled for best appearance</string>
 
-    <string name="ryd_toast_on_connection_error_title">Show toast if API not available</string>
+    <string name="ryd_toast_on_connection_error_title">Show toast if API is not available</string>
     <string name="ryd_toast_on_connection_error_summary_on">Toast shown if ReturnYouTubeDislike API is not available</string>
     <string name="ryd_toast_on_connection_error_summary_off">Toast not shown if ReturnYouTubeDislike API is not available</string>