From d82df49c0d5e11c97c0293f2ce09f14551712d3b Mon Sep 17 00:00:00 2001
From: emanuele-f <black.silver@hotmail.it>
Date: Wed, 11 Jan 2023 22:20:22 +0100
Subject: [PATCH] Move pcapng format option below TLS decryption

---
 .../com/emanuelef/remote_capture/Billing.java |  3 ---
 .../activities/SettingsActivity.java          | 22 ++++++++++++-------
 app/src/main/res/xml/root_preferences.xml     | 14 ++++++------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/emanuelef/remote_capture/Billing.java b/app/src/main/java/com/emanuelef/remote_capture/Billing.java
index 9c362c48..8657aac1 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/Billing.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/Billing.java
@@ -98,9 +98,6 @@ public class Billing {
     }
 
     public boolean isPurchased(String sku) {
-        if(PCAPNG_SKU.equals(sku))
-            return true;
-
         if(mPeerSkus.contains(sku))
             return true;
 
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 39bc007f..7a79e98b 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
@@ -269,14 +269,6 @@ public class SettingsActivity extends BaseActivity implements PreferenceFragment
                 return true;
             });
 
-            mPcapngEnabled = requirePreference("pcapng_format");
-            mPcapngEnabled.setOnPreferenceChangeListener(((preference, newValue) -> {
-                mTrailerEnabled.setVisible(!(boolean)newValue);
-                return true;
-            }));
-            if(!mIab.isPurchased(Billing.PCAPNG_SKU))
-                mPcapngEnabled.setVisible(false);
-
             mTrailerEnabled = requirePreference("pcapdroid_trailer");
             mTrailerEnabled.setVisible(!isPcapngEnabled()); // TODO support
         }
@@ -317,6 +309,20 @@ public class SettingsActivity extends BaseActivity implements PreferenceFragment
                 return true;
             });
 
+            mPcapngEnabled = requirePreference("pcapng_format");
+
+            if(mIab.isAvailable(Billing.PCAPNG_SKU)) {
+                mPcapngEnabled.setOnPreferenceClickListener((preference -> {
+                    // Billing code here
+
+                    mTrailerEnabled.setVisible(!mPcapngEnabled.isChecked());
+                    return false;
+                }));
+                if(!mIab.isPurchased(Billing.PCAPNG_SKU))
+                    mPcapngEnabled.setEnabled(false);
+            } else
+                mPcapngEnabled.setVisible(false);
+
             mFullPayloadEnabled = requirePreference(Prefs.PREF_FULL_PAYLOAD);
             mBlockQuic = requirePreference(Prefs.PREF_BLOCK_QUIC);
             mMitmproxyOpts = requirePreference(Prefs.PREF_MITMPROXY_OPTS);
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index b6802ab5..6a40393e 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -79,6 +79,13 @@
             app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
 
+        <SwitchPreference
+            app:key="pcapng_format"
+            app:title="@string/pcapng_format"
+            app:iconSpaceReserved="false"
+            app:summary="@string/pcapng_format_summary"
+            app:defaultValue="true" />
+
         <SwitchPreference
             app:key="block_quic"
             app:title="@string/block_quick"
@@ -150,13 +157,6 @@
             app:summary="@string/start_at_boot_summary"
             android:defaultValue="false" />
 
-        <SwitchPreference
-            app:key="pcapng_format"
-            app:title="@string/pcapng_format"
-            app:iconSpaceReserved="false"
-            app:summary="@string/pcapng_format_summary"
-            app:defaultValue="true" />
-
         <SwitchPreference
             app:key="pcapdroid_trailer"
             app:title="@string/pcapdroid_trailer"