update 2.0.0

guxiaonian · Jan 13, 2021 · f86acc4 · f86acc4
1 parent c7e7727
commit f86acc4
Show file tree

Hide file tree

Showing 164 changed files with 8 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,9 @@
 *.iml
 .gradle
 /local.properties
-/.idea
+.idea
 .DS_Store
 /build
 /captures
 .externalNativeBuild
 .cxx
-/httpcanary
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@
 # 依赖
 
 ```gradle
-debugImplementation  'fairy.easy.httpcanary:httpcanary-androidx:{latestVersion}'
+debugImplementation  'fairy.easy.httpcanary:httpcanary:{latestVersion}'
 ```
 
 # 注意事项

diff --git a/app/build.gradle b/app/build.gradle
@@ -26,7 +26,7 @@ dependencies {
 //    implementation 'com.android.support:appcompat-v7:28.0.0'
 //    implementation project(path: ':httpcanary')
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation project(path: ':httpcanary-androidx')
+    implementation project(path: ':httpcanary')
     implementation 'com.squareup.okhttp3:okhttp:3.12.0'
     implementation 'com.android.volley:volley:1.1.1'
 }
diff --git a/httpcanary-androidx/.gitignore → httpcanary/.gitignore b/httpcanary-androidx/.gitignore → httpcanary/.gitignore
diff --git a/httpcanary-androidx/build.gradle → httpcanary/build.gradle b/httpcanary-androidx/build.gradle → httpcanary/build.gradle
@@ -102,7 +102,7 @@ bintray {
     configurations = ['archives']
     pkg {
         repo = "httpcanary"
-        name = "httpcanaryAndroidX"
+        name = "httpcanary"
         websiteUrl = siteUrl
         vcsUrl = gitUrl
         licenses = ["Apache-2.0"]

diff --git a/httpcanary-androidx/consumer-rules.pro → httpcanary/consumer-rules.pro b/httpcanary-androidx/consumer-rules.pro → httpcanary/consumer-rules.pro
diff --git a/...x/libs/netty-all-android-4.0.44.Final.jar → ...y/libs/netty-all-android-4.0.44.Final.jar b/...x/libs/netty-all-android-4.0.44.Final.jar → ...y/libs/netty-all-android-4.0.44.Final.jar
diff --git a/httpcanary-androidx/proguard-rules.pro → httpcanary/proguard-rules.pro b/httpcanary-androidx/proguard-rules.pro → httpcanary/proguard-rules.pro
diff --git a/...ary-androidx/src/main/AndroidManifest.xml → httpcanary/src/main/AndroidManifest.xml b/...ary-androidx/src/main/AndroidManifest.xml → httpcanary/src/main/AndroidManifest.xml
diff --git a/.../fairy/easy/httpcanary/AbstractParam.java → .../fairy/easy/httpcanary/AbstractParam.java b/.../fairy/easy/httpcanary/AbstractParam.java → .../fairy/easy/httpcanary/AbstractParam.java
diff --git a/...ava/fairy/easy/httpcanary/HttpCanary.java → ...ava/fairy/easy/httpcanary/HttpCanary.java b/...ava/fairy/easy/httpcanary/HttpCanary.java → ...ava/fairy/easy/httpcanary/HttpCanary.java
diff --git a/...ry/easy/httpcanary/HttpCanaryFactory.java → ...ry/easy/httpcanary/HttpCanaryFactory.java b/...ry/easy/httpcanary/HttpCanaryFactory.java → ...ry/easy/httpcanary/HttpCanaryFactory.java
diff --git a/.../java/fairy/easy/httpcanary/HttpData.java → .../java/fairy/easy/httpcanary/HttpData.java b/.../java/fairy/easy/httpcanary/HttpData.java → .../java/fairy/easy/httpcanary/HttpData.java
diff --git a/...java/fairy/easy/httpcanary/HttpModel.java → ...java/fairy/easy/httpcanary/HttpModel.java b/...java/fairy/easy/httpcanary/HttpModel.java → ...java/fairy/easy/httpcanary/HttpModel.java
diff --git a/...a/fairy/easy/httpcanary/HttpProvider.java → ...a/fairy/easy/httpcanary/HttpProvider.java b/...a/fairy/easy/httpcanary/HttpProvider.java → ...a/fairy/easy/httpcanary/HttpProvider.java
diff --git a/...airy/easy/httpcanary/ThreadPoolUtils.java → ...airy/easy/httpcanary/ThreadPoolUtils.java b/...airy/easy/httpcanary/ThreadPoolUtils.java → ...airy/easy/httpcanary/ThreadPoolUtils.java
diff --git a/...httpcanary/preview/HarDetailActivity.java → ...httpcanary/preview/HarDetailActivity.java b/...httpcanary/preview/HarDetailActivity.java → ...httpcanary/preview/HarDetailActivity.java
diff --git a/...y/httpcanary/preview/PreviewActivity.java → ...y/httpcanary/preview/PreviewActivity.java b/...y/httpcanary/preview/PreviewActivity.java → ...y/httpcanary/preview/PreviewActivity.java
diff --git a/...sy/httpcanary/preview/PreviewAdapter.java → ...sy/httpcanary/preview/PreviewAdapter.java b/...sy/httpcanary/preview/PreviewAdapter.java → ...sy/httpcanary/preview/PreviewAdapter.java
diff --git a/...y/httpcanary/preview/SettingActivity.java → ...y/httpcanary/preview/SettingActivity.java b/...y/httpcanary/preview/SettingActivity.java → ...y/httpcanary/preview/SettingActivity.java
diff --git a/...ry/easy/httpcanary/util/CommandUtils.java → ...ry/easy/httpcanary/util/CommandUtils.java b/...ry/easy/httpcanary/util/CommandUtils.java → ...ry/easy/httpcanary/util/CommandUtils.java
diff --git a/...pcanary/util/LifecycleCallbacksUtils.java → ...pcanary/util/LifecycleCallbacksUtils.java b/...pcanary/util/LifecycleCallbacksUtils.java → ...pcanary/util/LifecycleCallbacksUtils.java
diff --git a/...iry/easy/httpcanary/util/PackageBean.java → ...iry/easy/httpcanary/util/PackageBean.java b/...iry/easy/httpcanary/util/PackageBean.java → ...iry/easy/httpcanary/util/PackageBean.java
diff --git a/...ry/easy/httpcanary/util/PackageUtils.java → ...ry/easy/httpcanary/util/PackageUtils.java b/...ry/easy/httpcanary/util/PackageUtils.java → ...ry/easy/httpcanary/util/PackageUtils.java
diff --git a/...asy/httpcanary/util/PermissionsUtils.java → ...asy/httpcanary/util/PermissionsUtils.java b/...asy/httpcanary/util/PermissionsUtils.java → ...asy/httpcanary/util/PermissionsUtils.java
diff --git a/...airy/easy/httpcanary/util/ProxyUtils.java → ...airy/easy/httpcanary/util/ProxyUtils.java b/...airy/easy/httpcanary/util/ProxyUtils.java → ...airy/easy/httpcanary/util/ProxyUtils.java
diff --git a/...y/easy/httpcanary/util/SettingConfig.java → ...y/easy/httpcanary/util/SettingConfig.java b/...y/easy/httpcanary/util/SettingConfig.java → ...y/easy/httpcanary/util/SettingConfig.java
diff --git a/...tpcanary/util/SharedPreferencesUtils.java → ...tpcanary/util/SharedPreferencesUtils.java b/...tpcanary/util/SharedPreferencesUtils.java → ...tpcanary/util/SharedPreferencesUtils.java
diff --git a/...asy/httpcanary/util/SystemCertsUtils.java → ...asy/httpcanary/util/SystemCertsUtils.java b/...asy/httpcanary/util/SystemCertsUtils.java → ...asy/httpcanary/util/SystemCertsUtils.java
diff --git a/...va/net/lightbody/bmp/BrowserMobProxy.java → ...va/net/lightbody/bmp/BrowserMobProxy.java b/...va/net/lightbody/bmp/BrowserMobProxy.java → ...va/net/lightbody/bmp/BrowserMobProxy.java
diff --git a/.../lightbody/bmp/BrowserMobProxyServer.java → .../lightbody/bmp/BrowserMobProxyServer.java b/.../lightbody/bmp/BrowserMobProxyServer.java → .../lightbody/bmp/BrowserMobProxyServer.java
diff --git a/.../net/lightbody/bmp/client/ClientUtil.java → .../net/lightbody/bmp/client/ClientUtil.java b/.../net/lightbody/bmp/client/ClientUtil.java → .../net/lightbody/bmp/client/ClientUtil.java
diff --git a/.../java/net/lightbody/bmp/core/har/Har.java → .../java/net/lightbody/bmp/core/har/Har.java b/.../java/net/lightbody/bmp/core/har/Har.java → .../java/net/lightbody/bmp/core/har/Har.java
diff --git a/.../net/lightbody/bmp/core/har/HarCache.java → .../net/lightbody/bmp/core/har/HarCache.java b/.../net/lightbody/bmp/core/har/HarCache.java → .../net/lightbody/bmp/core/har/HarCache.java
diff --git a/...ightbody/bmp/core/har/HarCacheStatus.java → ...ightbody/bmp/core/har/HarCacheStatus.java b/...ightbody/bmp/core/har/HarCacheStatus.java → ...ightbody/bmp/core/har/HarCacheStatus.java
diff --git a/...et/lightbody/bmp/core/har/HarContent.java → ...et/lightbody/bmp/core/har/HarContent.java b/...et/lightbody/bmp/core/har/HarContent.java → ...et/lightbody/bmp/core/har/HarContent.java
diff --git a/...net/lightbody/bmp/core/har/HarCookie.java → ...net/lightbody/bmp/core/har/HarCookie.java b/...net/lightbody/bmp/core/har/HarCookie.java → ...net/lightbody/bmp/core/har/HarCookie.java
diff --git a/.../net/lightbody/bmp/core/har/HarEntry.java → .../net/lightbody/bmp/core/har/HarEntry.java b/.../net/lightbody/bmp/core/har/HarEntry.java → .../net/lightbody/bmp/core/har/HarEntry.java
diff --git a/...va/net/lightbody/bmp/core/har/HarLog.java → ...va/net/lightbody/bmp/core/har/HarLog.java b/...va/net/lightbody/bmp/core/har/HarLog.java → ...va/net/lightbody/bmp/core/har/HarLog.java
diff --git a/...htbody/bmp/core/har/HarNameValuePair.java → ...htbody/bmp/core/har/HarNameValuePair.java b/...htbody/bmp/core/har/HarNameValuePair.java → ...htbody/bmp/core/har/HarNameValuePair.java
diff --git a/...ightbody/bmp/core/har/HarNameVersion.java → ...ightbody/bmp/core/har/HarNameVersion.java b/...ightbody/bmp/core/har/HarNameVersion.java → ...ightbody/bmp/core/har/HarNameVersion.java
diff --git a/...a/net/lightbody/bmp/core/har/HarPage.java → ...a/net/lightbody/bmp/core/har/HarPage.java b/...a/net/lightbody/bmp/core/har/HarPage.java → ...a/net/lightbody/bmp/core/har/HarPage.java
diff --git a/...ightbody/bmp/core/har/HarPageTimings.java → ...ightbody/bmp/core/har/HarPageTimings.java b/...ightbody/bmp/core/har/HarPageTimings.java → ...ightbody/bmp/core/har/HarPageTimings.java
diff --git a/...t/lightbody/bmp/core/har/HarPostData.java → ...t/lightbody/bmp/core/har/HarPostData.java b/...t/lightbody/bmp/core/har/HarPostData.java → ...t/lightbody/bmp/core/har/HarPostData.java
diff --git a/...htbody/bmp/core/har/HarPostDataParam.java → ...htbody/bmp/core/har/HarPostDataParam.java b/...htbody/bmp/core/har/HarPostDataParam.java → ...htbody/bmp/core/har/HarPostDataParam.java
diff --git a/...et/lightbody/bmp/core/har/HarRequest.java → ...et/lightbody/bmp/core/har/HarRequest.java b/...et/lightbody/bmp/core/har/HarRequest.java → ...et/lightbody/bmp/core/har/HarRequest.java
diff --git a/...t/lightbody/bmp/core/har/HarResponse.java → ...t/lightbody/bmp/core/har/HarResponse.java b/...t/lightbody/bmp/core/har/HarResponse.java → ...t/lightbody/bmp/core/har/HarResponse.java
diff --git a/...et/lightbody/bmp/core/har/HarTimings.java → ...et/lightbody/bmp/core/har/HarTimings.java b/...et/lightbody/bmp/core/har/HarTimings.java → ...et/lightbody/bmp/core/har/HarTimings.java
diff --git a/...body/bmp/core/har/PageRefFilteredHar.java → ...body/bmp/core/har/PageRefFilteredHar.java b/...body/bmp/core/har/PageRefFilteredHar.java → ...body/bmp/core/har/PageRefFilteredHar.java
diff --git a/...y/bmp/core/har/PageRefFilteredHarLog.java → ...y/bmp/core/har/PageRefFilteredHarLog.java b/...y/bmp/core/har/PageRefFilteredHarLog.java → ...y/bmp/core/har/PageRefFilteredHarLog.java
diff --git a/...bmp/exception/DecompressionException.java → ...bmp/exception/DecompressionException.java b/...bmp/exception/DecompressionException.java → ...bmp/exception/DecompressionException.java
diff --git a/...xception/UnsupportedCharsetException.java → ...xception/UnsupportedCharsetException.java b/...xception/UnsupportedCharsetException.java → ...xception/UnsupportedCharsetException.java
diff --git a/...ghtbody/bmp/filters/AddHeadersFilter.java → ...ghtbody/bmp/filters/AddHeadersFilter.java b/...ghtbody/bmp/filters/AddHeadersFilter.java → ...ghtbody/bmp/filters/AddHeadersFilter.java
diff --git a/...body/bmp/filters/AutoBasicAuthFilter.java → ...body/bmp/filters/AutoBasicAuthFilter.java b/...body/bmp/filters/AutoBasicAuthFilter.java → ...body/bmp/filters/AutoBasicAuthFilter.java
diff --git a/...ightbody/bmp/filters/BlacklistFilter.java → ...ightbody/bmp/filters/BlacklistFilter.java b/...ightbody/bmp/filters/BlacklistFilter.java → ...ightbody/bmp/filters/BlacklistFilter.java
diff --git a/...mp/filters/BrowserMobHttpFilterChain.java → ...mp/filters/BrowserMobHttpFilterChain.java b/...mp/filters/BrowserMobHttpFilterChain.java → ...mp/filters/BrowserMobHttpFilterChain.java
diff --git a/...p/filters/ClientRequestCaptureFilter.java → ...p/filters/ClientRequestCaptureFilter.java b/...p/filters/ClientRequestCaptureFilter.java → ...p/filters/ClientRequestCaptureFilter.java
diff --git a/...ghtbody/bmp/filters/HarCaptureFilter.java → ...ghtbody/bmp/filters/HarCaptureFilter.java b/...ghtbody/bmp/filters/HarCaptureFilter.java → ...ghtbody/bmp/filters/HarCaptureFilter.java
diff --git a/.../filters/HttpConnectHarCaptureFilter.java → .../filters/HttpConnectHarCaptureFilter.java b/.../filters/HttpConnectHarCaptureFilter.java → .../filters/HttpConnectHarCaptureFilter.java
diff --git a/...bmp/filters/HttpsAwareFiltersAdapter.java → ...bmp/filters/HttpsAwareFiltersAdapter.java b/...bmp/filters/HttpsAwareFiltersAdapter.java → ...bmp/filters/HttpsAwareFiltersAdapter.java
diff --git a/...y/bmp/filters/HttpsHostCaptureFilter.java → ...y/bmp/filters/HttpsHostCaptureFilter.java b/...y/bmp/filters/HttpsHostCaptureFilter.java → ...y/bmp/filters/HttpsHostCaptureFilter.java
diff --git a/...lters/HttpsOriginalHostCaptureFilter.java → ...lters/HttpsOriginalHostCaptureFilter.java b/...lters/HttpsOriginalHostCaptureFilter.java → ...lters/HttpsOriginalHostCaptureFilter.java
diff --git a/.../lightbody/bmp/filters/LatencyFilter.java → .../lightbody/bmp/filters/LatencyFilter.java b/.../lightbody/bmp/filters/LatencyFilter.java → .../lightbody/bmp/filters/LatencyFilter.java
diff --git a/...p/filters/ModifiedRequestAwareFilter.java → ...p/filters/ModifiedRequestAwareFilter.java b/...p/filters/ModifiedRequestAwareFilter.java → ...p/filters/ModifiedRequestAwareFilter.java
diff --git a/...dy/bmp/filters/RegisterRequestFilter.java → ...dy/bmp/filters/RegisterRequestFilter.java b/...dy/bmp/filters/RegisterRequestFilter.java → ...dy/bmp/filters/RegisterRequestFilter.java
diff --git a/.../lightbody/bmp/filters/RequestFilter.java → .../lightbody/bmp/filters/RequestFilter.java b/.../lightbody/bmp/filters/RequestFilter.java → .../lightbody/bmp/filters/RequestFilter.java
diff --git a/...ody/bmp/filters/RequestFilterAdapter.java → ...ody/bmp/filters/RequestFilterAdapter.java b/...ody/bmp/filters/RequestFilterAdapter.java → ...ody/bmp/filters/RequestFilterAdapter.java
diff --git a/.../filters/ResolvedHostnameCacheFilter.java → .../filters/ResolvedHostnameCacheFilter.java b/.../filters/ResolvedHostnameCacheFilter.java → .../filters/ResolvedHostnameCacheFilter.java
diff --git a/...lightbody/bmp/filters/ResponseFilter.java → ...lightbody/bmp/filters/ResponseFilter.java b/...lightbody/bmp/filters/ResponseFilter.java → ...lightbody/bmp/filters/ResponseFilter.java
diff --git a/...dy/bmp/filters/ResponseFilterAdapter.java → ...dy/bmp/filters/ResponseFilterAdapter.java b/...dy/bmp/filters/ResponseFilterAdapter.java → ...dy/bmp/filters/ResponseFilterAdapter.java
diff --git a/...ghtbody/bmp/filters/RewriteUrlFilter.java → ...ghtbody/bmp/filters/RewriteUrlFilter.java b/...ghtbody/bmp/filters/RewriteUrlFilter.java → ...ghtbody/bmp/filters/RewriteUrlFilter.java
diff --git a/.../filters/ServerResponseCaptureFilter.java → .../filters/ServerResponseCaptureFilter.java b/.../filters/ServerResponseCaptureFilter.java → .../filters/ServerResponseCaptureFilter.java
diff --git a/.../bmp/filters/UnregisterRequestFilter.java → .../bmp/filters/UnregisterRequestFilter.java b/.../bmp/filters/UnregisterRequestFilter.java → .../bmp/filters/UnregisterRequestFilter.java
diff --git a/...ightbody/bmp/filters/WhitelistFilter.java → ...ightbody/bmp/filters/WhitelistFilter.java b/...ightbody/bmp/filters/WhitelistFilter.java → ...ightbody/bmp/filters/WhitelistFilter.java
diff --git a/...mp/filters/support/HttpConnectTiming.java → ...mp/filters/support/HttpConnectTiming.java b/...mp/filters/support/HttpConnectTiming.java → ...mp/filters/support/HttpConnectTiming.java
diff --git a/...body/bmp/filters/util/HarCaptureUtil.java → ...body/bmp/filters/util/HarCaptureUtil.java b/...body/bmp/filters/util/HarCaptureUtil.java → ...body/bmp/filters/util/HarCaptureUtil.java
diff --git a/...lightbody/bmp/mitm/CertificateAndKey.java → ...lightbody/bmp/mitm/CertificateAndKey.java b/...lightbody/bmp/mitm/CertificateAndKey.java → ...lightbody/bmp/mitm/CertificateAndKey.java
diff --git a/...ody/bmp/mitm/CertificateAndKeySource.java → ...ody/bmp/mitm/CertificateAndKeySource.java b/...ody/bmp/mitm/CertificateAndKeySource.java → ...ody/bmp/mitm/CertificateAndKeySource.java
diff --git a/...t/lightbody/bmp/mitm/CertificateInfo.java → ...t/lightbody/bmp/mitm/CertificateInfo.java b/...t/lightbody/bmp/mitm/CertificateInfo.java → ...t/lightbody/bmp/mitm/CertificateInfo.java
diff --git a/...dy/bmp/mitm/CertificateInfoGenerator.java → ...dy/bmp/mitm/CertificateInfoGenerator.java b/...dy/bmp/mitm/CertificateInfoGenerator.java → ...dy/bmp/mitm/CertificateInfoGenerator.java
diff --git a/...y/bmp/mitm/ExistingCertificateSource.java → ...y/bmp/mitm/ExistingCertificateSource.java b/...y/bmp/mitm/ExistingCertificateSource.java → ...y/bmp/mitm/ExistingCertificateSource.java
diff --git a/...itm/HostnameCertificateInfoGenerator.java → ...itm/HostnameCertificateInfoGenerator.java b/...itm/HostnameCertificateInfoGenerator.java → ...itm/HostnameCertificateInfoGenerator.java
diff --git a/...y/bmp/mitm/KeyStoreCertificateSource.java → ...y/bmp/mitm/KeyStoreCertificateSource.java b/...y/bmp/mitm/KeyStoreCertificateSource.java → ...y/bmp/mitm/KeyStoreCertificateSource.java
diff --git a/...p/mitm/KeyStoreFileCertificateSource.java → ...p/mitm/KeyStoreFileCertificateSource.java b/...p/mitm/KeyStoreFileCertificateSource.java → ...p/mitm/KeyStoreFileCertificateSource.java
diff --git a/...dy/bmp/mitm/PemFileCertificateSource.java → ...dy/bmp/mitm/PemFileCertificateSource.java b/...dy/bmp/mitm/PemFileCertificateSource.java → ...dy/bmp/mitm/PemFileCertificateSource.java
diff --git a/...dy/bmp/mitm/RootCertificateGenerator.java → ...dy/bmp/mitm/RootCertificateGenerator.java b/...dy/bmp/mitm/RootCertificateGenerator.java → ...dy/bmp/mitm/RootCertificateGenerator.java
diff --git a/...a/net/lightbody/bmp/mitm/TrustSource.java → ...a/net/lightbody/bmp/mitm/TrustSource.java b/...a/net/lightbody/bmp/mitm/TrustSource.java → ...a/net/lightbody/bmp/mitm/TrustSource.java
diff --git a/...ception/CertificateCreationException.java → ...ception/CertificateCreationException.java b/...ception/CertificateCreationException.java → ...ception/CertificateCreationException.java
diff --git a/...exception/CertificateSourceException.java → ...exception/CertificateSourceException.java b/...exception/CertificateSourceException.java → ...exception/CertificateSourceException.java
diff --git a/...y/bmp/mitm/exception/ExportException.java → ...y/bmp/mitm/exception/ExportException.java b/...y/bmp/mitm/exception/ExportException.java → ...y/bmp/mitm/exception/ExportException.java
diff --git a/...y/bmp/mitm/exception/ImportException.java → ...y/bmp/mitm/exception/ImportException.java b/...y/bmp/mitm/exception/ImportException.java → ...y/bmp/mitm/exception/ImportException.java
diff --git a/...mitm/exception/KeyGeneratorException.java → ...mitm/exception/KeyGeneratorException.java b/...mitm/exception/KeyGeneratorException.java → ...mitm/exception/KeyGeneratorException.java
diff --git a/...tm/exception/KeyStoreAccessException.java → ...tm/exception/KeyStoreAccessException.java b/...tm/exception/KeyStoreAccessException.java → ...tm/exception/KeyStoreAccessException.java
diff --git a/...ody/bmp/mitm/exception/MitmException.java → ...ody/bmp/mitm/exception/MitmException.java b/...ody/bmp/mitm/exception/MitmException.java → ...ody/bmp/mitm/exception/MitmException.java
diff --git a/...on/SslContextInitializationException.java → ...on/SslContextInitializationException.java b/...on/SslContextInitializationException.java → ...on/SslContextInitializationException.java
diff --git a/.../mitm/exception/TrustSourceException.java → .../mitm/exception/TrustSourceException.java b/.../mitm/exception/TrustSourceException.java → .../mitm/exception/TrustSourceException.java
diff --git a/.../mitm/exception/UncheckedIOException.java → .../mitm/exception/UncheckedIOException.java b/.../mitm/exception/UncheckedIOException.java → .../mitm/exception/UncheckedIOException.java
diff --git a/...ghtbody/bmp/mitm/keys/ECKeyGenerator.java → ...ghtbody/bmp/mitm/keys/ECKeyGenerator.java b/...ghtbody/bmp/mitm/keys/ECKeyGenerator.java → ...ghtbody/bmp/mitm/keys/ECKeyGenerator.java
diff --git a/...lightbody/bmp/mitm/keys/KeyGenerator.java → ...lightbody/bmp/mitm/keys/KeyGenerator.java b/...lightbody/bmp/mitm/keys/KeyGenerator.java → ...lightbody/bmp/mitm/keys/KeyGenerator.java
diff --git a/...htbody/bmp/mitm/keys/RSAKeyGenerator.java → ...htbody/bmp/mitm/keys/RSAKeyGenerator.java b/...htbody/bmp/mitm/keys/RSAKeyGenerator.java → ...htbody/bmp/mitm/keys/RSAKeyGenerator.java
diff --git a/...itm/manager/ImpersonatingMitmManager.java → ...itm/manager/ImpersonatingMitmManager.java b/...itm/manager/ImpersonatingMitmManager.java → ...itm/manager/ImpersonatingMitmManager.java
diff --git a/...tats/CertificateGenerationStatistics.java → ...tats/CertificateGenerationStatistics.java b/...tats/CertificateGenerationStatistics.java → ...tats/CertificateGenerationStatistics.java
diff --git a/...ols/BouncyCastleSecurityProviderTool.java → ...ols/BouncyCastleSecurityProviderTool.java b/...ols/BouncyCastleSecurityProviderTool.java → ...ols/BouncyCastleSecurityProviderTool.java
diff --git a/...tm/tools/DefaultSecurityProviderTool.java → ...tm/tools/DefaultSecurityProviderTool.java b/...tm/tools/DefaultSecurityProviderTool.java → ...tm/tools/DefaultSecurityProviderTool.java
diff --git a/.../bmp/mitm/tools/SecurityProviderTool.java → .../bmp/mitm/tools/SecurityProviderTool.java b/.../bmp/mitm/tools/SecurityProviderTool.java → .../bmp/mitm/tools/SecurityProviderTool.java
diff --git a/...manager/InsecureExtendedTrustManager.java → ...manager/InsecureExtendedTrustManager.java b/...manager/InsecureExtendedTrustManager.java → ...manager/InsecureExtendedTrustManager.java
diff --git a/...tmanager/InsecureTrustManagerFactory.java → ...tmanager/InsecureTrustManagerFactory.java b/...tmanager/InsecureTrustManagerFactory.java → ...tmanager/InsecureTrustManagerFactory.java
diff --git a/...rustmanager/X509ExtendedTrustManager.java → ...rustmanager/X509ExtendedTrustManager.java b/...rustmanager/X509ExtendedTrustManager.java → ...rustmanager/X509ExtendedTrustManager.java
diff --git a/...ghtbody/bmp/mitm/util/EncryptionUtil.java → ...ghtbody/bmp/mitm/util/EncryptionUtil.java b/...ghtbody/bmp/mitm/util/EncryptionUtil.java → ...ghtbody/bmp/mitm/util/EncryptionUtil.java
diff --git a/...lightbody/bmp/mitm/util/KeyStoreUtil.java → ...lightbody/bmp/mitm/util/KeyStoreUtil.java b/...lightbody/bmp/mitm/util/KeyStoreUtil.java → ...lightbody/bmp/mitm/util/KeyStoreUtil.java
diff --git a/...ightbody/bmp/mitm/util/MitmConstants.java → ...ightbody/bmp/mitm/util/MitmConstants.java b/...ightbody/bmp/mitm/util/MitmConstants.java → ...ightbody/bmp/mitm/util/MitmConstants.java
diff --git a/.../net/lightbody/bmp/mitm/util/SslUtil.java → .../net/lightbody/bmp/mitm/util/SslUtil.java b/.../net/lightbody/bmp/mitm/util/SslUtil.java → .../net/lightbody/bmp/mitm/util/SslUtil.java
diff --git a/...et/lightbody/bmp/mitm/util/TrustUtil.java → ...et/lightbody/bmp/mitm/util/TrustUtil.java b/...et/lightbody/bmp/mitm/util/TrustUtil.java → ...et/lightbody/bmp/mitm/util/TrustUtil.java
diff --git a/.../lightbody/bmp/proxy/ActivityMonitor.java → .../lightbody/bmp/proxy/ActivityMonitor.java b/.../lightbody/bmp/proxy/ActivityMonitor.java → .../lightbody/bmp/proxy/ActivityMonitor.java
diff --git a/...t/lightbody/bmp/proxy/BlacklistEntry.java → ...t/lightbody/bmp/proxy/BlacklistEntry.java b/...t/lightbody/bmp/proxy/BlacklistEntry.java → ...t/lightbody/bmp/proxy/BlacklistEntry.java
diff --git a/.../net/lightbody/bmp/proxy/CaptureType.java → .../net/lightbody/bmp/proxy/CaptureType.java b/.../net/lightbody/bmp/proxy/CaptureType.java → .../net/lightbody/bmp/proxy/CaptureType.java
diff --git a/.../net/lightbody/bmp/proxy/RewriteRule.java → .../net/lightbody/bmp/proxy/RewriteRule.java b/.../net/lightbody/bmp/proxy/RewriteRule.java → .../net/lightbody/bmp/proxy/RewriteRule.java
diff --git a/...va/net/lightbody/bmp/proxy/Whitelist.java → ...va/net/lightbody/bmp/proxy/Whitelist.java b/...va/net/lightbody/bmp/proxy/Whitelist.java → ...va/net/lightbody/bmp/proxy/Whitelist.java
diff --git a/...et/lightbody/bmp/proxy/auth/AuthType.java → ...et/lightbody/bmp/proxy/auth/AuthType.java b/...et/lightbody/bmp/proxy/auth/AuthType.java → ...et/lightbody/bmp/proxy/auth/AuthType.java
diff --git a/...p/proxy/dns/AbstractHostNameRemapper.java → ...p/proxy/dns/AbstractHostNameRemapper.java b/...p/proxy/dns/AbstractHostNameRemapper.java → ...p/proxy/dns/AbstractHostNameRemapper.java
diff --git a/...y/bmp/proxy/dns/AdvancedHostResolver.java → ...y/bmp/proxy/dns/AdvancedHostResolver.java b/...y/bmp/proxy/dns/AdvancedHostResolver.java → ...y/bmp/proxy/dns/AdvancedHostResolver.java
diff --git a/...body/bmp/proxy/dns/BasicHostResolver.java → ...body/bmp/proxy/dns/BasicHostResolver.java b/...body/bmp/proxy/dns/BasicHostResolver.java → ...body/bmp/proxy/dns/BasicHostResolver.java
diff --git a/...dy/bmp/proxy/dns/ChainedHostResolver.java → ...dy/bmp/proxy/dns/ChainedHostResolver.java b/...dy/bmp/proxy/dns/ChainedHostResolver.java → ...dy/bmp/proxy/dns/ChainedHostResolver.java
diff --git a/...bmp/proxy/dns/DelegatingHostResolver.java → ...bmp/proxy/dns/DelegatingHostResolver.java b/...bmp/proxy/dns/DelegatingHostResolver.java → ...bmp/proxy/dns/DelegatingHostResolver.java
diff --git a/...lightbody/bmp/proxy/dns/HostResolver.java → ...lightbody/bmp/proxy/dns/HostResolver.java b/...lightbody/bmp/proxy/dns/HostResolver.java → ...lightbody/bmp/proxy/dns/HostResolver.java
diff --git a/.../dns/NativeCacheManipulatingResolver.java → .../dns/NativeCacheManipulatingResolver.java b/.../dns/NativeCacheManipulatingResolver.java → .../dns/NativeCacheManipulatingResolver.java
diff --git a/...ghtbody/bmp/proxy/dns/NativeResolver.java → ...ghtbody/bmp/proxy/dns/NativeResolver.java b/...ghtbody/bmp/proxy/dns/NativeResolver.java → ...ghtbody/bmp/proxy/dns/NativeResolver.java
diff --git a/...ightbody/bmp/util/BrowserMobHttpUtil.java → ...ightbody/bmp/util/BrowserMobHttpUtil.java b/...ightbody/bmp/util/BrowserMobHttpUtil.java → ...ightbody/bmp/util/BrowserMobHttpUtil.java
diff --git a/...ghtbody/bmp/util/BrowserMobProxyUtil.java → ...ghtbody/bmp/util/BrowserMobProxyUtil.java b/...ghtbody/bmp/util/BrowserMobProxyUtil.java → ...ghtbody/bmp/util/BrowserMobProxyUtil.java
diff --git a/...tbody/bmp/util/ClasspathResourceUtil.java → ...tbody/bmp/util/ClasspathResourceUtil.java b/...tbody/bmp/util/ClasspathResourceUtil.java → ...tbody/bmp/util/ClasspathResourceUtil.java
diff --git a/...ghtbody/bmp/util/HttpMessageContents.java → ...ghtbody/bmp/util/HttpMessageContents.java b/...ghtbody/bmp/util/HttpMessageContents.java → ...ghtbody/bmp/util/HttpMessageContents.java
diff --git a/...t/lightbody/bmp/util/HttpMessageInfo.java → ...t/lightbody/bmp/util/HttpMessageInfo.java b/...t/lightbody/bmp/util/HttpMessageInfo.java → ...t/lightbody/bmp/util/HttpMessageInfo.java
diff --git a/...et/lightbody/bmp/util/HttpObjectUtil.java → ...et/lightbody/bmp/util/HttpObjectUtil.java b/...et/lightbody/bmp/util/HttpObjectUtil.java → ...et/lightbody/bmp/util/HttpObjectUtil.java
diff --git a/...java/net/lightbody/bmp/util/HttpUtil.java → ...java/net/lightbody/bmp/util/HttpUtil.java b/...java/net/lightbody/bmp/util/HttpUtil.java → ...java/net/lightbody/bmp/util/HttpUtil.java
diff --git a/...org/littleshoot/proxy/mitm/Authority.java → ...org/littleshoot/proxy/mitm/Authority.java b/...org/littleshoot/proxy/mitm/Authority.java → ...org/littleshoot/proxy/mitm/Authority.java
diff --git a/...oxy/mitm/BouncyCastleSslEngineSource.java → ...oxy/mitm/BouncyCastleSslEngineSource.java b/...oxy/mitm/BouncyCastleSslEngineSource.java → ...oxy/mitm/BouncyCastleSslEngineSource.java
diff --git a/...leshoot/proxy/mitm/CertificateHelper.java → ...leshoot/proxy/mitm/CertificateHelper.java b/...leshoot/proxy/mitm/CertificateHelper.java → ...leshoot/proxy/mitm/CertificateHelper.java
diff --git a/.../mitm/CertificateSniffingMitmManager.java → .../mitm/CertificateSniffingMitmManager.java b/.../mitm/CertificateSniffingMitmManager.java → .../mitm/CertificateSniffingMitmManager.java
diff --git a/.../proxy/mitm/FakeCertificateException.java → .../proxy/mitm/FakeCertificateException.java b/.../proxy/mitm/FakeCertificateException.java → .../proxy/mitm/FakeCertificateException.java
diff --git a/...leshoot/proxy/mitm/MergeTrustManager.java → ...leshoot/proxy/mitm/MergeTrustManager.java b/...leshoot/proxy/mitm/MergeTrustManager.java → ...leshoot/proxy/mitm/MergeTrustManager.java
diff --git a/.../proxy/mitm/RootCertificateException.java → .../proxy/mitm/RootCertificateException.java b/.../proxy/mitm/RootCertificateException.java → .../proxy/mitm/RootCertificateException.java
diff --git a/...xy/mitm/SubjectAlternativeNameHolder.java → ...xy/mitm/SubjectAlternativeNameHolder.java b/...xy/mitm/SubjectAlternativeNameHolder.java → ...xy/mitm/SubjectAlternativeNameHolder.java
diff --git a/...in/jniLibs/arm64-v8a/libhttpcanary-lib.so → ...in/jniLibs/arm64-v8a/libhttpcanary-lib.so b/...in/jniLibs/arm64-v8a/libhttpcanary-lib.so → ...in/jniLibs/arm64-v8a/libhttpcanary-lib.so
diff --git a/.../jniLibs/armeabi-v7a/libhttpcanary-lib.so → .../jniLibs/armeabi-v7a/libhttpcanary-lib.so b/.../jniLibs/armeabi-v7a/libhttpcanary-lib.so → .../jniLibs/armeabi-v7a/libhttpcanary-lib.so
diff --git a/...src/main/jniLibs/x86/libhttpcanary-lib.so → ...src/main/jniLibs/x86/libhttpcanary-lib.so b/...src/main/jniLibs/x86/libhttpcanary-lib.so → ...src/main/jniLibs/x86/libhttpcanary-lib.so
diff --git a/.../main/jniLibs/x86_64/libhttpcanary-lib.so → .../main/jniLibs/x86_64/libhttpcanary-lib.so b/.../main/jniLibs/x86_64/libhttpcanary-lib.so → .../main/jniLibs/x86_64/libhttpcanary-lib.so
diff --git a/...res/drawable-xxxhdpi/http_canary_icon.png → ...res/drawable-xxxhdpi/http_canary_icon.png b/...res/drawable-xxxhdpi/http_canary_icon.png → ...res/drawable-xxxhdpi/http_canary_icon.png
diff --git a/...http_canary_ic_description_black_24dp.png → ...http_canary_ic_description_black_24dp.png b/...http_canary_ic_description_black_24dp.png → ...http_canary_ic_description_black_24dp.png
diff --git a/.../http_canary_ic_directions_black_24dp.png → .../http_canary_ic_directions_black_24dp.png b/.../http_canary_ic_directions_black_24dp.png → .../http_canary_ic_directions_black_24dp.png
diff --git a/...wable/http_canary_ic_error_black_24dp.png → ...wable/http_canary_ic_error_black_24dp.png b/...wable/http_canary_ic_error_black_24dp.png → ...wable/http_canary_ic_error_black_24dp.png
diff --git a/...wable/http_canary_ic_photo_black_24dp.png → ...wable/http_canary_ic_photo_black_24dp.png b/...wable/http_canary_ic_photo_black_24dp.png → ...wable/http_canary_ic_photo_black_24dp.png
diff --git a/...es/drawable/http_canary_setting_shape.xml → ...es/drawable/http_canary_setting_shape.xml b/...es/drawable/http_canary_setting_shape.xml → ...es/drawable/http_canary_setting_shape.xml
diff --git a/...s/layout/http_canary_activity_preview.xml → ...s/layout/http_canary_activity_preview.xml b/...s/layout/http_canary_activity_preview.xml → ...s/layout/http_canary_activity_preview.xml
diff --git a/...layout/http_canary_activity_scrolling.xml → ...layout/http_canary_activity_scrolling.xml b/...layout/http_canary_activity_scrolling.xml → ...layout/http_canary_activity_scrolling.xml
diff --git a/...s/layout/http_canary_activity_setting.xml → ...s/layout/http_canary_activity_setting.xml b/...s/layout/http_canary_activity_setting.xml → ...s/layout/http_canary_activity_setting.xml
diff --git a/...res/layout/http_canary_alert_textview.xml → ...res/layout/http_canary_alert_textview.xml b/...res/layout/http_canary_alert_textview.xml → ...res/layout/http_canary_alert_textview.xml
diff --git a/...main/res/layout/http_canary_item_cate.xml → ...main/res/layout/http_canary_item_cate.xml b/...main/res/layout/http_canary_item_cate.xml → ...main/res/layout/http_canary_item_cate.xml
diff --git a/...in/res/layout/http_canary_item_detail.xml → ...in/res/layout/http_canary_item_detail.xml b/...in/res/layout/http_canary_item_detail.xml → ...in/res/layout/http_canary_item_detail.xml
diff --git a/...n/res/layout/http_canary_item_preview.xml → ...n/res/layout/http_canary_item_preview.xml b/...n/res/layout/http_canary_item_preview.xml → ...n/res/layout/http_canary_item_preview.xml
diff --git a/...-androidx/src/main/res/values/strings.xml → httpcanary/src/main/res/values/strings.xml b/...-androidx/src/main/res/values/strings.xml → httpcanary/src/main/res/values/strings.xml
diff --git a/...y-androidx/src/main/res/values/themes.xml → httpcanary/src/main/res/values/themes.xml b/...y-androidx/src/main/res/values/themes.xml → httpcanary/src/main/res/values/themes.xml
diff --git a/settings.gradle b/settings.gradle
@@ -1,2 +1,2 @@
-include ':app', ':httpcanary-androidx'
+include ':app', ':httpcanary'
 rootProject.name = 'NetInfo'