chore: Merge branch dev to main (#3544)

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [4.13.2-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.13.1...v4.13.2-dev.1) (2024-08-15)
+
+
+### Bug Fixes
+
+* **YouTube - GmsCore Support:** Fix patch exception by using correct patch offset ([#3543](https://github.com/ReVanced/revanced-patches/issues/3543)) ([b2b8454](https://github.com/ReVanced/revanced-patches/commit/b2b8454aa992bcb217fb03eb4de5532e0a9bd354))
+
 ## [4.13.1](https://github.com/ReVanced/revanced-patches/compare/v4.13.0...v4.13.1) (2024-08-15)
 
 

gradle.properties

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

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

@@ -18,7 +18,7 @@ import app.revanced.patches.shared.misc.gms.fingerprints.GooglePlayUtilityFinger
 import app.revanced.patches.shared.misc.gms.fingerprints.ServiceCheckFingerprint
 import app.revanced.util.exception
 import app.revanced.util.getReference
-import app.revanced.util.indexOfFirstInstructionOrThrow
+import app.revanced.util.indexOfFirstInstruction
 import app.revanced.util.returnEarly
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction21c
@@ -115,15 +115,16 @@ abstract class BaseGmsCoreSupportPatch(
 
  // Verify GmsCore is installed and whitelisted for power optimizations and background usage.
  mainActivityOnCreateFingerprint.result?.mutableMethod?.apply {
- val setContextIndex = indexOfFirstInstructionOrThrow {
- val reference = getReference<MethodReference>() ?: return@indexOfFirstInstructionOrThrow false
+ // Temporary fix for Google photos integration.
+ var setContextIndex = indexOfFirstInstruction {
+ val reference = getReference<MethodReference>() ?: return@indexOfFirstInstruction false
 
  reference.toString() == "Lapp/revanced/integrations/shared/Utils;->setContext(Landroid/content/Context;)V"
  }
 
  // Add after setContext call, because this patch needs the context.
  addInstructions(
- setContextIndex + 1,
+ if (setContextIndex < 0) 0 else setContextIndex + 1,
  "invoke-static/range { p0 .. p0 }, Lapp/revanced/integrations/shared/GmsCoreSupport;->" +
  "checkGmsCore(Landroid/app/Activity;)V",
  )