fix typo

Dev4Mod · Dev4Mod · commit 54c29d1643a9 · 2024-11-08T19:37:43.000-03:00
diff --git a/app/src/main/java/com/wmods/wppenhacer/adapter/IGStatusAdapter.java b/app/src/main/java/com/wmods/wppenhacer/adapter/IGStatusAdapter.java
@@ -147,7 +147,7 @@ public void setInfo(Object item) {
             }
             var statusInfo = XposedHelpers.getObjectField(item, "A01");
             var field = ReflectionUtils.getFieldByType(statusInfo.getClass(), XposedHelpers.findClass("com.whatsapp.jid.UserJid", statusInfoClazz.getClassLoader()));
-            var userJid = ReflectionUtils.getField(field, statusInfo);
+            var userJid = ReflectionUtils.getObjectField(field, statusInfo);
             var contactName = WppCore.getContactName(userJid);
             jid = WppCore.getRawString(userJid);
             igStatusContactName.setText(contactName);
diff --git a/app/src/main/java/com/wmods/wppenhacer/xposed/core/components/FMessageWpp.java b/app/src/main/java/com/wmods/wppenhacer/xposed/core/components/FMessageWpp.java
@@ -128,7 +128,7 @@ public File getMediaFile() {
                 if (field.getType().isPrimitive()) continue;
                 var fileField = ReflectionUtils.getFieldByType(field.getType(), File.class);
                 if (fileField != null) {
-                    var mediaFile = ReflectionUtils.getField(field, fmessage);
+                    var mediaFile = ReflectionUtils.getObjectField(field, fmessage);
                     return (File) fileField.get(mediaFile);
                 }
             }
