fix(Spotify): Fix login by replacing Spoof signature patch with new Spoof package info patch

patches/api/patches.api

@@ -842,6 +842,10 @@ public final class app/revanced/patches/spotify/misc/extension/ExtensionPatchKt
 	public static final fun getSharedExtensionPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/spotify/misc/fix/SpoofPackageInfoPatchKt {
+	public static final fun getSpoofPackageInfoPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/spotify/misc/fix/SpoofSignaturePatchKt {
 	public static final fun getSpoofSignaturePatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }

patches/src/main/kotlin/app/revanced/patches/spotify/misc/fix/Fingerprints.kt

@@ -2,4 +2,4 @@ package app.revanced.patches.spotify.misc.fix
 
 import app.revanced.patcher.fingerprint
 
-internal val getAppSignatureFingerprint = fingerprint { strings("Failed to get the application signatures") }
+internal val getPackageInfoFingerprint = fingerprint { strings("Failed to get the application signatures") }

patches/src/main/kotlin/app/revanced/patches/spotify/misc/fix/SpoofPackageInfoPatch.kt

@@ -0,0 +1,52 @@
+package app.revanced.patches.spotify.misc.fix
+
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.instructions
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.util.addInstructionsAtControlFlowLabel
+import app.revanced.util.indexOfFirstInstructionReversedOrThrow
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Suppress("unused")
+val spoofPackageInfoPatch = bytecodePatch(
+    name = "Spoof package info",
+    description = "Spoofs the package info of the app to fix various functions of the app.",
+) {
+    compatibleWith("com.spotify.music")
+
+    execute {
+        getPackageInfoFingerprint.method.apply {
+            // region Spoof signature.
+
+            val failedToGetSignaturesStringMatch = getPackageInfoFingerprint.stringMatches!!.first()
+
+            val concatSignaturesIndex = indexOfFirstInstructionReversedOrThrow(
+                failedToGetSignaturesStringMatch.index,
+                Opcode.MOVE_RESULT_OBJECT,
+            )
+
+            val signatureRegister = getInstruction<OneRegisterInstruction>(concatSignaturesIndex).registerA
+            val expectedSignature = "d6a6dced4a85f24204bf9505ccc1fce114cadb32"
+
+            replaceInstruction(concatSignaturesIndex, "const-string v$signatureRegister, \"$expectedSignature\"")
+
+            // endregion
+
+            // region Spoof installer name.
+
+            val returnInstallerNameIndex = instructions.size - 3
+
+            val installerNameRegister = getInstruction<OneRegisterInstruction>(returnInstallerNameIndex).registerA
+            val expectedInstallerName = "com.android.vending"
+
+            addInstructionsAtControlFlowLabel(
+                returnInstallerNameIndex,
+                "const-string v$installerNameRegister, \"$expectedInstallerName\"",
+            )
+
+            // endregion
+        }
+    }
+}

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

@@ -1,33 +1,13 @@
 package app.revanced.patches.spotify.misc.fix
 
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.util.indexOfFirstInstructionReversedOrThrow
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
+@Deprecated("Superseded by spoofPackageInfoPatch", ReplaceWith("spoofPackageInfoPatch"))
 @Suppress("unused")
 val spoofSignaturePatch = bytecodePatch(
-    name = "Spoof signature",
-    description = "Spoofs the signature of the app to fix various functions of the app.",
+    description = "Spoofs the signature of the app fix various functions of the app.",
 ) {
     compatibleWith("com.spotify.music")
 
-    execute {
-        getAppSignatureFingerprint.method.apply {
-            val failedToGetSignaturesStringMatch = getAppSignatureFingerprint.stringMatches!!.first()
-
-            val concatSignaturesIndex = indexOfFirstInstructionReversedOrThrow(
-                failedToGetSignaturesStringMatch.index,
-                Opcode.MOVE_RESULT_OBJECT,
-            )
-
-            val register = getInstruction<OneRegisterInstruction>(concatSignaturesIndex).registerA
-
-            val expectedSignature = "d6a6dced4a85f24204bf9505ccc1fce114cadb32"
-
-            replaceInstruction(concatSignaturesIndex, "const-string v$register, \"$expectedSignature\"")
-        }
-    }
+    dependsOn(spoofPackageInfoPatch)
 }