fix: stabilize Google Photos GmsCore support

Author: xob0t

extensions/shared-youtube/library/src/main/java/app/morphe/extension/shared/patches/GmsCoreSupportPatch.java

@@ -60,10 +60,10 @@ private static String getOriginalPackageName() {
      * @return If the current package name is the same as the original unpatched app.
      *         If `GmsCore support` was not included during patching, this returns true;
      */
-    public static boolean isPackageNameOriginal() {
+    public static boolean isPackageNameOriginal(Context context) {
         String originalPackageName = getOriginalPackageName();
         return originalPackageName == null
-                || originalPackageName.equals(Utils.getContext().getPackageName());
+                || originalPackageName.equals(context.getPackageName());
     }
 
     private static void open(String queryOrLink) {
@@ -126,7 +126,7 @@ public static void checkGmsCore(Activity context) {
             // Verify the user has not included GmsCore for a root installation.
             // GmsCore Support changes the package name, but with a mounted installation
             // all manifest changes are ignored and the original package name is used.
-            if (isPackageNameOriginal()) {
+            if (isPackageNameOriginal(context)) {
                 Logger.printInfo(() -> "App is mounted with root, but GmsCore patch was included");
                 // Cannot use localize text here, since the app will load resources
                 // from the unpatched app and all patch strings are missing.

patches/src/main/kotlin/app/morphe/patches/googlephotos/misc/login/Fingerprints.kt

@@ -7,8 +7,49 @@ package app.morphe.patches.googlephotos.misc.login
 import app.morphe.patcher.Fingerprint
 import app.morphe.util.getReference
 import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.iface.ClassDef
+import com.android.tools.smali.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.iface.instruction.NarrowLiteralInstruction
 import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+import com.android.tools.smali.dexlib2.iface.reference.StringReference
+
+private fun Method.referencesString(value: String) =
+    implementation?.instructions?.any {
+        it.getReference<StringReference>()?.string == value
+    } == true
+
+private fun Method.referencesStringContaining(value: String) =
+    implementation?.instructions?.any {
+        it.getReference<StringReference>()?.string?.contains(value) == true
+    } == true
+
+private fun Method.referencesMethod(returnType: String, parameters: List<String>? = null) =
+    implementation?.instructions?.any {
+        it.getReference<MethodReference>()?.let { ref ->
+            ref.returnType == returnType && (parameters == null || ref.parameterTypes.toList() == parameters)
+        } == true
+    } == true
+
+private fun Method.referencesVoidMethodWithSingleObjectParameter() =
+    implementation?.instructions?.any {
+        it.getReference<MethodReference>()?.let { ref ->
+            ref.returnType == "V" &&
+                ref.parameterTypes.size == 1 &&
+                ref.parameterTypes.first().startsWith("L")
+        } == true
+    } == true
+
+private fun Method.referencesIntLiteral(value: Int) =
+    implementation?.instructions?.any {
+        it is NarrowLiteralInstruction && it.narrowLiteral == value
+    } == true
+
+private fun ClassDef.hasMethodReferencingString(value: String) =
+    methods.any { it.referencesString(value) }
+
+private fun ClassDef.hasMethodReferencingStringContaining(value: String) =
+    methods.any { it.referencesStringContaining(value) }
 
 /**
  * Matches `aext.d()` — the AccountValidityMonitor method that enqueues `CheckAccountTask`
@@ -18,18 +59,16 @@ internal object AccountValidityMonitorCheckFingerprint : Fingerprint(
     accessFlags = listOf(AccessFlags.PUBLIC, AccessFlags.FINAL),
     returnType = "V",
     parameters = listOf(),
-    custom = { method, _ ->
-        method.implementation?.instructions?.let { insns ->
-            insns.any {
+    custom = { method, classDef ->
+        classDef.hasMethodReferencingString("AccountValidityMonitor") &&
+            classDef.hasMethodReferencingString("com.google.android.apps.photos.login.AccountValidityMonitor.CheckAccountTask") &&
+            method.implementation?.instructions?.let { instructions ->
+                instructions.any {
                 it.getReference<FieldReference>()?.let { ref ->
-                    ref.definingClass == "Laexv;" && ref.name == "a" && ref.type == "I"
+                    ref.name == "a" && ref.type == "I"
                 } == true
-            } && insns.any {
-                it.getReference<MethodReference>()?.toString()?.contains(
-                    "AccountValidityMonitor\$CheckAccountTask"
-                ) == true
-            }
-        } ?: false
+            } && method.referencesVoidMethodWithSingleObjectParameter()
+        } == true
     },
 )
 
@@ -42,14 +81,12 @@ internal object FrictionlessEligibilityFingerprint : Fingerprint(
     accessFlags = listOf(AccessFlags.PUBLIC, AccessFlags.FINAL),
     returnType = "Z",
     parameters = listOf(),
-    custom = { method, _ ->
-        method.implementation?.instructions?.let { insns ->
-            insns.any {
-                it.getReference<MethodReference>()?.toString() == "Lasgb;->b()Z"
-            } && insns.any {
-                it.getReference<MethodReference>()?.toString() == "Laexs;->o(I)V"
-            }
-        } ?: false
+    custom = { method, classDef ->
+        classDef.hasMethodReferencingStringContaining("maybeStartFrictionless") &&
+            classDef.hasMethodReferencingString("ProvideFrctAccountTask") &&
+            method.referencesMethod("Z", emptyList()) &&
+            method.referencesMethod("V", listOf("I")) &&
+            method.referencesIntLiteral(-1)
     },
 )