netspylib-isNetSpy

zhxhcoder · zhxhcoder · commit ac8021c7afda · 2019-06-24T09:56:10.000+08:00
diff --git a/app/src/main/java/com/zhxh/coroutines/model/KotlinNetService.kt b/app/src/main/java/com/zhxh/coroutines/model/KotlinNetService.kt
@@ -15,7 +15,7 @@ class KotlinNetService : BaseNetService() {
     }
 
     override fun getInterceptorList(): List<Interceptor> {
-        return listOf(NetSpyInterceptor(BaseApplication.instance), StethoInterceptor())
+        return listOf(NetSpyInterceptor(BaseApplication.instance, true), StethoInterceptor())
     }
 
     override val baseUrl: String
diff --git a/app/src/main/java/com/zhxh/coroutines/ui/netspy/MainNetSpyActivity.java b/app/src/main/java/com/zhxh/coroutines/ui/netspy/MainNetSpyActivity.java
@@ -40,14 +40,14 @@ public void onClick(View view) {
     private OkHttpClient getClient(Context context) {
         return new OkHttpClient.Builder()
                 // Add a NetSpyInterceptor instance to your OkHttp client
-                .addInterceptor(new NetSpyInterceptor(context))
+                .addInterceptor(new NetSpyInterceptor(context, true))
                 .addInterceptor(new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY))
                 .build();
     }
 
     private void launchNetSpyDirectly() {
         // Optionally launch NetSpy directly from your own app UI
-        startActivity(NetSpy.getLaunchIntent(this, true));
+        startActivity(NetSpy.getLaunchIntent(this));
     }
 
     private void doHttpActivity() {
diff --git a/netspylib/src/main/java/com/creditease/netspy/NetSpy.java b/netspylib/src/main/java/com/creditease/netspy/NetSpy.java
@@ -11,8 +11,8 @@
  */
 public class NetSpy {
 
-    public static Intent getLaunchIntent(Context context, boolean isSpy) {
-        if (isSpy) {
+    public static Intent getLaunchIntent(Context context) {
+        if (NetSpyInterceptor.isNetSpy) {
             return new Intent(context, NetSpyHomeActivity.class).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         } else {
             return new Intent();
diff --git a/netspylib/src/main/java/com/creditease/netspy/NetSpyInterceptor.java b/netspylib/src/main/java/com/creditease/netspy/NetSpyInterceptor.java
@@ -66,10 +66,13 @@ public enum Period {
     private boolean showNotification;
     private long maxContentLength = 250000L;
 
+    static boolean isNetSpy;
+
     /**
      * @param context The current Context.
      */
-    public NetSpyInterceptor(Context context) {
+    public NetSpyInterceptor(Context context, boolean isNetSpy) {
+        NetSpyInterceptor.isNetSpy = isNetSpy;
         this.context = context.getApplicationContext();
         notificationHelper = new NotificationHelper(this.context);
         showNotification = true;
@@ -113,6 +116,12 @@ public NetSpyInterceptor retainDataFor(Period period) {
 
     @Override
     public Response intercept(Chain chain) throws IOException {
+
+        if (!isNetSpy) {
+            Request request = chain.request();
+            return chain.proceed(request);
+        }
+
         Request request = chain.request();
 
         RequestBody requestBody = request.body();
@@ -254,8 +263,8 @@ private boolean isPlaintext(Buffer buffer) {
     private boolean bodyHasUnsupportedEncoding(Headers headers) {
         String contentEncoding = headers.get("Content-Encoding");
         return contentEncoding != null &&
-            !contentEncoding.equalsIgnoreCase("identity") &&
-            !contentEncoding.equalsIgnoreCase("gzip");
+                !contentEncoding.equalsIgnoreCase("identity") &&
+                !contentEncoding.equalsIgnoreCase("gzip");
     }
 
     private boolean bodyGzipped(Headers headers) {

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class KotlinNetService : BaseNetService() {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`override fun getInterceptorList(): List<Interceptor> {`
`18`		`- return listOf(NetSpyInterceptor(BaseApplication.instance), StethoInterceptor())`
	`18`	`+ return listOf(NetSpyInterceptor(BaseApplication.instance, true), StethoInterceptor())`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`override val baseUrl: String`