From 237a5af1d0df584142ee53d43306ed0b29e6776a Mon Sep 17 00:00:00 2001
From: emanuele-f <black.silver@hotmail.it>
Date: Fri, 18 Aug 2023 21:19:04 +0200
Subject: [PATCH] Abort PCAP file loading on dialog cancel

---
 .../emanuelef/remote_capture/activities/MainActivity.java    | 5 +++++
 app/src/main/res/values/strings.xml                          | 1 +
 2 files changed, 6 insertions(+)

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 c1ca57e8..5927d06b 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
@@ -839,6 +839,11 @@ private void pcapFileOpenResult(final ActivityResult result) {
             mPcapLoadDialog.setOnCancelListener(dialogInterface -> {
                 Log.i(TAG, "Abort download");
                 executor.shutdownNow();
+
+                if (CaptureService.isServiceActive())
+                    CaptureService.stopService();
+
+                Utils.showToastLong(this, R.string.pcap_file_load_aborted);
             });
             mPcapLoadDialog.setOnDismissListener(dialog -> mPcapLoadDialog = null);
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ccc6ad14..b422ec2c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -485,4 +485,5 @@
     <string name="pcap_file_not_exists">The specified PCAP file does not exist</string>
     <string name="root_capture_start_failed">Capture start failure. Ensure that the device is rooted with Magisk</string>
     <string name="pcap_read_error">PCAP read error</string>
+    <string name="pcap_file_load_aborted">PCAP file loading aborted</string>
 </resources>