chore(release): 2.168.0-dev.7 [skip ci]

# [2.168.0-dev.7](https://github.com/revanced/revanced-patches/compare/v2.168.0-dev.6...v2.168.0-dev.7) (2023-04-20)

### Bug Fixes

* **youtube/microg-support:** remove incorrect patch dependency ([cf89537](cf895378c7))
* **youtube/microg-support:** rename patch correctly ([acfdd6c](acfdd6c35f))
* **youtube/spoof-signature-verification:** depend on `client-spoof` patch ([333327e](333327e0f9))

### Features

* use better patch description ([6d976b5](6d976b59bf))

CHANGELOG.md

@@ -1,3 +1,24 @@
+# [2.168.0-dev.7](https://github.com/revanced/revanced-patches/compare/v2.168.0-dev.6...v2.168.0-dev.7) (2023-04-20)
+
+
+### Bug Fixes
+
+* **youtube/microg-support:** remove incorrect patch dependency ([ec85a47](https://github.com/revanced/revanced-patches/commit/ec85a478cbcc252debf902918b8e90c797f57478))
+* **youtube/microg-support:** rename patch correctly ([d5c7d63](https://github.com/revanced/revanced-patches/commit/d5c7d63f75b6d9c1817f71a090516dc321eca086))
+* **youtube/spoof-signature-verification:** depend on `client-spoof` patch ([5547bd1](https://github.com/revanced/revanced-patches/commit/5547bd1ceb73bbfc934157ce87482226780a1f10))
+
+
+### Features
+
+* use better patch description ([32c0805](https://github.com/revanced/revanced-patches/commit/32c08056963fab4c5e69f8e5be7479f4b26cacc2))
+
+# [2.168.0-dev.6](https://github.com/revanced/revanced-patches/compare/v2.168.0-dev.5...v2.168.0-dev.6) (2023-04-20)
+
+
+### Features
+
+* **photomath/unlock-plus:** bump compatibility to `8.21.1` ([#1926](https://github.com/revanced/revanced-patches/issues/1926)) ([33b77fa](https://github.com/revanced/revanced-patches/commit/33b77fac657c5bb1e1fac6ce745f65f71dabf6ad))
+
 # [2.168.0-dev.5](https://github.com/revanced/revanced-patches/compare/v2.168.0-dev.4...v2.168.0-dev.5) (2023-04-19)
 
 

README.md

@@ -10,7 +10,7 @@ The official Patch bundle provided by ReVanced and the community.
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
 | `always-autorepeat` | Always repeats the playing video again. | 18.08.37 |
-| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
+| `client-spoof` | Spoofs a patched client to allow playback. | all |
 | `comments` | Hides components related to comments. | 18.08.37 |
 | `copy-video-url` | Adds buttons in player to copy video links. | 18.08.37 |
 | `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
@@ -46,7 +46,6 @@ The official Patch bundle provided by ReVanced and the community.
 | `hide-video-action-buttons` | Adds the options to hide action buttons under a video. | 18.08.37 |
 | `hide-watch-in-vr` | Hides the option to watch in VR from the player settings flyout panel. | 18.08.37 |
 | `hide-watermark` | Hides creator's watermarks on videos. | 18.08.37 |
-| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 18.08.37 |
 | `minimized-playback` | Enables minimized and background playback. | 18.08.37 |
 | `old-quality-layout` | Enables the original video quality flyout in the video player settings | 18.08.37 |
 | `open-links-externally` | Open links outside of the app directly in your browser. | 18.08.37 |
@@ -58,10 +57,11 @@ The official Patch bundle provided by ReVanced and the community.
 | `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 18.08.37 |
 | `sponsorblock` | Integrates SponsorBlock which allows skipping video segments such as sponsored content. | 18.08.37 |
 | `spoof-app-version` | Tricks YouTube into thinking, you are running an older version of the app. One of the side effects also includes restoring the old UI. | 18.08.37 |
-| `spoof-signature-verification` | Spoofs the client to prevent playback issues. | 18.08.37 |
+| `spoof-signature-verification` | Spoofs a patched client to prevent playback issues. | 18.08.37 |
 | `swipe-controls` | Adds volume and brightness swipe controls. | 18.08.37 |
 | `tablet-mini-player` | Enables the tablet mini player layout. | 18.08.37 |
 | `theme` | Applies a custom theme. | all |
+| `vanced-microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 18.08.37 |
 | `video-ads` | Removes ads in the video player. | 18.08.37 |
 </details>
 
@@ -164,7 +164,7 @@ The official Patch bundle provided by ReVanced and the community.
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
+| `client-spoof` | Spoofs a patched client to allow playback. | all |
 | `hide-ads` | Removes general ads. | all |
 </details>
 
@@ -287,7 +287,7 @@ The official Patch bundle provided by ReVanced and the community.
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `unlock-plus` | Unlocks plus features. | all |
+| `unlock-plus` | Unlocks plus features. | 8.9.0 |
 </details>
 
 ### [📦 `io.yuka.android`](https://play.google.com/store/apps/details?id=io.yuka.android)

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.168.0-dev.5
+version = 2.168.0-dev.7

src/main/kotlin/app/revanced/patches/photomath/detection/signature/annotations/DisableSignatureDetectionCompatibility.kt

@@ -1,30 +0,0 @@
-package app.revanced.patches.photomath.detection.signature.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [Package(
-        "com.microblink.photomath", arrayOf(
-            "8.6.0",
-            "8.7.0",
-            "8.8.0",
-            "8.9.0",
-            "8.10.0",
-            "8.11.0",
-            "8.12.0",
-            "8.13.0",
-            "8.14.0",
-            "8.15.0",
-            "8.16.0",
-            "8.17.0",
-            "8.18.0",
-            "8.18.1",
-            "8.19.0",
-            "8.20.0",
-            "8.21.0",
-        )
-    )]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class DisableSignatureDetectionCompatibility

src/main/kotlin/app/revanced/patches/photomath/detection/signature/patch/SignatureDetectionPatch.kt

@@ -9,12 +9,10 @@ import app.revanced.patcher.extensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.photomath.detection.signature.annotations.DisableSignatureDetectionCompatibility
 import app.revanced.patches.photomath.detection.signature.fingerprints.CheckSignatureFingerprint
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Description("Disables detection of incorrect signature.")
-@DisableSignatureDetectionCompatibility
 @Version("0.0.2")
 class SignatureDetectionPatch : BytecodePatch(
     listOf(

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

@@ -3,6 +3,28 @@ package app.revanced.patches.photomath.misc.unlockplus.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility([Package("com.microblink.photomath")])
+@Compatibility(
+    [Package(
+        "com.microblink.photomath", arrayOf(
+            "8.6.0",
+            "8.7.0",
+            "8.8.0",
+            "8.9.0",
+            "8.10.0",
+            "8.11.0",
+            "8.12.0",
+            "8.13.0",
+            "8.14.0",
+            "8.15.0",
+            "8.16.0",
+            "8.17.0",
+            "8.18.0",
+            "8.18.1",
+            "8.19.0",
+            "8.20.0",
+            "8.21.0",
+        )
+    )]
+)
 @Target(AnnotationTarget.CLASS)
-internal annotation class UnlockPlusCompatibilty
+internal annotation class UnlockPlusCompatibilty

src/main/kotlin/app/revanced/patches/shared/misc/fix/spoof/patch/ClientSpoofPatch.kt

@@ -1,5 +1,6 @@
 package app.revanced.patches.shared.misc.fix.spoof.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -16,22 +17,26 @@ import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
 
 @Patch
 @Name("client-spoof")
-@Description("Spoofs the YouTube or Vanced client to prevent playback issues.")
+@Description("Spoofs a patched client to allow playback.")
 @ClientSpoofCompatibility
 @Version("0.0.1")
 class ClientSpoofPatch : BytecodePatch(
     listOf(UserAgentHeaderBuilderFingerprint)
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
-        val result = UserAgentHeaderBuilderFingerprint.result!!
-        val method = result.mutableMethod
+        UserAgentHeaderBuilderFingerprint.result?.let { result ->
+            val insertIndex = result.scanResult.patternScanResult!!.endIndex
+           result.mutableMethod.apply {
+               val packageNameRegister = (instruction(insertIndex) as FiveRegisterInstruction).registerD
+               addInstruction(insertIndex, "const-string v$packageNameRegister, \"$ORIGINAL_PACKAGE_NAME\"")
+           }
 
-        val insertIndex = result.scanResult.patternScanResult!!.endIndex
-        val packageNameRegister = (method.instruction(insertIndex) as FiveRegisterInstruction).registerD
-
-        val originalPackageName = "com.google.android.youtube"
-        method.addInstruction(insertIndex, "const-string v$packageNameRegister, \"$originalPackageName\"")
+        } ?: return UserAgentHeaderBuilderFingerprint.toErrorResult()
 
         return PatchResultSuccess()
     }
+
+    private companion object {
+        private const val ORIGINAL_PACKAGE_NAME = "com.google.android.youtube"
+    }
 }

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

@@ -14,6 +14,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.shared.misc.fix.spoof.patch.ClientSpoofPatch
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 import app.revanced.patches.youtube.misc.fix.playback.annotation.ProtobufSpoofCompatibility
@@ -27,9 +28,14 @@ import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch
 @Name("spoof-signature-verification")
-@Description("Spoofs the client to prevent playback issues.")
+@Description("Spoofs a patched client to prevent playback issues.")
 @ProtobufSpoofCompatibility
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class, PlayerTypeHookPatch::class])
+@DependsOn([
+    IntegrationsPatch::class,
+    SettingsPatch::class,
+    PlayerTypeHookPatch::class,
+    ClientSpoofPatch::class
+])
 @Version("0.0.1")
 class SpoofSignatureVerificationPatch : BytecodePatch(
     listOf(

src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/bytecode/MicroGBytecodePatch.kt

@@ -25,10 +25,9 @@ import app.revanced.util.microg.MicroGBytecodeHelper
     [
         MicroGResourcePatch::class,
         HideCastButtonPatch::class,
-        ClientSpoofPatch::class
     ]
 )
-@Name("microg-support")
+@Name("vanced-microg-support")
 @Description("Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG.")
 @MicroGPatchCompatibility
 @Version("0.0.1")