From a61d8af4c168e82b33449aa5877bf6469cdb2273 Mon Sep 17 00:00:00 2001
From: emanuele-f <black.silver@hotmail.it>
Date: Mon, 22 Nov 2021 16:15:23 +0100
Subject: [PATCH] Add malware detection warning with private DNS on

---
 .../java/com/emanuelef/remote_capture/CaptureService.java    | 4 ++++
 .../remote_capture/fragments/MalwareStatusFragment.java      | 5 ++++-
 app/src/main/res/values/strings.xml                          | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/emanuelef/remote_capture/CaptureService.java b/app/src/main/java/com/emanuelef/remote_capture/CaptureService.java
index 69761b75..90c53917 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/CaptureService.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/CaptureService.java
@@ -637,6 +637,10 @@ public class CaptureService extends VpnService implements Runnable {
         return((INSTANCE != null) ? INSTANCE.getDnsServer() : "");
     }
 
+    public static boolean isDNSEncrypted() {
+        return((INSTANCE != null) && INSTANCE.mDnsEncrypted);
+    }
+
     /* Stop a running VPN service */
     public static void stopService() {
         if (INSTANCE != null)
diff --git a/app/src/main/java/com/emanuelef/remote_capture/fragments/MalwareStatusFragment.java b/app/src/main/java/com/emanuelef/remote_capture/fragments/MalwareStatusFragment.java
index 3a515d3a..2dc1c479 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/fragments/MalwareStatusFragment.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/fragments/MalwareStatusFragment.java
@@ -47,7 +47,6 @@ import com.emanuelef.remote_capture.R;
 import com.emanuelef.remote_capture.Utils;
 import com.emanuelef.remote_capture.activities.ConnectionsActivity;
 import com.emanuelef.remote_capture.activities.MainActivity;
-import com.emanuelef.remote_capture.adapters.ListEditAdapter;
 import com.emanuelef.remote_capture.model.Blacklists;
 import com.emanuelef.remote_capture.model.FilterDescriptor;
 
@@ -155,6 +154,10 @@ public class MalwareStatusFragment extends Fragment {
                 mStatusIcon.setImageResource(R.drawable.ic_exclamation_triangle_solid);
                 mStatusIcon.setColorFilter(mWarnColor);
                 mStatus.setText(R.string.malware_status_update_failed);
+            } else if(CaptureService.isDNSEncrypted()) {
+                mStatusIcon.setImageResource(R.drawable.ic_exclamation_triangle_solid);
+                mStatusIcon.setColorFilter(mWarnColor);
+                mStatus.setText(R.string.private_dns_hinders_detection);
             } else {
                 mStatusIcon.setImageResource(R.drawable.ic_check_solid);
                 mStatusIcon.setColorFilter(mOkColor);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9d577953..e9600d1d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -236,4 +236,5 @@
     <string name="status_updating">Updating…</string>
     <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 disable it from the Android network settings.</string>
+    <string name="private_dns_hinders_detection">Private DNS hinders detection</string>
 </resources>
\ No newline at end of file