From e221fad3740fca21ed1f8e9cdefd0f123d912da5 Mon Sep 17 00:00:00 2001
From: emanuele-f <black.silver@hotmail.it>
Date: Mon, 30 May 2022 23:20:32 +0200
Subject: [PATCH] Enable the TLS decryption switch on setup done

---
 .../remote_capture/activities/SettingsActivity.java | 13 +++++++++++++
 .../remote_capture/fragments/mitmwizard/Done.java   |  1 -
 app/src/main/res/values/strings.xml                 |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

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 85804878..bcf66e00 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
@@ -132,6 +132,7 @@ public class SettingsActivity extends BaseActivity implements PreferenceFragment
         private DropDownPreference mCapInterface;
         private SwitchPreference mMalwareDetectionEnabled;
         private Billing mIab;
+        private boolean mHasStartedMitmWizard;
 
         private final ActivityResultLauncher<String> requestPermissionLauncher =
                 registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted ->
@@ -162,6 +163,17 @@ public class SettingsActivity extends BaseActivity implements PreferenceFragment
             }
         }
 
+        @Override
+        public void onResume() {
+            super.onResume();
+
+            if(mHasStartedMitmWizard && !MitmAddon.needsSetup(requireContext())) {
+                Log.d(TAG, "mitm setup complete, enabling");
+                mTlsDecryption.setChecked(true);
+            }
+            mHasStartedMitmWizard = false;
+        }
+
         private @NonNull <T extends Preference> T requirePreference(String key) {
             T pref = findPreference(key);
             if(pref == null)
@@ -258,6 +270,7 @@ public class SettingsActivity extends BaseActivity implements PreferenceFragment
                 Context ctx = requireContext();
 
                 if(enabled && MitmAddon.needsSetup(ctx)) {
+                    mHasStartedMitmWizard = true;
                     Intent intent = new Intent(ctx, MitmSetupWizard.class);
                     startActivity(intent);
                     return false;
diff --git a/app/src/main/java/com/emanuelef/remote_capture/fragments/mitmwizard/Done.java b/app/src/main/java/com/emanuelef/remote_capture/fragments/mitmwizard/Done.java
index 6433a5d6..ddc2d199 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/fragments/mitmwizard/Done.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/fragments/mitmwizard/Done.java
@@ -32,7 +32,6 @@ public class Done extends StepFragment {
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        mStepIcon.setVisibility(View.GONE);
         mStepLabel.setText(R.string.mitm_setup_wizard_done);
 
         MitmAddon.setDecryptionSetupDone(requireContext(), true);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5ce5c27b..5e43fea7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -346,7 +346,7 @@
     <string name="block_private_dns">Block private DNS</string>
     <string name="block_private_dns_summary">Detect and possibly block private DNS to inspect DNS traffic. Disabling this can hinder detection</string>
     <string name="mitm_setup_wizard_intro">This wizard will guide you through the installation of the PCAPdroid mitm addon and certification authority, which are needed to perform the <a href='%1$s'>TLS decryption</a></string>
-    <string name="mitm_setup_wizard_done">PCAPdroid is now ready to decrypt TLS traffic\n\nCheck out the <a href='%1$s'>user guide</a> to know more about the security measures which may prevent decryption and how to bypass them</string>
+    <string name="mitm_setup_wizard_done">PCAPdroid is now ready to decrypt the TLS traffic\n\nCheck out the <a href='%1$s'>user guide</a> to know more about the security measures which may prevent decryption and how to bypass them</string>
     <string name="app_intro_skip_button">Skip</string>
     <string name="app_intro_next_button">Next</string>
     <string name="app_intro_back_button">Back</string>