From 39d68dc51da69d5993f96a83986f34fd32d884a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@sekai.icu>
Date: Wed, 28 Feb 2024 12:25:02 +0800
Subject: [PATCH] Make Play Store happy

---
 .../io/nekohasekai/sfa/ui/MainActivity.kt     | 31 ++-----------------
 .../sfa/ui/main/SettingsFragment.kt           |  3 ++
 app/src/main/res/layout/fragment_settings.xml |  7 +++++
 app/src/main/res/values/strings.xml           |  7 ++---
 4 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/io/nekohasekai/sfa/ui/MainActivity.kt b/app/src/main/java/io/nekohasekai/sfa/ui/MainActivity.kt
index 0bfde06..2df7515 100644
--- a/app/src/main/java/io/nekohasekai/sfa/ui/MainActivity.kt
+++ b/app/src/main/java/io/nekohasekai/sfa/ui/MainActivity.kt
@@ -225,13 +225,11 @@ class MainActivity : AbstractActivity(), ServiceConnection.Callback {
     private val locationPermissionLauncher =
         registerForActivityResult(ActivityResultContracts.RequestPermission()) {
             if (it) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                if (it && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                     requestBackgroundLocationPermission()
                 } else {
                     startService()
                 }
-            } else {
-                showPermissionDeniedDescription()
             }
         }
 
@@ -239,8 +237,6 @@ class MainActivity : AbstractActivity(), ServiceConnection.Callback {
         registerForActivityResult(ActivityResultContracts.RequestPermission()) {
             if (it) {
                 startService()
-            } else {
-                showPermissionDeniedDescription()
             }
         }
 
@@ -350,7 +346,7 @@ class MainActivity : AbstractActivity(), ServiceConnection.Callback {
             .setPositiveButton(R.string.ok) { _, _ ->
                 requestFineLocationPermission0()
             }
-            .setNegativeButton(R.string.cancel, null)
+            .setNegativeButton(R.string.no_thanks, null)
             .setCancelable(false)
             .show()
     }
@@ -376,7 +372,7 @@ class MainActivity : AbstractActivity(), ServiceConnection.Callback {
             .setPositiveButton(R.string.ok) { _, _ ->
                 backgroundLocationPermissionLauncher.launch(Manifest.permission.ACCESS_BACKGROUND_LOCATION)
             }
-            .setNegativeButton(R.string.cancel, null)
+            .setNegativeButton(R.string.no_thanks, null)
             .setCancelable(false)
             .show()
     }
@@ -402,27 +398,6 @@ class MainActivity : AbstractActivity(), ServiceConnection.Callback {
         }
     }
 
-    private fun showPermissionDeniedDescription() {
-        val message = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            Html.fromHtml(
-                getString(R.string.location_permission_denied_description),
-                Html.FROM_HTML_MODE_LEGACY
-            )
-        } else {
-            @Suppress("DEPRECATION")
-            Html.fromHtml(getString(R.string.location_permission_denied_description))
-        }
-        MaterialAlertDialogBuilder(this)
-            .setTitle(R.string.location_permission_title)
-            .setMessage(message)
-            .setPositiveButton(R.string.ok, null)
-            .setNeutralButton(R.string.open_settings) { _, _ ->
-                openPermissionSettings()
-            }
-            .setCancelable(false)
-            .show()
-    }
-
     @SuppressLint("PrivateApi")
     fun getSystemProperty(key: String?): String? {
         try {
diff --git a/app/src/main/java/io/nekohasekai/sfa/ui/main/SettingsFragment.kt b/app/src/main/java/io/nekohasekai/sfa/ui/main/SettingsFragment.kt
index f24bd5a..5103af8 100644
--- a/app/src/main/java/io/nekohasekai/sfa/ui/main/SettingsFragment.kt
+++ b/app/src/main/java/io/nekohasekai/sfa/ui/main/SettingsFragment.kt
@@ -73,6 +73,9 @@ class SettingsFragment : Fragment() {
         binding.checkUpdateButton.setOnClickListener {
             Vendor.checkUpdate(activity, true)
         }
+        binding.openPrivacyPolicyButton.setOnClickListener {
+            activity.launchCustomTab("https://sing-box.sagernet.org/clients/privacy/")
+        }
         binding.disableMemoryLimit.addTextChangedListener {
             lifecycleScope.launch(Dispatchers.IO) {
                 val newValue = EnabledType.valueOf(it).boolValue
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 4c00786..2284e93 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -82,6 +82,13 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/check_update" />
+
+                    <Button
+                        android:id="@+id/openPrivacyPolicyButton"
+                        style="@style/Widget.Material3.Button.TextButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/privacy_policy" />
                 </LinearLayout>
 
             </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 80ff8e6..c550930 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,7 +3,6 @@
 
     <string name="stop">Stop</string>
     <string name="ok">OK</string>
-    <string name="cancel">Cancel</string>
     <string name="no_thanks">No, thanks</string>
 
     <string name="title_dashboard">Dashboard</string>
@@ -87,6 +86,7 @@
     <string name="core_data_size">Data Size</string>
     <string name="check_update_automatic">Automatic Update Check</string>
     <string name="check_update">Check Update</string>
+    <string name="privacy_policy">Privacy Policy</string>
     <string name="title_app_settings">App</string>
     <string name="memory_limit">Memory Limit</string>
     <string name="background_permission">Background permission</string>
@@ -147,8 +147,7 @@
     <string name="other_methods">Other methods</string>
     <string name="action_start">Start</string>
     <string name="location_permission_title">Location permission</string>
-    <string name="location_permission_description"><![CDATA[Your profile contains <strong><tt>wifi_ssid</tt> and <tt>wifi_bssid</tt> routing rules</strong>. To make them work, sing-box uses the <strong>location</strong> permission <strong>in the background</strong> to get information about the connected Wi-Fi network. The information will be used <strong>only for routing purposes</strong>. Please grant the permission to continue.]]></string>
-    <string name="location_permission_background_description"><![CDATA[On Android 10 and up, <strong>background location</strong> permission is required. Please select <strong>Allow all the time</strong> to grant the permission.]]></string>
-    <string name="location_permission_denied_description"><![CDATA[It looks like you have denied the required permission. To continue using the app, please <strong>grant the permission</strong> or <strong>remove <tt>wifi_ssid</tt> and <tt>wifi_bssid</tt> routing rules</strong> from your profile.]]></string>
+    <string name="location_permission_description"><![CDATA[Your profile contains <strong><tt>wifi_ssid</tt> or <tt>wifi_bssid</tt> routing rules</strong>. To make them work, sing-box uses the <strong>location</strong> permission <strong>in the background</strong> to get information about the connected Wi-Fi network. The information will be used <strong>for routing purposes only</strong>.]]></string>
+    <string name="location_permission_background_description"><![CDATA[On Android 10 and up, <strong>background location</strong> permission is required. Select <strong>Allow all the time</strong> to grant the permission.]]></string>
     <string name="open_settings">Open Settings</string>
 </resources>
\ No newline at end of file