fix grey tips missing on 848

ferredoxin · Sep 23, 2020 · 7960735 · 7960735
1 parent 43bc323
commit 7960735
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/app/src/main/java/nil/nadph/qnotified/bridge/ContactUtils.java b/app/src/main/java/nil/nadph/qnotified/bridge/ContactUtils.java
@@ -2,11 +2,11 @@
 
 import de.robv.android.xposed.XposedHelpers;
 import nil.nadph.qnotified.util.DexKit;
+import nil.nadph.qnotified.util.Initiator;
 
 import java.lang.reflect.Modifier;
 
 import static nil.nadph.qnotified.util.Initiator._QQAppInterface;
-import static nil.nadph.qnotified.util.Initiator.load;
 import static nil.nadph.qnotified.util.Utils.*;
 
 public class ContactUtils {
@@ -15,8 +15,8 @@ public static String getTroopMemberNick(String troopUin, String memberUin) {
         if (troopUin != null && troopUin.length() > 0) {
             try {
                 Object mTroopManager = getTroopManager();
-                Object troopMemberInfo = invoke_virtual_declared_ordinal(mTroopManager, 0, 3, false, troopUin, memberUin,
-                        String.class, String.class, load("com.tencent.mobileqq.data.TroopMemberInfo"));
+                Object troopMemberInfo = invoke_virtual_declared_ordinal(mTroopManager, 0, 3, false,
+                        troopUin, memberUin, String.class, String.class, Initiator._TroopMemberInfo());
                 if (troopMemberInfo != null) {
                     String troopnick = (String) XposedHelpers.getObjectField(troopMemberInfo, "troopnick");
                     if (troopnick != null) {
@@ -26,7 +26,7 @@ public static String getTroopMemberNick(String troopUin, String memberUin) {
                         }
                     }
                 }
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 log(e);
             }
             try {

diff --git a/app/src/main/java/nil/nadph/qnotified/util/Initiator.java b/app/src/main/java/nil/nadph/qnotified/util/Initiator.java
@@ -19,13 +19,11 @@
 package nil.nadph.qnotified.util;
 
 import android.os.Parcelable;
-
 import com.tencent.mobileqq.app.QQAppInterface;
+import de.robv.android.xposed.XposedBridge;
 
 import java.lang.reflect.Field;
 
-import de.robv.android.xposed.XposedBridge;
-
 import static nil.nadph.qnotified.util.Utils.log;
 import static nil.nadph.qnotified.util.Utils.loge;
 
@@ -456,6 +454,12 @@ public static Class _BaseChatPie() {
         return clazz;
     }
 
+    public static Class _TroopMemberInfo() {
+        Class<?> clazz = load("com.tencent.mobileqq.data.troop.TroopMemberInfo");
+        if (clazz == null) clazz = load("com.tencent.mobileqq.data.TroopMemberInfo");
+        return clazz;
+    }
+
     public static Class _Conversation() {
         Class<?> clazz = load("com/tencent/mobileqq/activity/home/Conversation");
         if (clazz == null) clazz = load("com/tencent/mobileqq/activity/Conversation");