From ec9bc2fc338be090dd895ed5f03a598eba913a2b Mon Sep 17 00:00:00 2001
From: emanuele-f <black.silver@hotmail.it>
Date: Fri, 27 May 2022 16:24:20 +0200
Subject: [PATCH] Move geolocation under traffic inspection section

---
 app/src/main/res/values/strings.xml       |  2 +-
 app/src/main/res/xml/root_preferences.xml | 30 +++++++++++------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 77936cef..799e4a26 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -307,7 +307,7 @@
     <string name="printable_text">Printable text</string>
     <string name="hexdump">Hexdump</string>
     <string name="geolocation">Geolocation</string>
-    <string name="geolocation_summary">Add country and ASN info by performing offline lookups</string>
+    <string name="geolocation_summary">Show country and ASN info by performing offline lookups</string>
     <string name="downloading">Downloading…</string>
     <string name="download_in_progress">Download in progress, please wait</string>
     <string name="download_failed">Download failed</string>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index e0ecdbc9..43fbb126 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -45,6 +45,13 @@
     </PreferenceCategory>
 
     <PreferenceCategory app:title="@string/traffic_inspection" app:iconSpaceReserved="false"  app:key="traffic_inspection">
+        <Preference
+            android:key="geolocation"
+            app:title="@string/geolocation"
+            app:summary="@string/geolocation_summary"
+            app:iconSpaceReserved="false"
+            app:fragment="com.emanuelef.remote_capture.fragments.GeoipSettings" />
+
         <SwitchPreference
             app:key="tls_decryption"
             app:title="@string/tls_decryption"
@@ -52,6 +59,14 @@
             app:summary="@string/tls_decryption_summary"
             app:defaultValue="false" />
 
+        <Preference
+            app:key="tls_how_to"
+            app:title="@string/tls_how_to"
+            app:iconSpaceReserved="false">
+            <intent android:action="android.intent.action.VIEW"
+                android:data="https://emanuele-f.github.io/PCAPdroid/tls_decryption" />
+        </Preference>
+
         <SwitchPreference
             app:key="block_quic"
             app:title="@string/block_quick"
@@ -86,14 +101,6 @@
             app:iconSpaceReserved="false"
             app:defaultValue="8050"
             app:useSimpleSummaryProvider="true" />
-
-        <Preference
-            app:key="tls_how_to"
-            app:title="@string/tls_how_to"
-            app:iconSpaceReserved="false">
-            <intent android:action="android.intent.action.VIEW"
-                android:data="https://emanuele-f.github.io/PCAPdroid/tls_decryption" />
-        </Preference>
     </PreferenceCategory>
 
     <PreferenceCategory app:title="@string/capture_prefs" app:iconSpaceReserved="false" >
@@ -170,13 +177,6 @@
             app:defaultValue="system"
             app:useSimpleSummaryProvider="true"/>
 
-        <Preference
-            android:key="geolocation"
-            app:title="@string/geolocation"
-            app:summary="@string/geolocation_summary"
-            app:iconSpaceReserved="false"
-            app:fragment="com.emanuelef.remote_capture.fragments.GeoipSettings" />
-
         <SwitchPreference
             app:key="ipv6_enabled"
             app:title="@string/ipv6"