From f2ed148855f66c1b2fd5c62c3966932b69618ca3 Mon Sep 17 00:00:00 2001
From: DHD2280 <luigiconte98@gmail.com>
Date: Wed, 1 May 2024 22:25:16 +0200
Subject: [PATCH] CHANGELOG: Added Hide Lock icon in Lockscreen

---
 .../hooks/systemui/lockscreen/Lockscreen.java | 41 ++++++++++---------
 app/src/main/res/xml/lockscreen_prefs.xml     |  4 +-
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/lockscreen/Lockscreen.java b/app/src/main/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/lockscreen/Lockscreen.java
index e88683973..3d6e49665 100644
--- a/app/src/main/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/lockscreen/Lockscreen.java
+++ b/app/src/main/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/lockscreen/Lockscreen.java
@@ -68,7 +68,6 @@ public class Lockscreen extends XposedMods {
     private boolean removeSOS;
     private boolean hideFingerprint = false, customFingerprint = false;
     private int fingerprintStyle = 0;
-    private Object mFpIcon;
     private float mFpScale = 1.0f;
     private Drawable mFpDrawable = null;
     private boolean removeLeftAffordance = false, removeRightAffordance = false;
@@ -77,7 +76,6 @@ public class Lockscreen extends XposedMods {
     private ImageView mLockIcon = null;
     private boolean hideLockscreenCarrier = false, hideLockscreenStatusbar = false, hideLockscreenCapsule = false;
     private String lockscreenCarrierReplacement = "";
-    private static Object carrierTextController;
 
     public Lockscreen(Context context) {
         super(context);
@@ -112,6 +110,9 @@ public void updatePrefs(String... Key) {
             ) {
                 hideLockscreenStuff();
             }
+            if (Key[0].equals(LOCKSCREEN_REMOVE_LOCK)) {
+                if (mLockIcon != null) mLockIcon.setVisibility(removeLockIcon ? View.GONE : View.VISIBLE);
+            }
         }
 
     }
@@ -150,7 +151,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
         try {
             OnScreenFingerprint = findClass("com.oplus.systemui.biometrics.finger.udfps.OnScreenFingerprintUiMach", lpparam.classLoader);
         } catch (Throwable t) {
-            OnScreenFingerprint = findClass("com.oplus.systemui.keyguard.finger.onscreenfingerprint.OnScreenFingerprintUiMech", lpparam.classLoader);
+            OnScreenFingerprint = findClass("com.oplus.systemui.keyguard.finger.onscreenfingerprint.OnScreenFingerprintUiMech", lpparam.classLoader); // OOS 13
         }
         hookAllMethods(OnScreenFingerprint, "initFpIconWin", new XC_MethodHook() {
             @Override
@@ -173,11 +174,11 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
             hookAllMethods(OnScreenFingerprint, "startFadeInAnimation", new XC_MethodHook() {
                 @Override
                 protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
-                    if (hideFingerprint || customFingerprint) updateFingerprintIcon(param, true);
+                    if (hideFingerprint || customFingerprint) updateFingerprintIcon(param, false);
                 }
             });
         } catch (Throwable t) {
-            log(TAG + "startFadeInAnimation not found");
+            log(TAG + "loadAnimDrawables not found");
         }
 
         try {
@@ -193,17 +194,6 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
             log(TAG + "updateFpIconColor not found");
         }
 
-        try {
-            hookAllMethods(OnScreenFingerprint, "startFadeOutAnimation", new XC_MethodHook() {
-                @Override
-                protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
-                    if (hideFingerprint || customFingerprint) updateFingerprintIcon(param, true);
-                }
-            });
-        } catch (Throwable t) {
-            log(TAG + "startFadeOutAnimation not found");
-        }
-
         // Affordance Section
         hookAffordance(lpparam);
 
@@ -216,7 +206,7 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
     }
 
     private void updateFingerprintIcon(XC_MethodHook.MethodHookParam param, boolean isStartMethod) {
-        if (mFpIcon == null) mFpIcon = getObjectField(param.thisObject, "mFpIcon");
+        Object mFpIcon = getObjectField(param.thisObject, "mFpIcon");
 
         if (BuildConfig.DEBUG) log(TAG + "updateFingerprintIcon");
 
@@ -228,7 +218,7 @@ private void updateFingerprintIcon(XC_MethodHook.MethodHookParam param, boolean
         if (mFpIcon != null) {
             callMethod(mFpIcon, "setImageDrawable", mFpDrawable == null ? null : mFpDrawable);
         }
-        if (hideFingerprint && isStartMethod) {
+        if (isStartMethod) {
             param.setResult(null);
         }
         //if (!isStartMethod) callMethod(param.thisObject, "updateFpIconColor");
@@ -319,7 +309,20 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
     }
 
     private void hookLockIcon(XC_LoadPackage.LoadPackageParam lpparam) {
-
+        try {
+            Class<?> LockIconView = findClass("com.android.keyguard.LockIconView", lpparam.classLoader);
+            hookAllMethods(LockIconView, "onFinishInflate", new XC_MethodHook() {
+                @Override
+                protected void afterHookedMethod(MethodHookParam param) throws Throwable {
+                    mLockIcon = (ImageView) getObjectField(param.thisObject, "mLockIcon");
+                    if (removeLockIcon) {
+                        mLockIcon.setVisibility(View.GONE);
+                    }
+                }
+            });
+        } catch (Throwable t) {
+            log(TAG + "LockIconViewController not found");
+        }
     }
 
     private void hookCarrier(XC_LoadPackage.LoadPackageParam lpparam) {
diff --git a/app/src/main/res/xml/lockscreen_prefs.xml b/app/src/main/res/xml/lockscreen_prefs.xml
index 935f62651..5463e5a31 100644
--- a/app/src/main/res/xml/lockscreen_prefs.xml
+++ b/app/src/main/res/xml/lockscreen_prefs.xml
@@ -96,13 +96,13 @@
         android:title="@string/misc"
         app:iconSpaceReserved="false">
 
-        <!-- <SwitchPreferenceCompat
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="lockscreen_hide_lock_icon"
             android:title="@string/lockscreen_hide_lock_icon"
             android:summaryOn="@string/general_on"
             android:summaryOff="@string/general_off"
-            app:iconSpaceReserved="false" /> -->
+            app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"