From c7e77270e86bac8dd41e39cf07e8f9fcae1bd463 Mon Sep 17 00:00:00 2001 From: gunaonian Date: Wed, 13 Jan 2021 11:15:27 +0800 Subject: [PATCH] update 2.0.0 --- .idea/inspectionProfiles/Project_Default.xml | 68 +++++++++++++++++++ .idea/misc.xml | 4 ++ README.md | 7 -- .../httpcanary/preview/PreviewActivity.java | 8 ++- .../httpcanary/preview/PreviewAdapter.java | 8 ++- .../httpcanary/preview/SettingActivity.java | 1 + .../httpcanary/util/SystemCertsUtils.java | 2 - .../res/layout/http_canary_item_preview.xml | 6 +- 8 files changed, 89 insertions(+), 15 deletions(-) diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index 5749e8f..ccb2129 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -60,6 +60,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -101,11 +163,13 @@ + + @@ -117,6 +181,10 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index d5d35ec..d513d83 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,9 @@ + + + + diff --git a/README.md b/README.md index d651505..bd160a4 100644 --- a/README.md +++ b/README.md @@ -13,13 +13,6 @@
-# 效果展示 - -![http_logo](./img/img1.jpg) - -![http_logo](./img/img2.jpg) - - # 依赖 ```gradle diff --git a/httpcanary-androidx/src/main/java/fairy/easy/httpcanary/preview/PreviewActivity.java b/httpcanary-androidx/src/main/java/fairy/easy/httpcanary/preview/PreviewActivity.java index 706742e..e2fb5e6 100644 --- a/httpcanary-androidx/src/main/java/fairy/easy/httpcanary/preview/PreviewActivity.java +++ b/httpcanary-androidx/src/main/java/fairy/easy/httpcanary/preview/PreviewActivity.java @@ -72,10 +72,12 @@ public void run() { }); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) { Application app = (Application) getApplicationContext(); - app.registerActivityLifecycleCallbacks(new LifecycleCallbacksUtils()); + app.registerActivityLifecycleCallbacks(lifecycleCallbacks); } } + private final Application.ActivityLifecycleCallbacks lifecycleCallbacks = new LifecycleCallbacksUtils(); + public void notifyHarChange() { if (previewAdapter != null) { previewAdapter.notifyHarChange(); @@ -85,6 +87,10 @@ public void notifyHarChange() { @Override protected void onDestroy() { super.onDestroy(); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) { + Application app = (Application) getApplicationContext(); + app.unregisterActivityLifecycleCallbacks(lifecycleCallbacks); + } new Thread(new Runnable() { @Override public void run() { diff --git a/httpcanary-androidx/src/main/java/fairy/easy/httpcanary/preview/PreviewAdapter.java b/httpcanary-androidx/src/main/java/fairy/easy/httpcanary/preview/PreviewAdapter.java index 078e52d..49f81f3 100644 --- a/httpcanary-androidx/src/main/java/fairy/easy/httpcanary/preview/PreviewAdapter.java +++ b/httpcanary-androidx/src/main/java/fairy/easy/httpcanary/preview/PreviewAdapter.java @@ -87,10 +87,14 @@ public View getView(int position, View convertView, ViewGroup parent) { holder.name.setText(harEntry.getPort2PackageName().getAppName()); holder.iconView.setImageDrawable(harEntry.getPort2PackageName().getIcon()); } else { - holder.name.setText("Unknown"); + holder.name.setText("Unknown APP"); holder.iconView.setImageDrawable(mContext.getResources().getDrawable(R.drawable.http_canary_ic_error_black_24dp)); } - if (harEntry.getResponse().getContent().getMimeType().contains("image")) { + if (harEntry.getResponse().getStatus() > 400) { + holder.imageViewTitle.setImageDrawable(mContext.getResources().getDrawable(R.drawable.http_canary_ic_error_black_24dp)); + } else if (harEntry.getResponse().getStatus() > 300) { + holder.imageViewTitle.setImageDrawable(mContext.getResources().getDrawable(R.drawable.http_canary_ic_directions_black_24dp)); + } else if (harEntry.getResponse().getContent().getMimeType().contains("image")) { holder.imageViewTitle.setImageDrawable(mContext.getResources().getDrawable(R.drawable.http_canary_ic_photo_black_24dp)); } else { holder.imageViewTitle.setImageDrawable(mContext.getResources().getDrawable(R.drawable.http_canary_ic_description_black_24dp)); diff --git a/httpcanary-androidx/src/main/java/fairy/easy/httpcanary/preview/SettingActivity.java b/httpcanary-androidx/src/main/java/fairy/easy/httpcanary/preview/SettingActivity.java index 970dcec..0592760 100644 --- a/httpcanary-androidx/src/main/java/fairy/easy/httpcanary/preview/SettingActivity.java +++ b/httpcanary-androidx/src/main/java/fairy/easy/httpcanary/preview/SettingActivity.java @@ -135,6 +135,7 @@ public void run() { @Override public void onClick(View v) { startActivity(new Intent(getApplicationContext(), PreviewActivity.class)); + finish(); } }); } diff --git a/httpcanary-androidx/src/main/java/fairy/easy/httpcanary/util/SystemCertsUtils.java b/httpcanary-androidx/src/main/java/fairy/easy/httpcanary/util/SystemCertsUtils.java index 5fd8a65..62b0f52 100644 --- a/httpcanary-androidx/src/main/java/fairy/easy/httpcanary/util/SystemCertsUtils.java +++ b/httpcanary-androidx/src/main/java/fairy/easy/httpcanary/util/SystemCertsUtils.java @@ -16,7 +16,6 @@ public static boolean buildSystemCerts(Context context) { // if (!copy) { // return false; // } -// Log.e("SSSS","copy success"); return prepareRoot(context); } @@ -79,7 +78,6 @@ private static boolean prepareRoot(Context context) { cmd = "mount " + fakeCertDir + " /system/etc/security/cacerts/;exit"; } // "mount /storage/emulated/0/fairyhttpcanary/cacerts/ /system/etc/security/cacerts/" - Log.e("SSSSSSS", cmd); CommandUtils.getSingleInstance().exec(cmd, true); return true; } diff --git a/httpcanary-androidx/src/main/res/layout/http_canary_item_preview.xml b/httpcanary-androidx/src/main/res/layout/http_canary_item_preview.xml index f83c36d..2a1ee85 100755 --- a/httpcanary-androidx/src/main/res/layout/http_canary_item_preview.xml +++ b/httpcanary-androidx/src/main/res/layout/http_canary_item_preview.xml @@ -33,13 +33,13 @@ android:id="@+id/http_canary_tv_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="#000000" + android:textColor="#FF0505" android:textSize="16sp" />