fix umeng bug

eritpchy · eritpchy · commit d0681d20a87e · 2017-11-12T17:51:47.000+08:00
diff --git a/app/src/main/java/com/yyxx/wechatfp/activity/HomeActivity.java b/app/src/main/java/com/yyxx/wechatfp/activity/HomeActivity.java
@@ -19,6 +19,7 @@
 import com.yyxx.wechatfp.util.Task;
 import com.yyxx.wechatfp.util.Umeng;
 import com.yyxx.wechatfp.util.UrlUtil;
+import com.yyxx.wechatfp.util.bugfixer.TagManagerBugFixer;
 import com.yyxx.wechatfp.view.DonateView;
 
 import java.util.ArrayList;
@@ -55,6 +56,7 @@ public void onCreate(Bundle savedInstanceState) {
         listView.setAdapter(mListAdapter);
         listView.setOnItemClickListener(this);
         Task.onMain(1000L, () -> UpdateFactory.doUpdateCheck(HomeActivity.this));
+        TagManagerBugFixer.fix();
     }
 
     @Override
diff --git a/app/src/main/java/com/yyxx/wechatfp/util/Umeng.java b/app/src/main/java/com/yyxx/wechatfp/util/Umeng.java
@@ -16,7 +16,7 @@ public class Umeng {
     public static void init(Context context) {
         sContext = context;
         try {
-            MobclickAgent.startWithConfigure(new MobclickAgent.UMAnalyticsConfig(context.getApplicationContext(), "59b68c81f5ade45de90004f7", "UM"));
+            MobclickAgent.startWithConfigure(new MobclickAgent.UMAnalyticsConfig(context.getApplicationContext(), "59b68c81f5ade45de90004f7", context.getPackageName()));
         } catch (Exception e) {
             L.e(e);
         }
diff --git a/app/src/main/java/com/yyxx/wechatfp/util/bugfixer/TagManagerBugFixer.java b/app/src/main/java/com/yyxx/wechatfp/util/bugfixer/TagManagerBugFixer.java
@@ -0,0 +1,39 @@
+package com.yyxx.wechatfp.util.bugfixer;
+
+/**
+ * Created by Jason on 2017/11/12.
+ */
+
+public class TagManagerBugFixer {
+
+    public static void fix() {
+        // for catching app global unhandled exceptions
+        final Thread.UncaughtExceptionHandler defaultHandler = Thread.getDefaultUncaughtExceptionHandler();
+        Thread.setDefaultUncaughtExceptionHandler(new MyHandler(defaultHandler));
+    }
+
+    private static class MyHandler implements Thread.UncaughtExceptionHandler {
+
+        private final Thread.UncaughtExceptionHandler defaultHandler;
+
+        MyHandler(Thread.UncaughtExceptionHandler defaultHandler) {
+            this.defaultHandler = defaultHandler;
+        }
+
+        @Override
+        public void uncaughtException(Thread thread, Throwable ex) {
+            String classpath = null;
+            if (ex != null && ex.getStackTrace().length > 0) {
+                classpath = ex.getStackTrace()[0].toString();
+            }
+            if (classpath != null &&
+                    ex.getMessage().contains("Results have already been set") &&
+                    classpath.contains("com.google.android.gms.tagmanager") ) {
+                // ignore
+            } else {
+                // run your default handler
+                defaultHandler.uncaughtException(thread, ex);
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/yyxx/wechatfp/util/bugfixer/xposed/XposedLogNPEBugFixer.java b/app/src/main/java/com/yyxx/wechatfp/util/bugfixer/xposed/XposedLogNPEBugFixer.java
@@ -0,0 +1,45 @@
+package com.yyxx.wechatfp.util.bugfixer.xposed;
+
+import com.yyxx.wechatfp.util.log.L;
+
+import de.robv.android.xposed.XC_MethodHook;
+import de.robv.android.xposed.XposedBridge;
+import de.robv.android.xposed.XposedHelpers;
+
+/**
+ * Created by Jason on 2017/11/12.
+ */
+
+public class XposedLogNPEBugFixer {
+
+    /**
+     *
+     java.lang.NullPointerException: println needs a message
+     at android.util.Log.println_native(Native Method)
+     at android.util.Log.i(Log.java:160)
+     at de.robv.android.xposed.XposedBridge.log(XposedBridge.java:147)
+     at com.fkzhang.qqxposedhooks.h.j$b.ʻ(Unknown Source)
+     at com.fkzhang.qqxposedhooks.h.j$b.ʻ(Unknown Source)
+     at com.fkzhang.qqxposedhooks.h.j$b.doInBackground(Unknown Source)
+     at android.os.AsyncTask$2.call(AsyncTask.java:295)
+     at java.util.concurrent.FutureTask.run(FutureTask.java:237)
+     at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1113)
+     at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:588)
+     at java.lang.Thread.run(Thread.java:818)
+     */
+    public static void fix() {
+        try {
+            XposedHelpers.findAndHookMethod(XposedBridge.class, "log", String.class, new XC_MethodHook() {
+                @Override
+                protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
+                    if (param.args[0] == null) {
+                        param.args[0] = "xx";
+                    }
+                    super.beforeHookedMethod(param);
+                }
+            });
+        } catch (Exception e) {
+            L.e(e);
+        }
+    }
+}
diff --git a/app/src/main/java/com/yyxx/wechatfp/xposed/plugin/XposedAlipayPlugin.java b/app/src/main/java/com/yyxx/wechatfp/xposed/plugin/XposedAlipayPlugin.java
@@ -31,9 +31,9 @@
 import com.yyxx.wechatfp.util.ImageUtil;
 import com.yyxx.wechatfp.util.StyleUtil;
 import com.yyxx.wechatfp.util.Task;
-import com.yyxx.wechatfp.util.Tools;
 import com.yyxx.wechatfp.util.Umeng;
 import com.yyxx.wechatfp.util.ViewUtil;
+import com.yyxx.wechatfp.util.bugfixer.xposed.XposedLogNPEBugFixer;
 import com.yyxx.wechatfp.util.log.L;
 import com.yyxx.wechatfp.view.SettingsView;
 
@@ -65,6 +65,7 @@ public void main(final Context context, final XC_LoadPackage.LoadPackageParam lp
         L.d("Xposed plugin init version: " + BuildConfig.VERSION_NAME);
         try {
             Umeng.init(context);
+            XposedLogNPEBugFixer.fix();
             final PackageInfo packageInfo = context.getPackageManager().getPackageInfo(lpparam.packageName, 0);
             final int versionCode = packageInfo.versionCode;
             String versionName = packageInfo.versionName;
@@ -449,21 +450,11 @@ private boolean tryInputGenericPassword(Activity activity, String password) {
         EditText pwdEditText = findPasswordEditText(activity);
         L.d("pwdEditText", pwdEditText);
         if (pwdEditText == null) {
-            ViewGroup rootView = (ViewGroup) activity.getWindow().getDecorView();
-            List<View> outList = new ArrayList<>();
-            ViewUtil.getChildViews(rootView, outList);
-            Tools.doUnSupportVersionUpload(rootView.getContext(), "[Alipay pwdEditText NOT FOUND]  " + ViewUtil.viewsDesc(outList));
+            return false;
         }
         View confirmPwdBtn = findConfirmPasswordBtn(activity);
         L.d("confirmPwdBtn", confirmPwdBtn);
         if (confirmPwdBtn == null) {
-            ViewGroup rootView = (ViewGroup) activity.getWindow().getDecorView();
-            List<View> outList = new ArrayList<>();
-            ViewUtil.getChildViews(rootView, outList);
-            Tools.doUnSupportVersionUpload(rootView.getContext(), "[Alipay confirmPwdBtn NOT FOUND]  " + ViewUtil.viewsDesc(outList));
-            return false;
-        }
-        if (pwdEditText == null) {
             return false;
         }
         pwdEditText.setText(password);
diff --git a/app/src/main/java/com/yyxx/wechatfp/xposed/plugin/XposedQQPlugin.java b/app/src/main/java/com/yyxx/wechatfp/xposed/plugin/XposedQQPlugin.java
@@ -38,6 +38,7 @@
 import com.yyxx.wechatfp.util.Tools;
 import com.yyxx.wechatfp.util.Umeng;
 import com.yyxx.wechatfp.util.ViewUtil;
+import com.yyxx.wechatfp.util.bugfixer.xposed.XposedLogNPEBugFixer;
 import com.yyxx.wechatfp.util.log.L;
 import com.yyxx.wechatfp.view.SettingsView;
 
@@ -91,6 +92,7 @@ public void main(final Context context, final XC_LoadPackage.LoadPackageParam lp
             Task.onMain(1000, ()-> {
                 Umeng.init(context);
             });
+            XposedLogNPEBugFixer.fix();
             final PackageInfo packageInfo = context.getPackageManager().getPackageInfo(lpparam.packageName, 0);
             final int versionCode = packageInfo.versionCode;
             String versionName = packageInfo.versionName;
diff --git a/app/src/main/java/com/yyxx/wechatfp/xposed/plugin/XposedTaobaoPlugin.java b/app/src/main/java/com/yyxx/wechatfp/xposed/plugin/XposedTaobaoPlugin.java
@@ -32,9 +32,9 @@
 import com.yyxx.wechatfp.util.ImageUtil;
 import com.yyxx.wechatfp.util.StyleUtil;
 import com.yyxx.wechatfp.util.Task;
-import com.yyxx.wechatfp.util.Tools;
 import com.yyxx.wechatfp.util.Umeng;
 import com.yyxx.wechatfp.util.ViewUtil;
+import com.yyxx.wechatfp.util.bugfixer.xposed.XposedLogNPEBugFixer;
 import com.yyxx.wechatfp.util.log.L;
 import com.yyxx.wechatfp.view.SettingsView;
 
@@ -71,6 +71,7 @@ public void main(final Context context, final XC_LoadPackage.LoadPackageParam lp
         L.d("Xposed plugin init version: " + BuildConfig.VERSION_NAME);
         try {
             Umeng.init(context);
+            XposedLogNPEBugFixer.fix();
             final PackageInfo packageInfo = context.getPackageManager().getPackageInfo(lpparam.packageName, 0);
             final int versionCode = packageInfo.versionCode;
             String versionName = packageInfo.versionName;
@@ -488,19 +489,11 @@ private boolean tryInputGenericPassword(Activity activity, String password) {
         EditText pwdEditText = findPasswordEditText(activity);
         L.d("pwdEditText", pwdEditText);
         if (pwdEditText == null) {
-            List<View> outList = new ArrayList<>();
-            ViewUtil.getChildViews((ViewGroup) activity.getWindow().getDecorView(), outList);
-            Tools.doUnSupportVersionUpload(activity, "[Taobao confirmPwdBtn NOT FOUND]  " + ViewUtil.viewsDesc(outList));
+            return false;
         }
         View confirmPwdBtn = findConfirmPasswordBtn(activity);
         L.d("confirmPwdBtn", confirmPwdBtn);
         if (confirmPwdBtn == null) {
-            List<View> outList = new ArrayList<>();
-            ViewUtil.getChildViews((ViewGroup) activity.getWindow().getDecorView(), outList);
-            Tools.doUnSupportVersionUpload(activity, "[Taobao confirmPwdBtn NOT FOUND]  " + ViewUtil.viewsDesc(outList));
-            return false;
-        }
-        if (pwdEditText == null) {
             return false;
         }
         pwdEditText.setText(password);
diff --git a/app/src/main/java/com/yyxx/wechatfp/xposed/plugin/XposedWeChatPlugin.java b/app/src/main/java/com/yyxx/wechatfp/xposed/plugin/XposedWeChatPlugin.java
@@ -42,6 +42,7 @@
 import com.yyxx.wechatfp.util.Tools;
 import com.yyxx.wechatfp.util.Umeng;
 import com.yyxx.wechatfp.util.ViewUtil;
+import com.yyxx.wechatfp.util.bugfixer.xposed.XposedLogNPEBugFixer;
 import com.yyxx.wechatfp.util.log.L;
 import com.yyxx.wechatfp.view.SettingsView;
 
@@ -69,6 +70,7 @@ public void main(final Context context, final XC_LoadPackage.LoadPackageParam lp
         L.d("Xposed plugin init version: " + BuildConfig.VERSION_NAME);
         try {
             Umeng.init(context);
+            XposedLogNPEBugFixer.fix();
             //for multi user
             if (!Tools.isCurrentUserOwner(context)) {
                 XposedHelpers.findAndHookMethod(UserHandle.class, "myUserId", new XC_MethodHook() {

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public class Umeng {`
`16`	`16`	`public static void init(Context context) {`
`17`	`17`	`sContext = context;`
`18`	`18`	`try {`
`19`		`- MobclickAgent.startWithConfigure(new MobclickAgent.UMAnalyticsConfig(context.getApplicationContext(), "59b68c81f5ade45de90004f7", "UM"));`
	`19`	`+ MobclickAgent.startWithConfigure(new MobclickAgent.UMAnalyticsConfig(context.getApplicationContext(), "59b68c81f5ade45de90004f7", context.getPackageName()));`
`20`	`20`	`} catch (Exception e) {`
`21`	`21`	`L.e(e);`
`22`	`22`	`}`