From 569523f09186776a4fd29ec2a66da9e536e6aee2 Mon Sep 17 00:00:00 2001 From: emanuele-f Date: Thu, 4 Mar 2021 23:46:40 +0100 Subject: [PATCH] Remove unused resources and add TLS decryption help --- .../emanuelef/remote_capture/HTTPServer.java | 2 +- .../activities/MainActivity.java | 2 +- .../activities/SettingsActivity.java | 5 ++++ app/src/main/res/drawable/ic_search.xml | 8 ------ app/src/main/res/layout/apps_stats.xml | 3 +-- app/src/main/res/menu/nav_items.xml | 2 +- app/src/main/res/values-cn/strings.xml | 18 +------------ app/src/main/res/values-pl/strings.xml | 12 +-------- app/src/main/res/values/strings.xml | 26 ++++++------------- app/src/main/res/xml/root_preferences.xml | 12 ++++++++- 10 files changed, 30 insertions(+), 60 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_search.xml diff --git a/app/src/main/java/com/emanuelef/remote_capture/HTTPServer.java b/app/src/main/java/com/emanuelef/remote_capture/HTTPServer.java index fa94a8da..960ad82d 100644 --- a/app/src/main/java/com/emanuelef/remote_capture/HTTPServer.java +++ b/app/src/main/java/com/emanuelef/remote_capture/HTTPServer.java @@ -110,7 +110,7 @@ public class HTTPServer extends NanoHTTPD { public Response serve(IHTTPSession session) { if(!mAcceptConnections) return newFixedLengthResponse(Status.FORBIDDEN, MIME_PLAINTEXT, - mContext.getString(R.string.capture_not_started)); + mContext.getString(R.string.capture_not_running)); if(session.getUri().endsWith("/")) { /* Use a redirect to provide a file name */ diff --git a/app/src/main/java/com/emanuelef/remote_capture/activities/MainActivity.java b/app/src/main/java/com/emanuelef/remote_capture/activities/MainActivity.java index 43165f00..106f8292 100644 --- a/app/src/main/java/com/emanuelef/remote_capture/activities/MainActivity.java +++ b/app/src/main/java/com/emanuelef/remote_capture/activities/MainActivity.java @@ -316,7 +316,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On Intent intent = new Intent(MainActivity.this, StatsActivity.class); startActivity(intent); } else - Utils.showToast(this, R.string.capture_not_started); + Utils.showToast(this, R.string.capture_not_running); } else if (id == R.id.action_about) { Intent intent = new Intent(MainActivity.this, AboutActivity.class); startActivity(intent); diff --git a/app/src/main/java/com/emanuelef/remote_capture/activities/SettingsActivity.java b/app/src/main/java/com/emanuelef/remote_capture/activities/SettingsActivity.java index 3d40e33b..c7307a40 100644 --- a/app/src/main/java/com/emanuelef/remote_capture/activities/SettingsActivity.java +++ b/app/src/main/java/com/emanuelef/remote_capture/activities/SettingsActivity.java @@ -27,6 +27,7 @@ import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; import androidx.preference.EditTextPreference; import androidx.preference.ListPreference; +import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; import androidx.preference.SwitchPreference; @@ -54,6 +55,7 @@ public class SettingsActivity extends AppCompatActivity { private SwitchPreference mTlsDecryptionEnabled; private EditTextPreference mTlsProxyIp; private EditTextPreference mTlsProxyPort; + private Preference mTlsHelp; @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { @@ -96,6 +98,8 @@ public class SettingsActivity extends AppCompatActivity { } private void setupTlsProxyPrefs() { + mTlsHelp = findPreference("tls_how_to"); + mTlsDecryptionEnabled = findPreference(Prefs.PREF_TLS_DECRYPTION_ENABLED_KEY); mTlsDecryptionEnabled.setOnPreferenceChangeListener((preference, newValue) -> { tlsDecryptionHideShow((Boolean) newValue); @@ -118,6 +122,7 @@ public class SettingsActivity extends AppCompatActivity { private void tlsDecryptionHideShow(boolean decryptionEnabled) { mTlsProxyIp.setVisible(decryptionEnabled); mTlsProxyPort.setVisible(decryptionEnabled); + mTlsHelp.setVisible(decryptionEnabled); } } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml deleted file mode 100644 index 0db73fa0..00000000 --- a/app/src/main/res/drawable/ic_search.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/apps_stats.xml b/app/src/main/res/layout/apps_stats.xml index 2b0c952d..f0c68bed 100644 --- a/app/src/main/res/layout/apps_stats.xml +++ b/app/src/main/res/layout/apps_stats.xml @@ -1,8 +1,7 @@ + android:layout_height="match_parent"> - PCAPdroid 启动 停止 设置 @@ -11,22 +10,10 @@ %1$s (%2$s) 查询 主机 - 流量捕获未在运行！ - - - 127.0.0.1 - 1234 - - - 远程收集器 - IP 地址 - 端口 + 流量捕获未在运行！ 应用过滤器 就绪 - 停止中... - 启动中... 关于 - 杂项 状态 连接 无连接 @@ -55,13 +42,10 @@ 启用 TLS 解密 启用后，所有 TLS 通信都将被重定向到远程 mitmproxy 实例进行解密。 8080 - +解密 - PCAP 转储 TLS 解密 用户指南 评价本应用 Telegram 群组 - Github 项目 是 否 当前处于活跃状态的 VPN 应用将被断开。你想继续吗？ diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 9f41449b..9a79bde3 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -8,20 +8,10 @@ %1$s pobrane — %2$s wysłane Zapytanie Host - Przechwytywanie nie jest włączone! - - - - - Zdalna usługa zbierająca - Adres IP - Port + Przechwytywanie nie jest włączone! Filtr aplikacji Gotowy - Wyłączanie... - Włączanie... O aplikacji - Różne Status Połączenia Brak połączeń diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dc5ca3c7..e0415cdc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,6 +1,10 @@ PCAPdroid Copyright (C) 2020-21 - Emanuele Faranda black.silver@hotmail.it + 127.0.0.1 + 1234 + + Start Stop Settings @@ -12,22 +16,11 @@ %1$s (%2$s) Query Host - Capture not running! - - - 127.0.0.1 - 1234 - - - Remote Collector - IP Address - Port + Capture not running! + Capture not started! App Filter Ready - Stopping... - Starting... About - Misc Status Connections No connections @@ -56,13 +49,11 @@ Enable TLS Decryption When enabled, all the TLS traffic will be redirected to a remote mitmproxy instance for decryption. 8080 - +decryption - PCAP Dump TLS Decryption User Guide Rate Telegram Group - Source Code + Source Code YES NO The currently active VPN app will be disconnected. Do you want to proceed? @@ -82,7 +73,6 @@ DNS Queries Search Apps No apps - Show system apps DNS Server Apps Remove the app filter @@ -101,7 +91,6 @@ Capture running %1$s captured, %2$s connections No app filter set - IP: %1$s %1$s, %2$d Open First Seen @@ -117,5 +106,6 @@ PCAPdroid is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. GPLv3 License Get it: + How to setup TLS Decryption diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml index 409b8ac7..4fd02b3e 100644 --- a/app/src/main/res/xml/root_preferences.xml +++ b/app/src/main/res/xml/root_preferences.xml @@ -14,7 +14,9 @@ ~ limitations under the License. --> - + + + + +