testVersionFor#20

Wossgebber · Feb 1, 2017 · dcf6648 · dcf6648
1 parent c2809cc
commit dcf6648
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/app-release_htc.apk b/app-release_htc.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -17,7 +17,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 22
         versionCode 49
-        versionName "1.4.9 test-fix-lp"
+        versionName "1.4.9 test-fix-htc"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/me/rijul/knockcode/XposedMod.java b/app/src/main/java/me/rijul/knockcode/XposedMod.java
@@ -57,6 +57,7 @@ public void onReceive(Context context, Intent intent) {
         }
     };
     private XC_MethodHook mShowPrimarySecurityScreenHook;
+    private boolean isHTC = false;
 
     public enum UnlockPolicy { NEVER, ALWAYS, NO_CLEARABLE_NOTIF, NO_NOTIF };
 
@@ -82,14 +83,30 @@ public void handleLoadPackage(LoadPackageParam lpparam) throws Throwable {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP)
             return;
         if (lpparam.packageName.equals("com.htc.lockscreen")) {
+            isHTC = true;
             Utils.XposedLog("HTC Device");
+            Utils.XposedLog("Version " + BuildConfig.VERSION_NAME);
             createHooksIfNeeded("com.htc.lockscreen.keyguard");
             hookMethods("com.htc.lockscreen.keyguard", lpparam);
-        } else if ((lpparam.packageName.contains("android.keyguard")) || (lpparam.packageName.contains("com.android.systemui"))) {
-            Utils.XposedLog("AOSPish Device");
-            createHooksIfNeeded("com.android.keyguard");
-            hookMethods("com.android.keyguard", lpparam);
-        } else if (lpparam.packageName.equals("me.rijul.knockcode")) {
+        }
+
+        if ((lpparam.packageName.contains("android.keyguard")) || (lpparam.packageName.contains("com.android.systemui"))) {
+            if (!isHTC) {
+                Utils.XposedLog("AOSPish Device");
+                Utils.XposedLog("Version " + BuildConfig.VERSION_NAME);
+                createHooksIfNeeded("com.android.keyguard");
+                hookMethods("com.android.keyguard", lpparam);
+            } else {
+                try {
+                    Class<?> keyguardViewManager = XposedHelpers.findClass("com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager",
+                            lpparam.classLoader);
+                    XposedBridge.hookAllMethods(keyguardViewManager, "onScreenTurnedOn", mOnScreenTurnedOnHook);
+                    XposedBridge.hookAllMethods(keyguardViewManager, "onScreenTurnedOff", mOnScreenTurnedOffHook);
+                } catch (NoSuchMethodError | XposedHelpers.ClassNotFoundError ignored) {}
+            }
+        }
+
+        if (lpparam.packageName.equals("me.rijul.knockcode")) {
             Class<?> SettingsActivityClazz = XposedHelpers.findClass("me.rijul.knockcode.SettingsActivity", lpparam.classLoader);
             XposedHelpers.setStaticBooleanField(SettingsActivityClazz, "MODULE_INACTIVE", false);
             XposedHelpers.findAndHookMethod(SettingsActivityClazz, "getXposedVersionCode",
@@ -126,7 +143,7 @@ private void hookMethods(String packageName, LoadPackageParam lpparam) {
                     lpparam.classLoader);
             XposedBridge.hookAllMethods(keyguardViewManager, "onScreenTurnedOn", mOnScreenTurnedOnHook);
             XposedBridge.hookAllMethods(keyguardViewManager, "onScreenTurnedOff", mOnScreenTurnedOffHook);
-        } catch (NoSuchMethodError ignored) {}
+        } catch (NoSuchMethodError | XposedHelpers.ClassNotFoundError ignored) {}
 
         /*
         XposedHelpers.findAndHookMethod("com.android.keyguard.KeyguardStatusView", lpparam.classLoader, "onFinishInflate", new XC_MethodHook() {