From caca5929997a573b67fbcd10019ec98e7822928b Mon Sep 17 00:00:00 2001 From: emanuele-f Date: Sat, 26 Mar 2022 18:49:52 +0100 Subject: [PATCH] Disable PCAP dump by default This is a safer setting for non technical people --- .../com/emanuelef/remote_capture/model/CaptureSettings.java | 2 +- .../main/java/com/emanuelef/remote_capture/model/Prefs.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/emanuelef/remote_capture/model/CaptureSettings.java b/app/src/main/java/com/emanuelef/remote_capture/model/CaptureSettings.java index 0710c0f5..fef34ab6 100644 --- a/app/src/main/java/com/emanuelef/remote_capture/model/CaptureSettings.java +++ b/app/src/main/java/com/emanuelef/remote_capture/model/CaptureSettings.java @@ -45,7 +45,7 @@ public class CaptureSettings implements Serializable { } public CaptureSettings(Intent intent) { - dump_mode = Prefs.getDumpMode(getString(intent, Prefs.PREF_PCAP_DUMP_MODE, "none")); + dump_mode = Prefs.getDumpMode(getString(intent, "pcap_dump_mode", "none")); app_filter = getString(intent, Prefs.PREF_APP_FILTER, ""); collector_address = getString(intent, Prefs.PREF_COLLECTOR_IP_KEY, "127.0.0.1"); collector_port = getInt(intent, Prefs.PREF_COLLECTOR_PORT_KEY, 1234); diff --git a/app/src/main/java/com/emanuelef/remote_capture/model/Prefs.java b/app/src/main/java/com/emanuelef/remote_capture/model/Prefs.java index 91a7144a..b8fd904b 100644 --- a/app/src/main/java/com/emanuelef/remote_capture/model/Prefs.java +++ b/app/src/main/java/com/emanuelef/remote_capture/model/Prefs.java @@ -26,10 +26,11 @@ import com.emanuelef.remote_capture.Billing; import com.emanuelef.remote_capture.Utils; public class Prefs { + public static final String DUMP_NONE = "none"; public static final String DUMP_HTTP_SERVER = "http_server"; public static final String DUMP_UDP_EXPORTER = "udp_exporter"; public static final String DUMP_PCAP_FILE = "pcap_file"; - public static final String DEFAULT_DUMP_MODE = DUMP_HTTP_SERVER; + public static final String DEFAULT_DUMP_MODE = DUMP_NONE; public static final String PAYLOAD_MODE_NONE = "none"; public static final String PAYLOAD_MODE_MINIMAL = "minimal"; @@ -45,7 +46,7 @@ public class Prefs { public static final String PREF_TLS_DECRYPTION_KEY = "tls_decryption"; public static final String PREF_APP_FILTER = "app_filter"; public static final String PREF_HTTP_SERVER_PORT = "http_server_port"; - public static final String PREF_PCAP_DUMP_MODE = "pcap_dump_mode"; + public static final String PREF_PCAP_DUMP_MODE = "pcap_dump_mode_v2"; public static final String PREF_PCAP_URI = "pcap_uri"; public static final String PREF_IPV6_ENABLED = "ipv6_enabled"; public static final String PREF_APP_LANGUAGE = "app_language";