Add try catch in MainActivity onNewIntent()

darkal · darkal · commit 8814bfb57573 · 2016-10-18T16:25:44.000+08:00
Solve NullPointException in setProxy()
diff --git a/README.md b/README.md
@@ -50,16 +50,14 @@ schema的协议格式为：jdhttpmonitor://webview?param={'url'='http://www.baid
 AndroidHttpCapture基于Netty、browsermob-proxy来实现核心抓包的功能<br>
 Netty is an asynchronous event-driven network application framework for rapid development of maintainable high performance protocol servers & clients.<br>
 https://github.com/netty/netty<br>
-由于Aandroid5.0+不支持Provider 为JKS的证书，所以逆向修改了Netty库的证书部分适配Android系统（netty_android.jar）<br><br>
+由于Android5.0+不支持Provider 为JKS的证书，所以逆向修改了Netty库的证书部分适配Android系统（netty_android.jar）<br><br>
 
 A free utility to help web developers watch and manipulate network traffic from their AJAX applications.<br>
 https://github.com/lightbody/browsermob-proxy<br>
 修改了多处browsermob-proxy的源码适配Android系统<br>
 ####目前遗留了一个Bug：信任所有的服务器证书不做校验<br><br>
 
-四．License<br>
-MIT License
-
+MIT License<br>
 Copyright (c) 2016 AndroidHttpCapture
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/app/build.gradle b/app/build.gradle
@@ -25,8 +25,8 @@ android {
         applicationId "cn.darkal.networkdiagnosis"
         minSdkVersion 14
         targetSdkVersion 22
-        versionCode 17
-        versionName "2.4.17"
+        versionCode 18
+        versionName "2.4.18"
         // Enabling multidex support.
         multiDexEnabled true
         resConfigs "zh"
diff --git a/app/src/main/java/cn/darkal/networkdiagnosis/Activity/MainActivity.java b/app/src/main/java/cn/darkal/networkdiagnosis/Activity/MainActivity.java
@@ -9,7 +9,6 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -58,7 +57,6 @@
 import org.json.JSONObject;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -76,7 +74,6 @@
 import cn.darkal.networkdiagnosis.Fragment.BackHandledInterface;
 import cn.darkal.networkdiagnosis.Fragment.NetworkFragment;
 import cn.darkal.networkdiagnosis.Fragment.PreviewFragment;
-import cn.darkal.networkdiagnosis.Fragment.PreviewFragment_ViewBinder;
 import cn.darkal.networkdiagnosis.Fragment.WebViewFragment;
 import cn.darkal.networkdiagnosis.R;
 import cn.darkal.networkdiagnosis.SysApplication;
@@ -548,10 +545,14 @@ public void onGlobalLayout() {
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        setIntent(intent);
-        handleUriStartupParams();
-        if (intent.getAction().equals("android.intent.action.SEARCH")) {
-            switchContent(PreviewFragment.getInstance());
+        try {
+            setIntent(intent);
+            handleUriStartupParams();
+            if (intent.getAction().equals("android.intent.action.SEARCH")) {
+                switchContent(PreviewFragment.getInstance());
+            }
+        }catch (Exception e){
+            e.printStackTrace();
         }
     }
 
diff --git a/app/src/main/java/cn/darkal/networkdiagnosis/Utils/ProxyUtils.java b/app/src/main/java/cn/darkal/networkdiagnosis/Utils/ProxyUtils.java
@@ -35,7 +35,7 @@ public static boolean setProxy(WebView webview, String host, int port) {
         } else if (sdkInt < Build.VERSION_CODES.LOLLIPOP) {
             return setProxyKK(webview, host, port, "android.app.Application");
         } else {
-            return setProxyLollipop(webview.getContext(), host, port);
+            return webview.getContext() != null && setProxyLollipop(webview.getContext(), host, port);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public static boolean setProxy(WebView webview, String host, int port) {`
`35`	`35`	`} else if (sdkInt < Build.VERSION_CODES.LOLLIPOP) {`
`36`	`36`	`return setProxyKK(webview, host, port, "android.app.Application");`
`37`	`37`	`} else {`
`38`		`- return setProxyLollipop(webview.getContext(), host, port);`
	`38`	`+ return webview.getContext() != null && setProxyLollipop(webview.getContext(), host, port);`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`