From f9d36008efc573aa84fc63c2a819f0c6c8859fa3 Mon Sep 17 00:00:00 2001
From: emanuele-f <black.silver@hotmail.it>
Date: Tue, 30 Jan 2024 10:54:30 +0100
Subject: [PATCH] Fix no-filter warning with root decryption

The warning incorrectly referenced the decryption whitelist, which is not
actually applied to the root capture
---
 .../emanuelef/remote_capture/fragments/StatusFragment.java | 7 +++----
 app/src/main/res/layout/status.xml                         | 2 +-
 app/src/main/res/values/strings.xml                        | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/emanuelef/remote_capture/fragments/StatusFragment.java b/app/src/main/java/com/emanuelef/remote_capture/fragments/StatusFragment.java
index dd1aedab..613b6198 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/fragments/StatusFragment.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/fragments/StatusFragment.java
@@ -23,7 +23,6 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.drawable.Drawable;
-import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -77,7 +76,7 @@ public class StatusFragment extends Fragment implements AppStateListener, MenuPr
     private TextView mFilterDescription;
     private SwitchCompat mAppFilterSwitch;
     private String mAppFilter;
-    private TextView mFilterWarning;
+    private TextView mFilterRootDecryptionWarning;
     private AppSelectDialog mAppSelDialog;
 
     @Override
@@ -115,7 +114,7 @@ public class StatusFragment extends Fragment implements AppStateListener, MenuPr
         mCollectorInfo = view.findViewById(R.id.collector_info);
         mCaptureStatus = view.findViewById(R.id.status_view);
         mQuickSettings = view.findViewById(R.id.quick_settings);
-        mFilterWarning = view.findViewById(R.id.app_filter_warning);
+        mFilterRootDecryptionWarning = view.findViewById(R.id.app_filter_root_decryption_warning);
         mPrefs = PreferenceManager.getDefaultSharedPreferences(mActivity);
         mAppFilter = Prefs.getAppFilter(mPrefs);
 
@@ -194,7 +193,7 @@ public class StatusFragment extends Fragment implements AppStateListener, MenuPr
     private void recheckFilterWarning() {
         boolean hasFilter = ((mAppFilter != null) && (!mAppFilter.isEmpty()));
 
-        mFilterWarning.setVisibility((Prefs.getTlsDecryptionEnabled(mPrefs) &&
+        mFilterRootDecryptionWarning.setVisibility((Prefs.getTlsDecryptionEnabled(mPrefs) &&
                 Prefs.isRootCaptureEnabled(mPrefs)
                 && !hasFilter) ? View.VISIBLE : View.GONE);
     }
diff --git a/app/src/main/res/layout/status.xml b/app/src/main/res/layout/status.xml
index 3cd17281..d128707f 100644
--- a/app/src/main/res/layout/status.xml
+++ b/app/src/main/res/layout/status.xml
@@ -91,7 +91,7 @@
                     android:layout_centerInParent="true" />
 
                 <TextView
-                    android:id="@+id/app_filter_warning"
+                    android:id="@+id/app_filter_root_decryption_warning"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/app_filter_text"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 58d27421..d292498c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -234,7 +234,7 @@
     <string name="malware_detection_learn_more">Learn more about the malware detection feature</string>
     <string name="private_dns_message_notice">Private DNS prevents PCAPdroid from inspecting the DNS traffic. You can turn it off from the Android network settings</string>
     <string name="private_dns_hinders_detection">Private DNS hinders detection</string>
-    <string name="decryption_no_filter_warn">Select a target app or use the decryption whitelist when decrypting TLS to avoid losing your connection to the Internet</string>
+    <string name="decryption_no_filter_warn">Select a target app when decrypting TLS to avoid losing your connection to the Internet</string>
     <string name="block">Block…</string>
     <string name="unblock">Unblock…</string>
     <string name="firewall">Firewall</string>