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

# [4.12.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v4.12.0-dev.5...v4.12.0-dev.6) (2024-07-20)

### Features

* Add `Spoof build info` patch ([d87f36e](d87f36e7e2))

.github/workflows/pull_strings.yml

@@ -17,7 +17,7 @@ jobs:
           ref: dev
 
       - name: Pull strings
-        uses: crowdin/github-action@v1
+        uses: crowdin/github-action@v2
         with:
           config: crowdin.yml
           download_translations: true

.github/workflows/push_strings.yml

@@ -19,7 +19,7 @@ jobs:
           fetch-depth: 0
 
       - name: Push strings
-        uses: crowdin/github-action@v1
+        uses: crowdin/github-action@v2
         with:
           config: crowdin.yml
           upload_sources: true

CHANGELOG.md

@@ -1,3 +1,18 @@
+# [4.12.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v4.12.0-dev.5...v4.12.0-dev.6) (2024-07-20)
+
+
+### Features
+
+* Add `Spoof build info` patch ([e7829b4](https://github.com/ReVanced/revanced-patches/commit/e7829b41e782c9feda23b9d6acf48bae277d24d9))
+
+# [4.12.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v4.12.0-dev.4...v4.12.0-dev.5) (2024-07-20)
+
+
+### Features
+
+* Add `Hide mock location` patch ([#3417](https://github.com/ReVanced/revanced-patches/issues/3417)) ([5f81b40](https://github.com/ReVanced/revanced-patches/commit/5f81b40e7d5567fb5689d08ccc9caeaa267c3143))
+* **Google Photos:** Add `GmsCore support` patch ([#3414](https://github.com/ReVanced/revanced-patches/issues/3414)) ([24528e0](https://github.com/ReVanced/revanced-patches/commit/24528e0a6eec17ce0a3c52f8862585933615ad28))
+
 # [4.12.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v4.12.0-dev.3...v4.12.0-dev.4) (2024-07-20)
 
 

api/revanced-patches.api

@@ -22,6 +22,50 @@ public final class app/revanced/patches/all/interaction/gestures/PredictiveBackG
 	public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V
 }
 
+public final class app/revanced/patches/all/location/hide/HideMockLocationPatch : app/revanced/patches/all/misc/transformation/BaseTransformInstructionsPatch {
+	public static final field INSTANCE Lapp/revanced/patches/all/location/hide/HideMockLocationPatch;
+	public synthetic fun filterMap (Lcom/android/tools/smali/dexlib2/iface/ClassDef;Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;I)Ljava/lang/Object;
+	public fun filterMap (Lcom/android/tools/smali/dexlib2/iface/ClassDef;Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;I)Lkotlin/Pair;
+	public synthetic fun transform (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Ljava/lang/Object;)V
+	public fun transform (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Lkotlin/Pair;)V
+}
+
+public abstract class app/revanced/patches/all/misc/build/BaseSpoofBuildInfoPatch : app/revanced/patches/all/misc/transformation/BaseTransformInstructionsPatch {
+	public fun <init> ()V
+	public synthetic fun filterMap (Lcom/android/tools/smali/dexlib2/iface/ClassDef;Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;I)Ljava/lang/Object;
+	public fun filterMap (Lcom/android/tools/smali/dexlib2/iface/ClassDef;Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;I)Lkotlin/Pair;
+	protected fun getBoard ()Ljava/lang/String;
+	protected fun getBootloader ()Ljava/lang/String;
+	protected fun getBrand ()Ljava/lang/String;
+	protected fun getCpuAbi ()Ljava/lang/String;
+	protected fun getCpuAbi2 ()Ljava/lang/String;
+	protected fun getDevice ()Ljava/lang/String;
+	protected fun getDisplay ()Ljava/lang/String;
+	protected fun getFingerprint ()Ljava/lang/String;
+	protected fun getHardware ()Ljava/lang/String;
+	protected fun getHost ()Ljava/lang/String;
+	protected fun getId ()Ljava/lang/String;
+	protected fun getManufacturer ()Ljava/lang/String;
+	protected fun getModel ()Ljava/lang/String;
+	protected fun getOdmSku ()Ljava/lang/String;
+	protected fun getProduct ()Ljava/lang/String;
+	protected fun getRadio ()Ljava/lang/String;
+	protected fun getSerial ()Ljava/lang/String;
+	protected fun getSku ()Ljava/lang/String;
+	protected fun getSocManufacturer ()Ljava/lang/String;
+	protected fun getSocModel ()Ljava/lang/String;
+	protected fun getTags ()Ljava/lang/String;
+	protected fun getTime ()Ljava/lang/Long;
+	protected fun getType ()Ljava/lang/String;
+	protected fun getUser ()Ljava/lang/String;
+	public synthetic fun transform (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Ljava/lang/Object;)V
+	public fun transform (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Lkotlin/Pair;)V
+}
+
+public final class app/revanced/patches/all/misc/build/SpoofBuildInfoPatch : app/revanced/patches/all/misc/build/BaseSpoofBuildInfoPatch {
+	public fun <init> ()V
+}
+
 public final class app/revanced/patches/all/misc/debugging/EnableAndroidDebuggingPatch : app/revanced/patcher/patch/ResourcePatch {
 	public static final field INSTANCE Lapp/revanced/patches/all/misc/debugging/EnableAndroidDebuggingPatch;
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
@@ -235,6 +279,18 @@ public final class app/revanced/patches/googlenews/misc/integrations/Integration
 	public static final field INSTANCE Lapp/revanced/patches/googlenews/misc/integrations/IntegrationsPatch;
 }
 
+public final class app/revanced/patches/googlephotos/misc/gms/GmsCoreSupportPatch : app/revanced/patches/shared/misc/gms/BaseGmsCoreSupportPatch {
+	public static final field INSTANCE Lapp/revanced/patches/googlephotos/misc/gms/GmsCoreSupportPatch;
+}
+
+public final class app/revanced/patches/googlephotos/misc/gms/GmsCoreSupportResourcePatch : app/revanced/patches/shared/misc/gms/BaseGmsCoreSupportResourcePatch {
+	public static final field INSTANCE Lapp/revanced/patches/googlephotos/misc/gms/GmsCoreSupportResourcePatch;
+}
+
+public final class app/revanced/patches/googlephotos/misc/integrations/IntegrationsPatch : app/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch {
+	public static final field INSTANCE Lapp/revanced/patches/googlephotos/misc/integrations/IntegrationsPatch;
+}
+
 public final class app/revanced/patches/googlerecorder/restrictions/RemoveDeviceRestrictions : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/googlerecorder/restrictions/RemoveDeviceRestrictions;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 4.12.0-dev.4
+version = 4.12.0-dev.6

gradle/libs.versions.toml

@@ -2,9 +2,9 @@
 revanced-patcher = "19.3.1"
 #noinspection GradleDependency
 smali = "3.0.5" # 3.0.7 breaks binary compatibility. Tracking https://github.com/google/smali/issues/58.
-guava = "33.1.0-jre"
-gson = "2.10.1"
-binary-compatibility-validator = "0.14.0"
+guava = "33.2.1-jre"
+gson = "2.11.0"
+binary-compatibility-validator = "0.15.1"
 kotlin = "2.0.0"
 
 [libraries]

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

package.json

@@ -3,7 +3,7 @@
     "@saithodev/semantic-release-backmerge": "^4.0.1",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
-    "gradle-semantic-release-plugin": "^1.9.1",
-    "semantic-release": "^23.0.8"
+    "gradle-semantic-release-plugin": "^1.9.2",
+    "semantic-release": "^24.0.0"
   }
 }

src/main/kotlin/app/revanced/patches/all/location/hide/HideMockLocationPatch.kt

@@ -0,0 +1,56 @@
+@file:Suppress("unused")
+
+package app.revanced.patches.all.location.hide
+
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.all.misc.transformation.BaseTransformInstructionsPatch
+import app.revanced.patches.all.misc.transformation.IMethodCall
+import app.revanced.patches.all.misc.transformation.fromMethodReference
+import app.revanced.util.getReference
+import com.android.tools.smali.dexlib2.iface.ClassDef
+import com.android.tools.smali.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.Instruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+
+@Patch(
+    name = "Hide mock location",
+    description = "Prevents the app from knowing the device location is being mocked by a third party app.",
+    use = false
+)
+object HideMockLocationPatch : BaseTransformInstructionsPatch<Pair<Instruction, Int>>() {
+    override fun filterMap(
+        classDef: ClassDef,
+        method: Method,
+        instruction: Instruction,
+        instructionIndex: Int
+    ): Pair<Instruction, Int>? {
+        val reference = instruction.getReference<MethodReference>() ?: return null
+        if (fromMethodReference<MethodCall>(reference) == null) return null
+
+        return instruction to instructionIndex
+    }
+
+    override fun transform(mutableMethod: MutableMethod, entry: Pair<Instruction, Int>) {
+        val (instruction, index) = entry
+        instruction as FiveRegisterInstruction
+
+        // Replace return value with a constant `false` boolean.
+        mutableMethod.replaceInstruction(
+            index + 1,
+            "const/4 v${instruction.registerC}, 0x0"
+        )
+    }
+}
+
+private enum class MethodCall(
+    override val definedClassName: String,
+    override val methodName: String,
+    override val methodParams: Array<String>,
+    override val returnType: String
+) : IMethodCall {
+    IsMock("Landroid/location/Location;", "isMock", emptyArray(), "Z"),
+    IsFromMockProvider("Landroid/location/Location;", "isFromMockProvider", emptyArray(), "Z")
+}

src/main/kotlin/app/revanced/patches/all/misc/build/BaseSpoofBuildInfoPatch.kt

@@ -0,0 +1,120 @@
+package app.revanced.patches.all.misc.build
+
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.all.misc.transformation.BaseTransformInstructionsPatch
+import app.revanced.util.getReference
+import com.android.tools.smali.dexlib2.iface.ClassDef
+import com.android.tools.smali.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.iface.instruction.Instruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.FieldReference
+
+abstract class BaseSpoofBuildInfoPatch : BaseTransformInstructionsPatch<Pair<Int, Pair<String, String>>>() {
+    // The build information supported32BitAbis, supported64BitAbis, and supportedAbis are not supported for now,
+    // because initializing an array in transform is a bit more complex.
+
+    protected open val board: String? = null
+
+    protected open val bootloader: String? = null
+
+    protected open val brand: String? = null
+
+    protected open val cpuAbi: String? = null
+
+    protected open val cpuAbi2: String? = null
+
+    protected open val device: String? = null
+
+    protected open val display: String? = null
+
+    protected open val fingerprint: String? = null
+
+    protected open val hardware: String? = null
+
+    protected open val host: String? = null
+
+    protected open val id: String? = null
+
+    protected open val manufacturer: String? = null
+
+    protected open val model: String? = null
+
+    protected open val odmSku: String? = null
+
+    protected open val product: String? = null
+
+    protected open val radio: String? = null
+
+    protected open val serial: String? = null
+
+    protected open val sku: String? = null
+
+    protected open val socManufacturer: String? = null
+
+    protected open val socModel: String? = null
+
+    protected open val tags: String? = null
+
+    protected open val time: Long? = null
+
+    protected open val type: String? = null
+
+    protected open val user: String? = null
+
+
+    // Lazy, so that patch options above are initialized before they are accessed.
+    private val replacements: Map<String, Pair<String, String>> by lazy {
+        buildMap {
+            if (board != null) put("BOARD", "const-string" to "\"$board\"")
+            if (bootloader != null) put("BOOTLOADER", "const-string" to "\"$bootloader\"")
+            if (brand != null) put("BRAND", "const-string" to "\"$brand\"")
+            if (cpuAbi != null) put("CPU_ABI", "const-string" to "\"$cpuAbi\"")
+            if (cpuAbi2 != null) put("CPU_ABI2", "const-string" to "\"$cpuAbi2\"")
+            if (device != null) put("DEVICE", "const-string" to "\"$device\"")
+            if (display != null) put("DISPLAY", "const-string" to "\"$display\"")
+            if (fingerprint != null) put("FINGERPRINT", "const-string" to "\"$fingerprint\"")
+            if (hardware != null) put("HARDWARE", "const-string" to "\"$hardware\"")
+            if (host != null) put("HOST", "const-string" to "\"$host\"")
+            if (id != null) put("ID", "const-string" to "\"$id\"")
+            if (manufacturer != null) put("MANUFACTURER", "const-string" to "\"$manufacturer\"")
+            if (model != null) put("MODEL", "const-string" to "\"$model\"")
+            if (odmSku != null) put("ODM_SKU", "const-string" to "\"$odmSku\"")
+            if (product != null) put("PRODUCT", "const-string" to "\"$product\"")
+            if (radio != null) put("RADIO", "const-string" to "\"$radio\"")
+            if (serial != null) put("SERIAL", "const-string" to "\"$serial\"")
+            if (sku != null) put("SKU", "const-string" to "\"$sku\"")
+            if (socManufacturer != null) put("SOC_MANUFACTURER", "const-string" to "\"$socManufacturer\"")
+            if (socModel != null) put("SOC_MODEL", "const-string" to "\"$socModel\"")
+            if (tags != null) put("TAGS", "const-string" to "\"$tags\"")
+            if (time != null) put("TIME", "const-wide" to "$time")
+            if (type != null) put("TYPE", "const-string" to "\"$type\"")
+            if (user != null) put("USER", "const-string" to "\"$user\"")
+        }
+    }
+
+    override fun filterMap(
+        classDef: ClassDef,
+        method: Method,
+        instruction: Instruction,
+        instructionIndex: Int
+    ): Pair<Int, Pair<String, String>>? {
+        val reference = instruction.getReference<FieldReference>() ?: return null
+        if (reference.definingClass != BUILD_CLASS_DESCRIPTOR) return null
+
+        return replacements[reference.name]?.let { instructionIndex to it }
+    }
+
+    override fun transform(mutableMethod: MutableMethod, entry: Pair<Int, Pair<String, String>>) {
+        val (index, replacement) = entry
+        val (opcode, operand) = replacement
+        val register = mutableMethod.getInstruction<OneRegisterInstruction>(index).registerA
+
+        mutableMethod.replaceInstruction(index, "$opcode v$register, $operand")
+    }
+
+    private companion object {
+        private const val BUILD_CLASS_DESCRIPTOR = "Landroid/os/Build;"
+    }
+}

src/main/kotlin/app/revanced/patches/all/misc/build/SpoofBuildInfoPatch.kt

@@ -0,0 +1,183 @@
+package app.revanced.patches.all.misc.build
+
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.longPatchOption
+import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption
+
+@Patch(
+    name = "Spoof build info",
+    description = "Spoof the information about the current build.",
+    use = false
+)
+@Suppress("unused")
+class SpoofBuildInfoPatch : BaseSpoofBuildInfoPatch() {
+    override val board by stringPatchOption(
+        key = "board",
+        default = null,
+        title = "Board",
+        description = "The name of the underlying board, like \"goldfish\"."
+    )
+
+    override val bootloader by stringPatchOption(
+        key = "bootloader",
+        default = null,
+        title = "Bootloader",
+        description = "The system bootloader version number."
+    )
+
+    override val brand by stringPatchOption(
+        key = "brand",
+        default = null,
+        title = "Brand",
+        description = "The consumer-visible brand with which the product/hardware will be associated, if any."
+    )
+
+    override val cpuAbi by stringPatchOption(
+        key = "cpu-abi",
+        default = null,
+        title = "CPU ABI",
+        description = "This field was deprecated in API level 21. Use SUPPORTED_ABIS instead."
+    )
+
+    override val cpuAbi2 by stringPatchOption(
+        key = "cpu-abi-2",
+        default = null,
+        title = "CPU ABI 2",
+        description = "This field was deprecated in API level 21. Use SUPPORTED_ABIS instead."
+    )
+
+    override val device by stringPatchOption(
+        key = "device",
+        default = null,
+        title = "Device",
+        description = "The name of the industrial design."
+    )
+
+    override val display by stringPatchOption(
+        key = "display",
+        default = null,
+        title = "Display",
+        description = "A build ID string meant for displaying to the user."
+    )
+
+    override val fingerprint by stringPatchOption(
+        key = "fingerprint",
+        default = null,
+        title = "Fingerprint",
+        description = "A string that uniquely identifies this build."
+    )
+
+    override val hardware by stringPatchOption(
+        key = "hardware",
+        default = null,
+        title = "Hardware",
+        description = "The name of the hardware (from the kernel command line or /proc)."
+    )
+
+    override val host by stringPatchOption(
+        key = "host",
+        default = null,
+        title = "Host",
+        description = "The host."
+    )
+
+    override val id by stringPatchOption(
+        key = "id",
+        default = null,
+        title = "ID",
+        description = "Either a changelist number, or a label like \"M4-rc20\"."
+    )
+
+    override val manufacturer by stringPatchOption(
+        key = "manufacturer",
+        default = null,
+        title = "Manufacturer",
+        description = "The manufacturer of the product/hardware."
+    )
+
+    override val model by stringPatchOption(
+        key = "model",
+        default = null,
+        title = "Model",
+        description = "The end-user-visible name for the end product."
+    )
+
+    override val odmSku by stringPatchOption(
+        key = "odm-sku",
+        default = null,
+        title = "ODM SKU",
+        description = "The SKU of the device as set by the original design manufacturer (ODM)."
+    )
+
+    override val product by stringPatchOption(
+        key = "product",
+        default = null,
+        title = "Product",
+        description = "The name of the overall product."
+    )
+
+    override val radio by stringPatchOption(
+        key = "radio",
+        default = null,
+        title = "Radio",
+        description = "This field was deprecated in API level 15. " +
+                "The radio firmware version is frequently not available when this class is initialized, " +
+                "leading to a blank or \"unknown\" value for this string. Use getRadioVersion() instead."
+    )
+
+    override val serial by stringPatchOption(
+        key = "serial",
+        default = null,
+        title = "Serial",
+        description = "This field was deprecated in API level 26. Use getSerial() instead."
+    )
+
+    override val sku by stringPatchOption(
+        key = "sku",
+        default = null,
+        title = "SKU",
+        description = "The SKU of the hardware (from the kernel command line)."
+    )
+
+    override val socManufacturer by stringPatchOption(
+        key = "soc-manufacturer",
+        default = null,
+        title = "SOC Manufacturer",
+        description = "The manufacturer of the device's primary system-on-chip."
+    )
+
+    override val socModel by stringPatchOption(
+        key = "soc-model",
+        default = null,
+        title = "SOC Model",
+        description = "The model name of the device's primary system-on-chip."
+    )
+
+    override val tags by stringPatchOption(
+        key = "tags",
+        default = null,
+        title = "Tags",
+        description = "Comma-separated tags describing the build, like \"unsigned,debug\"."
+    )
+
+    override val time by longPatchOption(
+        key = "time",
+        default = null,
+        title = "Time",
+        description = "The time at which the build was produced, given in milliseconds since the UNIX epoch."
+    )
+
+    override val type by stringPatchOption(
+        key = "type",
+        default = null,
+        title = "Type",
+        description = "The type of build, like \"user\" or \"eng\"."
+    )
+
+    override val user by stringPatchOption(
+        key = "user",
+        default = null,
+        title = "User",
+        description = "The user."
+    )
+}

src/main/kotlin/app/revanced/patches/all/misc/resources/AddResourcesPatch.kt

@@ -347,7 +347,10 @@ object AddResourcesPatch : ResourcePatch(), MutableMap<Value, MutableSet<BaseRes
                 val targetFile =
                     context.get("res/$value/$resourceFileName.xml").also {
                         it.parentFile?.mkdirs()
-                        it.createNewFile()
+
+                        if(it.createNewFile()) {
+                            it.writeText("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<resources>\n</resources>")
+                        }
                     }
 
                 context.xmlEditor[targetFile.path].let { editor ->

src/main/kotlin/app/revanced/patches/googlenews/misc/gms/GmsCoreSupportPatch.kt

@@ -4,7 +4,6 @@ import app.revanced.patches.googlenews.misc.gms.Constants.MAGAZINES_PACKAGE_NAME
 import app.revanced.patches.googlenews.misc.gms.Constants.REVANCED_MAGAZINES_PACKAGE_NAME
 import app.revanced.patches.googlenews.misc.gms.GmsCoreSupportResourcePatch.gmsCoreVendorGroupIdOption
 import app.revanced.patches.googlenews.misc.gms.fingerprints.MagazinesActivityOnCreateFingerprint
-import app.revanced.patches.googlenews.misc.gms.fingerprints.ServiceCheckFingerprint
 import app.revanced.patches.googlenews.misc.integrations.IntegrationsPatch
 import app.revanced.patches.shared.misc.gms.BaseGmsCoreSupportPatch
 
@@ -13,14 +12,12 @@ object GmsCoreSupportPatch : BaseGmsCoreSupportPatch(
     fromPackageName = MAGAZINES_PACKAGE_NAME,
     toPackageName = REVANCED_MAGAZINES_PACKAGE_NAME,
     primeMethodFingerprint = null,
-    earlyReturnFingerprints = setOf(ServiceCheckFingerprint),
     mainActivityOnCreateFingerprint = MagazinesActivityOnCreateFingerprint,
     integrationsPatchDependency = IntegrationsPatch::class,
     gmsCoreSupportResourcePatch = GmsCoreSupportResourcePatch,
     // Remove version constraint,
     // once https://github.com/ReVanced/revanced-patches/pull/3111#issuecomment-2240877277 is resolved.
     compatiblePackages = setOf(CompatiblePackage(MAGAZINES_PACKAGE_NAME, setOf("5.108.0.644447823"))),
-    fingerprints = setOf(ServiceCheckFingerprint),
 ) {
     override val gmsCoreVendorGroupId by gmsCoreVendorGroupIdOption
 }

src/main/kotlin/app/revanced/patches/googlenews/misc/gms/fingerprints/ServiceCheckFingerprint.kt

@@ -1,12 +0,0 @@
-package app.revanced.patches.googlenews.misc.gms.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-
-internal object ServiceCheckFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    parameters = listOf("L", "I"),
-    strings = listOf("Google Play Services not available", "GooglePlayServices not available due to error "),
-)

src/main/kotlin/app/revanced/patches/googlenews/misc/integrations/fingerprints/StartActivityInitFingerprint.kt

@@ -26,7 +26,7 @@ internal object StartActivityInitFingerprint : IntegrationsFingerprint(
             getReference<MethodReference>()?.name == "getApplicationContext"
         }
 
-        getApplicationContextIndex + 2 // Below the move-result-object instruction
+        getApplicationContextIndex + 2 // Below the move-result-object instruction.
     },
     contextRegisterResolver = { method ->
         val moveResultInstruction = method.implementation!!.instructions.elementAt(getApplicationContextIndex + 1)

src/main/kotlin/app/revanced/patches/googlephotos/misc/gms/Constants.kt

@@ -0,0 +1,6 @@
+package app.revanced.patches.googlephotos.misc.gms
+
+internal object Constants {
+    const val PHOTOS_PACKAGE_NAME = "com.google.android.apps.photos"
+    const val REVANCED_PHOTOS_PACKAGE_NAME = "app.revanced.android.photos"
+}

src/main/kotlin/app/revanced/patches/googlephotos/misc/gms/GmsCoreSupportPatch.kt

@@ -0,0 +1,21 @@
+package app.revanced.patches.googlephotos.misc.gms
+
+import app.revanced.patches.googlephotos.misc.gms.Constants.PHOTOS_PACKAGE_NAME
+import app.revanced.patches.googlephotos.misc.gms.Constants.REVANCED_PHOTOS_PACKAGE_NAME
+import app.revanced.patches.googlephotos.misc.gms.GmsCoreSupportResourcePatch.gmsCoreVendorGroupIdOption
+import app.revanced.patches.googlephotos.misc.gms.fingerprints.PhotosActivityOnCreateFingerprint
+import app.revanced.patches.googlephotos.misc.integrations.IntegrationsPatch
+import app.revanced.patches.shared.misc.gms.BaseGmsCoreSupportPatch
+
+@Suppress("unused")
+object GmsCoreSupportPatch : BaseGmsCoreSupportPatch(
+    fromPackageName = PHOTOS_PACKAGE_NAME,
+    toPackageName = REVANCED_PHOTOS_PACKAGE_NAME,
+    primeMethodFingerprint = null,
+    mainActivityOnCreateFingerprint = PhotosActivityOnCreateFingerprint,
+    integrationsPatchDependency = IntegrationsPatch::class,
+    gmsCoreSupportResourcePatch = GmsCoreSupportResourcePatch,
+    compatiblePackages = setOf(CompatiblePackage(PHOTOS_PACKAGE_NAME)),
+) {
+    override val gmsCoreVendorGroupId by gmsCoreVendorGroupIdOption
+}

src/main/kotlin/app/revanced/patches/googlephotos/misc/gms/GmsCoreSupportResourcePatch.kt

@@ -0,0 +1,11 @@
+package app.revanced.patches.googlephotos.misc.gms
+
+import app.revanced.patches.googlephotos.misc.gms.Constants.PHOTOS_PACKAGE_NAME
+import app.revanced.patches.googlephotos.misc.gms.Constants.REVANCED_PHOTOS_PACKAGE_NAME
+import app.revanced.patches.shared.misc.gms.BaseGmsCoreSupportResourcePatch
+
+object GmsCoreSupportResourcePatch : BaseGmsCoreSupportResourcePatch(
+    fromPackageName = PHOTOS_PACKAGE_NAME,
+    toPackageName = REVANCED_PHOTOS_PACKAGE_NAME,
+    spoofedPackageSignature = "24bb24c05e47e0aefa68a58a766179d9b613a600",
+)

src/main/kotlin/app/revanced/patches/googlephotos/misc/gms/fingerprints/PhotosActivityOnCreateFingerprint.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.googlephotos.misc.gms.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+internal object PhotosActivityOnCreateFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef, classDef ->
+        methodDef.name == "onCreate" && classDef.endsWith("/HomeActivity;")
+    },
+)

src/main/kotlin/app/revanced/patches/googlephotos/misc/integrations/IntegrationsPatch.kt

@@ -0,0 +1,10 @@
+package app.revanced.patches.googlephotos.misc.integrations
+
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.googlephotos.misc.integrations.fingerprints.HomeActivityInitFingerprint
+import app.revanced.patches.shared.misc.integrations.BaseIntegrationsPatch
+
+@Patch(requiresIntegrations = true)
+object IntegrationsPatch : BaseIntegrationsPatch(
+    setOf(HomeActivityInitFingerprint),
+)

src/main/kotlin/app/revanced/patches/googlephotos/misc/integrations/fingerprints/HomeActivityInitFingerprint.kt

@@ -0,0 +1,37 @@
+package app.revanced.patches.googlephotos.misc.integrations.fingerprints
+
+import app.revanced.patches.googlephotos.misc.integrations.fingerprints.HomeActivityInitFingerprint.getApplicationContextIndex
+import app.revanced.patches.shared.misc.integrations.BaseIntegrationsPatch.IntegrationsFingerprint
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+
+internal object HomeActivityInitFingerprint : IntegrationsFingerprint(
+    opcodes = listOf(
+        Opcode.CONST_STRING,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IF_NEZ,
+        Opcode.INVOKE_VIRTUAL, // Calls getApplicationContext().
+        Opcode.MOVE_RESULT_OBJECT,
+    ),
+    insertIndexResolver = { method ->
+        getApplicationContextIndex = method.indexOfFirstInstructionOrThrow {
+            getReference<MethodReference>()?.name == "getApplicationContext"
+        }
+
+        getApplicationContextIndex + 2 // Below the move-result-object instruction.
+    },
+    contextRegisterResolver = { method ->
+        val moveResultInstruction = method.implementation!!.instructions.elementAt(getApplicationContextIndex + 1)
+            as OneRegisterInstruction
+        moveResultInstruction.registerA
+    },
+    customFingerprint = { methodDef, classDef ->
+        methodDef.name == "onCreate" && classDef.endsWith("/HomeActivity;")
+    },
+) {
+    private var getApplicationContextIndex = -1
+}

src/main/kotlin/app/revanced/patches/music/misc/gms/GmsCoreSupportPatch.kt

@@ -3,7 +3,9 @@ package app.revanced.patches.music.misc.gms
 import app.revanced.patches.music.misc.gms.Constants.MUSIC_PACKAGE_NAME
 import app.revanced.patches.music.misc.gms.Constants.REVANCED_MUSIC_PACKAGE_NAME
 import app.revanced.patches.music.misc.gms.GmsCoreSupportResourcePatch.gmsCoreVendorGroupIdOption
-import app.revanced.patches.music.misc.gms.fingerprints.*
+import app.revanced.patches.music.misc.gms.fingerprints.CastDynamiteModuleV2Fingerprint
+import app.revanced.patches.music.misc.gms.fingerprints.MusicActivityOnCreateFingerprint
+import app.revanced.patches.music.misc.gms.fingerprints.PrimeMethodFingerprint
 import app.revanced.patches.music.misc.integrations.IntegrationsPatch
 import app.revanced.patches.shared.fingerprints.CastContextFetchFingerprint
 import app.revanced.patches.shared.misc.gms.BaseGmsCoreSupportPatch
@@ -14,8 +16,6 @@ object GmsCoreSupportPatch : BaseGmsCoreSupportPatch(
     toPackageName = REVANCED_MUSIC_PACKAGE_NAME,
     primeMethodFingerprint = PrimeMethodFingerprint,
     earlyReturnFingerprints = setOf(
-        ServiceCheckFingerprint,
-        CastDynamiteModuleFingerprint,
         CastDynamiteModuleV2Fingerprint,
         CastContextFetchFingerprint,
     ),
@@ -35,8 +35,6 @@ object GmsCoreSupportPatch : BaseGmsCoreSupportPatch(
         ),
     ),
     fingerprints = setOf(
-        ServiceCheckFingerprint,
-        CastDynamiteModuleFingerprint,
         CastDynamiteModuleV2Fingerprint,
         CastContextFetchFingerprint,
         PrimeMethodFingerprint,

src/main/kotlin/app/revanced/patches/music/misc/gms/fingerprints/ServiceCheckFingerprint.kt

@@ -1,12 +0,0 @@
-package app.revanced.patches.music.misc.gms.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-
-internal object ServiceCheckFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.STATIC,
-    listOf("L", "I"),
-    strings = listOf("Google Play Services not available"),
-)

src/main/kotlin/app/revanced/patches/shared/misc/gms/BaseGmsCoreSupportPatch.kt

@@ -11,9 +11,11 @@ import app.revanced.patches.all.misc.packagename.ChangePackageNamePatch
 import app.revanced.patches.shared.misc.gms.BaseGmsCoreSupportPatch.Constants.ACTIONS
 import app.revanced.patches.shared.misc.gms.BaseGmsCoreSupportPatch.Constants.AUTHORITIES
 import app.revanced.patches.shared.misc.gms.BaseGmsCoreSupportPatch.Constants.PERMISSIONS
+import app.revanced.patches.shared.misc.gms.fingerprints.CastDynamiteModuleFingerprint
 import app.revanced.patches.shared.misc.gms.fingerprints.GmsCoreSupportFingerprint
 import app.revanced.patches.shared.misc.gms.fingerprints.GmsCoreSupportFingerprint.GET_GMS_CORE_VENDOR_GROUP_ID_METHOD_NAME
 import app.revanced.patches.shared.misc.gms.fingerprints.GooglePlayUtilityFingerprint
+import app.revanced.patches.shared.misc.gms.fingerprints.ServiceCheckFingerprint
 import app.revanced.util.exception
 import app.revanced.util.getReference
 import app.revanced.util.returnEarly
@@ -44,7 +46,7 @@ abstract class BaseGmsCoreSupportPatch(
     private val fromPackageName: String,
     private val toPackageName: String,
     private val primeMethodFingerprint: MethodFingerprint?,
-    private val earlyReturnFingerprints: Set<MethodFingerprint>,
+    private val earlyReturnFingerprints: Set<MethodFingerprint> = setOf(),
     private val mainActivityOnCreateFingerprint: MethodFingerprint,
     private val integrationsPatchDependency: PatchClass,
     gmsCoreSupportResourcePatch: BaseGmsCoreSupportResourcePatch,
@@ -54,7 +56,7 @@ abstract class BaseGmsCoreSupportPatch(
 ) : BytecodePatch(
     name = "GmsCore support",
     description = "Allows patched Google apps to run without root and under a different package name " +
-        "by using GmsCore instead of Google Play Services.",
+            "by using GmsCore instead of Google Play Services.",
     dependencies = setOf(
         ChangePackageNamePatch::class,
         gmsCoreSupportResourcePatch::class,
@@ -64,6 +66,8 @@ abstract class BaseGmsCoreSupportPatch(
     fingerprints = setOf(
         GmsCoreSupportFingerprint,
         GooglePlayUtilityFingerprint,
+        ServiceCheckFingerprint,
+        CastDynamiteModuleFingerprint,
         mainActivityOnCreateFingerprint,
     ) + fingerprints,
     requiresIntegrations = true,
@@ -96,7 +100,7 @@ abstract class BaseGmsCoreSupportPatch(
         primeMethodFingerprint?.let { transformPrimeMethod(packageName) }
 
         // Return these methods early to prevent the app from crashing.
-        earlyReturnFingerprints.returnEarly()
+        (earlyReturnFingerprints + ServiceCheckFingerprint + CastDynamiteModuleFingerprint).returnEarly()
         if (GooglePlayUtilityFingerprint.result != null) {
             GooglePlayUtilityFingerprint.returnEarly()
         }
@@ -105,7 +109,7 @@ abstract class BaseGmsCoreSupportPatch(
         mainActivityOnCreateFingerprint.result?.mutableMethod?.addInstructions(
             0,
             "invoke-static/range { p0 .. p0 }, Lapp/revanced/integrations/shared/GmsCoreSupport;->" +
-                "checkGmsCore(Landroid/app/Activity;)V",
+                    "checkGmsCore(Landroid/app/Activity;)V",
         ) ?: throw mainActivityOnCreateFingerprint.exception
 
         // Change the vendor of GmsCore in ReVanced Integrations.

src/main/kotlin/app/revanced/patches/shared/misc/gms/BaseGmsCoreSupportResourcePatch.kt

@@ -96,27 +96,23 @@ abstract class BaseGmsCoreSupportResourcePatch(
     private fun ResourceContext.patchManifest() {
         val packageName = ChangePackageNamePatch.setOrGetFallbackPackageName(toPackageName)
 
-        val manifest = this.get("AndroidManifest.xml").readText()
-        this.get("AndroidManifest.xml").writeText(
-            manifest.replace(
-                "package=\"$fromPackageName",
-                "package=\"$packageName",
-            ).replace(
-                "android:authorities=\"$fromPackageName",
-                "android:authorities=\"$packageName",
-            ).replace(
-                "$fromPackageName.permission.C2D_MESSAGE",
-                "$packageName.permission.C2D_MESSAGE",
-            ).replace(
-                "$fromPackageName.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION",
-                "$packageName.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION",
-            ).replace(
-                "com.google.android.c2dm",
-                "$gmsCoreVendorGroupId.android.c2dm",
-            ).replace(
-                "</queries>",
-                "<package android:name=\"$gmsCoreVendorGroupId.android.gms\"/></queries>",
-            ),
+        val transformations = mapOf(
+            "package=\"$fromPackageName" to "package=\"$packageName",
+            "android:authorities=\"$fromPackageName" to "android:authorities=\"$packageName",
+            "$fromPackageName.permission.C2D_MESSAGE" to "$packageName.permission.C2D_MESSAGE",
+            "$fromPackageName.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION" to "$packageName.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION",
+            "com.google.android.c2dm" to "$packageName.android.c2dm",
+            "com.google.android.libraries.photos.api.mars" to "$packageName.android.apps.photos.api.mars",
+            "</queries>" to "<package android:name=\"$gmsCoreVendorGroupId.android.gms\"/></queries>",
+        )
+
+        get("AndroidManifest.xml", false).writeText(
+            transformations.entries.fold(get("AndroidManifest.xml", false).readText()) { acc, (from, to) ->
+                acc.replace(
+                    from,
+                    to
+                )
+            }
         )
     }
 

src/main/kotlin/app/revanced/patches/shared/misc/gms/fingerprints/CastDynamiteModuleFingerprint.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.music.misc.gms.fingerprints
+package app.revanced.patches.shared.misc.gms.fingerprints
 
 
 import app.revanced.patcher.fingerprint.MethodFingerprint

src/main/kotlin/app/revanced/patches/shared/misc/gms/fingerprints/ServiceCheckFingerprint.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.gms.fingerprints
+package app.revanced.patches.shared.misc.gms.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprint
@@ -8,5 +8,5 @@ internal object ServiceCheckFingerprint : MethodFingerprint(
     returnType = "V",
     accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
     parameters = listOf("L", "I"),
-    strings = listOf("Google Play Services not available", "GooglePlayServices not available due to error ")
-)
+    strings = listOf("Google Play Services not available")
+)

src/main/kotlin/app/revanced/patches/youtube/misc/gms/GmsCoreSupportPatch.kt

@@ -7,10 +7,8 @@ import app.revanced.patches.youtube.misc.fix.playback.SpoofClientPatch
 import app.revanced.patches.youtube.misc.gms.Constants.REVANCED_YOUTUBE_PACKAGE_NAME
 import app.revanced.patches.youtube.misc.gms.Constants.YOUTUBE_PACKAGE_NAME
 import app.revanced.patches.youtube.misc.gms.GmsCoreSupportResourcePatch.gmsCoreVendorGroupIdOption
-import app.revanced.patches.youtube.misc.gms.fingerprints.CastDynamiteModuleFingerprint
 import app.revanced.patches.youtube.misc.gms.fingerprints.CastDynamiteModuleV2Fingerprint
 import app.revanced.patches.youtube.misc.gms.fingerprints.PrimeMethodFingerprint
-import app.revanced.patches.youtube.misc.gms.fingerprints.ServiceCheckFingerprint
 import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.shared.fingerprints.MainActivityOnCreateFingerprint
 
@@ -20,8 +18,6 @@ object GmsCoreSupportPatch : BaseGmsCoreSupportPatch(
     toPackageName = REVANCED_YOUTUBE_PACKAGE_NAME,
     primeMethodFingerprint = PrimeMethodFingerprint,
     earlyReturnFingerprints = setOf(
-        ServiceCheckFingerprint,
-        CastDynamiteModuleFingerprint,
         CastDynamiteModuleV2Fingerprint,
         CastContextFetchFingerprint,
     ),
@@ -63,8 +59,6 @@ object GmsCoreSupportPatch : BaseGmsCoreSupportPatch(
         ),
     ),
     fingerprints = setOf(
-        ServiceCheckFingerprint,
-        CastDynamiteModuleFingerprint,
         CastDynamiteModuleV2Fingerprint,
         CastContextFetchFingerprint,
         PrimeMethodFingerprint,

src/main/kotlin/app/revanced/patches/youtube/misc/gms/fingerprints/CastDynamiteModuleFingerprint.kt

@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.misc.gms.fingerprints
-
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-
-internal object CastDynamiteModuleFingerprint : MethodFingerprint(
-    strings = listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
-)