From 4450e0a19edadcd2676802c55184e5f059ab870a Mon Sep 17 00:00:00 2001
From: Dylan <dylanpdx@gmail.com>
Date: Sun, 8 Mar 2026 23:47:47 +0000
Subject: [PATCH] feat(photoshopmix): Revert to using Fingerprints.kt

---
 .../patches/photoshopmix/BypassLoginPatch.kt  |  8 +------
 .../patches/photoshopmix/Fingerprints.kt      | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 patches/src/main/kotlin/app/revanced/patches/photoshopmix/Fingerprints.kt

diff --git a/patches/src/main/kotlin/app/revanced/patches/photoshopmix/BypassLoginPatch.kt b/patches/src/main/kotlin/app/revanced/patches/photoshopmix/BypassLoginPatch.kt
index 5ef70b556f..f414e5a9af 100644
--- a/patches/src/main/kotlin/app/revanced/patches/photoshopmix/BypassLoginPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/photoshopmix/BypassLoginPatch.kt
@@ -13,13 +13,7 @@ val bypassLoginPatch = bytecodePatch(
     compatibleWith("com.adobe.photoshopmix")
 
     apply {
-        var psMixFragment = "Lcom/adobe/photoshopmix/PSMixFragment;"
-        var firstLoginMethod = firstMethod{ name == "isLoggedIn" && definingClass == "Lcom/adobe/acira/accreativecloudlibrary/CreativeCloudSource;" && returnType == "Z"}
-        var libButtonClickedMethod = firstMethod{name=="ccLibButtonClickHandler" && definingClass==psMixFragment}
-        var lightroomButtonClickedMethod = firstMethod{name=="lightroomButtonClickHandler" && definingClass==psMixFragment}
-        var ccButtonClickedMethod = firstMethod{name=="ccButtonClickHandler" && definingClass==psMixFragment}
-
-        firstLoginMethod.returnEarly(true)
+        disableLoginMethod.returnEarly(true)
 
         // Disables these buttons that cause the app to crash while not logged in.
         libButtonClickedMethod.returnEarly()
diff --git a/patches/src/main/kotlin/app/revanced/patches/photoshopmix/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/photoshopmix/Fingerprints.kt
new file mode 100644
index 0000000000..7131e57882
--- /dev/null
+++ b/patches/src/main/kotlin/app/revanced/patches/photoshopmix/Fingerprints.kt
@@ -0,0 +1,23 @@
+package app.revanced.patches.photoshopmix
+
+import app.revanced.patcher.definingClass
+import app.revanced.patcher.gettingFirstMethodDeclaratively
+import app.revanced.patcher.patch.BytecodePatchContext
+import app.revanced.patcher.returnType
+
+internal val BytecodePatchContext.disableLoginMethod by gettingFirstMethodDeclaratively("isLoggedIn") {
+    returnType("Z")
+    definingClass("/CreativeCloudSource;")
+}
+
+internal val BytecodePatchContext.libButtonClickedMethod by gettingFirstMethodDeclaratively("ccLibButtonClickHandler") {
+    definingClass("/PSMixFragment;")
+}
+
+internal val BytecodePatchContext.lightroomButtonClickedMethod by gettingFirstMethodDeclaratively("lightroomButtonClickHandler") {
+    definingClass("/PSMixFragment;")
+}
+
+internal val BytecodePatchContext.ccButtonClickedMethod by gettingFirstMethodDeclaratively("ccButtonClickHandler") {
+    definingClass("/PSMixFragment;")
+}