diff --git a/app/src/main/java/com/wmods/wppenhacer/xposed/features/customization/CustomView.java b/app/src/main/java/com/wmods/wppenhacer/xposed/features/customization/CustomView.java
@@ -22,6 +22,7 @@
 import android.util.LruCache;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -201,6 +202,26 @@ private void setRuleInView(RuleItem ruleItem, View view) {
         for (var declaration : ruleItem.rule) {
             var property = declaration.getProperty();
             switch (property) {
+                case "position" -> {
+                    var value = declaration.get(0).toString().trim();
+                    if ("relative".equals(value)) {
+                        var parentView = (ViewGroup) view.getParent();
+                        if (parentView != null) {
+                            if (!(parentView instanceof FrameLayout) && parentView.getTag() != "relative") {
+                                var frameLayout = new FrameLayout(parentView.getContext());
+                                frameLayout.setTag("relative");
+                                var params = new FrameLayout.LayoutParams(view.getLayoutParams());
+                                var viewRoot = (ViewGroup) view.getRootView();
+                                viewRoot.addView(frameLayout, params);
+                                parentView.removeView(view);
+                                frameLayout.addView(view);
+                                view = frameLayout;
+                            } else if (parentView.getTag() == "relative") {
+                                view = parentView;
+                            }
+                        }
+                    }
+                }
                 case "background-color" -> {
                     if (declaration.size() != 2) continue;
                     var color = (TermColor) declaration.get(0);
diff --git a/app/src/main/java/com/wmods/wppenhacer/xposed/features/customization/FilterGroups.java b/app/src/main/java/com/wmods/wppenhacer/xposed/features/customization/FilterGroups.java
@@ -194,7 +194,7 @@ private void setFilter(int position) {
             ReflectionUtils.callMethod(methodInitFilter, null, mConversationFragment);
             if (mFilterInstance == null) return;
             var listField = ReflectionUtils.getFieldByType(mFilterInstance.getClass(), List.class);
-            var list = (List<Object>) ReflectionUtils.getField(listField, mFilterInstance);
+            var list = (List<Object>) ReflectionUtils.getObjectField(listField, mFilterInstance);
             if (list == null) return;
             var name = position == 0 ? "CONTACTS_FILTER" : "GROUP_FILTER";
             var result = list.stream().filter(item -> Objects.equals(XposedHelpers.getObjectField(item, "A01"), name)).findFirst();
diff --git a/app/src/main/java/com/wmods/wppenhacer/xposed/features/customization/SeparateGroup.java b/app/src/main/java/com/wmods/wppenhacer/xposed/features/customization/SeparateGroup.java
@@ -4,6 +4,7 @@
 import static de.robv.android.xposed.XposedHelpers.getObjectField;
 
 import android.annotation.SuppressLint;
+import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.BaseAdapter;
@@ -23,6 +24,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
+import java.util.regex.Pattern;
 
 import de.robv.android.xposed.XC_MethodHook;
 import de.robv.android.xposed.XSharedPreferences;
diff --git a/app/src/main/java/com/wmods/wppenhacer/xposed/features/general/MenuStatus.java b/app/src/main/java/com/wmods/wppenhacer/xposed/features/general/MenuStatus.java
@@ -43,10 +43,10 @@ public void doHook() throws Throwable {
         XposedBridge.hookMethod(menuStatusMethod, new XC_MethodHook() {
             @Override
             protected void afterHookedMethod(MethodHookParam param) throws Throwable {
-                var fieldObjects = Arrays.stream(param.method.getDeclaringClass().getDeclaredFields()).map(field -> ReflectionUtils.getField(field, param.thisObject)).filter(Objects::nonNull).collect(Collectors.toList());
+                var fieldObjects = Arrays.stream(param.method.getDeclaringClass().getDeclaredFields()).map(field -> ReflectionUtils.getObjectField(field, param.thisObject)).filter(Objects::nonNull).collect(Collectors.toList());
                 var menuManager = fieldObjects.stream().filter(menuManagerClass::isInstance).findFirst().orElse(null);
                 var menuField = ReflectionUtils.getFieldByExtendType(menuManagerClass, Menu.class);
-                var menu = (Menu) ReflectionUtils.getField(menuField, menuManager);
+                var menu = (Menu) ReflectionUtils.getObjectField(menuField, menuManager);
                 var fragmentInstance = fieldObjects.stream().filter(StatusPlaybackBaseFragmentClass::isInstance).findFirst().orElse(null);
 
                 var index = (int) XposedHelpers.getObjectField(fragmentInstance, "A00");
diff --git a/app/src/main/java/com/wmods/wppenhacer/xposed/features/general/SeenTick.java b/app/src/main/java/com/wmods/wppenhacer/xposed/features/general/SeenTick.java
@@ -173,7 +173,7 @@ private void hookStatusScreen(int ticktype) throws Exception {
                 protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                     if (!prefs.getBoolean("hidestatusview", false)) return;
                     var fMessageField = ReflectionUtils.getFieldByExtendType(param.thisObject.getClass(), FMessageWpp.TYPE);
-                    var fMessage = new FMessageWpp(ReflectionUtils.getField(fMessageField, param.thisObject));
+                    var fMessage = new FMessageWpp(ReflectionUtils.getObjectField(fMessageField, param.thisObject));
                     var key = fMessage.getKey();
                     if (key.isFromMe) return;
                     var view = (View) param.getResult();
@@ -313,7 +313,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                             CompletableFuture.runAsync(() -> {
                                 var keyClass = FMessageWpp.Key.TYPE;
                                 var fieldType = ReflectionUtils.getFieldByType(param.thisObject.getClass(), keyClass);
-                                var keyMessage = ReflectionUtils.getField(fieldType, param.thisObject);
+                                var keyMessage = ReflectionUtils.getObjectField(fieldType, param.thisObject);
                                 var fMessage = WppCore.getFMessageFromKey(keyMessage);
                                 if (fMessage == null) return;
                                 sendBlueTickMedia(fMessage, true);
diff --git a/app/src/main/java/com/wmods/wppenhacer/xposed/features/media/DownloadProfile.java b/app/src/main/java/com/wmods/wppenhacer/xposed/features/media/DownloadProfile.java
@@ -43,7 +43,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                         return true;
                     }
                     var field = ReflectionUtils.getFieldByType(subCls, loadProfileInfoField.getDeclaringClass());
-                    var jidObj = ReflectionUtils.getField(loadProfileInfoField, ReflectionUtils.getField(field, param.thisObject));
+                    var jidObj = ReflectionUtils.getObjectField(loadProfileInfoField, ReflectionUtils.getObjectField(field, param.thisObject));
                     var jid = WppCore.stripJID(WppCore.getRawString(jidObj));
                     var file = WppCore.getContactPhotoFile(jid);
                     var destPath = Utils.getDestination("Profile Photo");
diff --git a/app/src/main/java/com/wmods/wppenhacer/xposed/features/media/DownloadViewOnce.java b/app/src/main/java/com/wmods/wppenhacer/xposed/features/media/DownloadViewOnce.java
@@ -84,7 +84,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                                 CompletableFuture.runAsync(() -> {
                                     var keyClass = FMessageWpp.Key.TYPE;
                                     var fieldType = ReflectionUtils.getFieldByType(param.thisObject.getClass(), keyClass);
-                                    var keyMessageObj = ReflectionUtils.getField(fieldType, param.thisObject);
+                                    var keyMessageObj = ReflectionUtils.getObjectField(fieldType, param.thisObject);
                                     var fmessageObj = WppCore.getFMessageFromKey(keyMessageObj);
                                     var fmessage = new FMessageWpp(fmessageObj);
                                     var file = fmessage.getMediaFile();
diff --git a/app/src/main/java/com/wmods/wppenhacer/xposed/utils/ReflectionUtils.java b/app/src/main/java/com/wmods/wppenhacer/xposed/utils/ReflectionUtils.java
@@ -173,7 +173,7 @@ public static Object getDefaultValue(Class<?> paramType) {
         return null;
     }
 
-    public static Object getField(Field loadProfileInfoField, Object thisObject) {
+    public static Object getObjectField(Field loadProfileInfoField, Object thisObject) {
         try {
             return loadProfileInfoField.get(thisObject);
         } catch (Exception e) {

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public void setInfo(Object item) {`
`147`	`147`	`}`
`148`	`148`	`var statusInfo = XposedHelpers.getObjectField(item, "A01");`
`149`	`149`	`var field = ReflectionUtils.getFieldByType(statusInfo.getClass(), XposedHelpers.findClass("com.whatsapp.jid.UserJid", statusInfoClazz.getClassLoader()));`
`150`		`- var userJid = ReflectionUtils.getField(field, statusInfo);`
	`150`	`+ var userJid = ReflectionUtils.getObjectField(field, statusInfo);`
`151`	`151`	`var contactName = WppCore.getContactName(userJid);`
`152`	`152`	`jid = WppCore.getRawString(userJid);`
`153`	`153`	`igStatusContactName.setText(contactName);`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public File getMediaFile() {`
`128`	`128`	`if (field.getType().isPrimitive()) continue;`
`129`	`129`	`var fileField = ReflectionUtils.getFieldByType(field.getType(), File.class);`
`130`	`130`	`if (fileField != null) {`
`131`		`- var mediaFile = ReflectionUtils.getField(field, fmessage);`
	`131`	`+ var mediaFile = ReflectionUtils.getObjectField(field, fmessage);`
`132`	`132`	`return (File) fileField.get(mediaFile);`
`133`	`133`	`}`
`134`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {`
`43`	`43`	`return true;`
`44`	`44`	`}`
`45`	`45`	`var field = ReflectionUtils.getFieldByType(subCls, loadProfileInfoField.getDeclaringClass());`
`46`		`- var jidObj = ReflectionUtils.getField(loadProfileInfoField, ReflectionUtils.getField(field, param.thisObject));`
	`46`	`+ var jidObj = ReflectionUtils.getObjectField(loadProfileInfoField, ReflectionUtils.getObjectField(field, param.thisObject));`
`47`	`47`	`var jid = WppCore.stripJID(WppCore.getRawString(jidObj));`
`48`	`48`	`var file = WppCore.getContactPhotoFile(jid);`
`49`	`49`	`var destPath = Utils.getDestination("Profile Photo");`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ public static Object getDefaultValue(Class<?> paramType) {`
`173`	`173`	`return null;`
`174`	`174`	`}`
`175`	`175`
`176`		`- public static Object getField(Field loadProfileInfoField, Object thisObject) {`
	`176`	`+ public static Object getObjectField(Field loadProfileInfoField, Object thisObject) {`
`177`	`177`	`try {`
`178`	`178`	`return loadProfileInfoField.get(thisObject);`
`179`	`179`	`} catch (Exception e) {`