fix:证书首次安装

Author: darkal

app/src/main/java/cn/darkal/networkdiagnosis/Activity/MainActivity.java

@@ -6,9 +6,11 @@
 import android.animation.ObjectAnimator;
 import android.app.Activity;
 import android.app.SearchManager;
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Build;
@@ -110,6 +112,8 @@ public class MainActivity extends AppCompatActivity implements BackHandledInterf
     private BaseFragment mBackHandedFragment;
     private long exitTime = 0;
 
+    private Receiver receiver;
+
     @BindView(R.id.fl_contain)
     public View rootView;
 
@@ -151,8 +155,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
         shp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
 
-        installCert();
-
         setContentView(R.layout.activity_main);
 
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
@@ -161,7 +163,6 @@ protected void onCreate(Bundle savedInstanceState) {
         ButterKnife.bind(this);
         initFloatingActionMenu();
 
-
         OnGlobalLayoutListener globalLayoutListener = new OnGlobalLayoutListener(rootView);
         rootView.getViewTreeObserver().addOnGlobalLayoutListener(globalLayoutListener);
 
@@ -583,9 +584,25 @@ protected void onNewIntent(Intent intent) {
     @Override
     protected void onStart() {
         super.onStart();
+        receiver = new Receiver();
+        registerReceiver(receiver, new IntentFilter("proxyfinished"));
         handleUriStartupParams();
     }
 
+    @Override
+    protected void onStop() {
+        unregisterReceiver(receiver);
+        super.onStop();
+    }
+
+    public class Receiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            installCert();
+            Log.i("~~~~", "Receiver installCert");
+        }
+    }
+
     /**
      * 启动的时候根据bundle参数决定切换到哪个tab
      */

app/src/main/java/cn/darkal/networkdiagnosis/Activity/SettingsActivity.java

@@ -4,50 +4,32 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
 import android.content.res.Configuration;
-import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.provider.Settings;
 import android.security.KeyChain;
-import android.support.design.widget.Snackbar;
 import android.support.v7.app.ActionBar;
-import android.util.Log;
 import android.view.MenuItem;
 import android.widget.Toast;
 
-import com.tencent.bugly.Bugly;
 import com.tencent.bugly.beta.Beta;
 
 import net.lightbody.bmp.BrowserMobProxy;
 import net.lightbody.bmp.proxy.dns.AdvancedHostResolver;
 
-import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
 
-import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
 
 import cn.darkal.networkdiagnosis.R;
 import cn.darkal.networkdiagnosis.SysApplication;
 import cn.darkal.networkdiagnosis.Utils.DeviceUtils;
-import cn.darkal.networkdiagnosis.Utils.FileUtil;
 import cn.darkal.networkdiagnosis.Utils.SharedPreferenceUtils;
 import cn.darkal.networkdiagnosis.View.LoadingDialog;
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
 
 /**
  * A {@link PreferenceActivity} that presents a set of application settings. On
@@ -181,9 +163,14 @@ public void installCert() {
         Toast.makeText(this, "必须安装证书才可实现HTTPS抓包", Toast.LENGTH_LONG).show();
         try {
             byte[] keychainBytes;
-            InputStream bis = MainActivity.class.getResourceAsStream(CERTIFICATE_RESOURCE);
-            keychainBytes = new byte[bis.available()];
-            bis.read(keychainBytes);
+            FileInputStream is = null;
+            try {
+                is = new FileInputStream(CERTIFICATE_RESOURCE);
+                keychainBytes = new byte[is.available()];
+                is.read(keychainBytes);
+            } finally {
+                IOUtils.closeQuietly(is);
+            }
 
             Intent intent = KeyChain.createInstallIntent();
             intent.putExtra(KeyChain.EXTRA_CERTIFICATE, keychainBytes);