From a868ae948bc3f3ee6a3938bbb5538ac9013b3dbb Mon Sep 17 00:00:00 2001
From: arm64v8a <48624112+arm64v8a@users.noreply.github.com>
Date: Fri, 26 May 2023 16:48:20 +0900
Subject: [PATCH] revert serviceMode.setOnPreferenceChangeListener

---
 .../java/io/nekohasekai/sagernet/ktx/Utils.kt    |  1 +
 .../io/nekohasekai/sagernet/ui/MainActivity.kt   | 16 ++--------------
 .../sagernet/ui/SettingsPreferenceFragment.kt    |  6 +++++-
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/io/nekohasekai/sagernet/ktx/Utils.kt b/app/src/main/java/io/nekohasekai/sagernet/ktx/Utils.kt
index d0ce4d8..8da7388 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/ktx/Utils.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/ktx/Utils.kt
@@ -269,6 +269,7 @@ var isExpert: Boolean
 val isExpertFlavor = ((BuildConfig.FLAVOR == "expert") || BuildConfig.DEBUG)
 const val isOss = BuildConfig.FLAVOR == "oss"
 const val isFdroid = BuildConfig.FLAVOR == "fdroid"
+const val isPlay = BuildConfig.FLAVOR == "play"
 
 fun <T> Continuation<T>.tryResume(value: T) {
     try {
diff --git a/app/src/main/java/io/nekohasekai/sagernet/ui/MainActivity.kt b/app/src/main/java/io/nekohasekai/sagernet/ui/MainActivity.kt
index 13271a8..6da0903 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/ui/MainActivity.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/ui/MainActivity.kt
@@ -94,7 +94,7 @@ class MainActivity : ThemedActivity(),
             if (checkPermission != PackageManager.PERMISSION_GRANTED) {
                 //动态申请
                 ActivityCompat.requestPermissions(
-                    this@MainActivity, arrayOf<String>(POST_NOTIFICATIONS), 0
+                    this@MainActivity, arrayOf(POST_NOTIFICATIONS), 0
                 )
             }
         }
@@ -105,6 +105,7 @@ class MainActivity : ThemedActivity(),
     fun refreshNavMenu(clashApi: Boolean) {
         if (::navigation.isInitialized) {
             navigation.menu.findItem(R.id.nav_traffic)?.isVisible = clashApi
+            navigation.menu.findItem(R.id.nav_tuiguang)?.isVisible = !isPlay
         }
     }
 
@@ -332,19 +333,6 @@ class MainActivity : ThemedActivity(),
         return true
     }
 
-    @SuppressLint("CommitTransaction")
-    fun ruleCreated() {
-        navigation.menu.findItem(R.id.nav_route).isChecked = true
-        supportFragmentManager.beginTransaction()
-            .replace(R.id.fragment_holder, RouteFragment())
-            .commitAllowingStateLoss()
-        if (DataStore.serviceState.started) {
-            snackbar(getString(R.string.need_reload)).setAction(R.string.apply) {
-                SagerNet.reloadService()
-            }.show()
-        }
-    }
-
     private fun changeState(
         state: BaseService.State,
         msg: String? = null,
diff --git a/app/src/main/java/io/nekohasekai/sagernet/ui/SettingsPreferenceFragment.kt b/app/src/main/java/io/nekohasekai/sagernet/ui/SettingsPreferenceFragment.kt
index 465a561..a7bee74 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/ui/SettingsPreferenceFragment.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/ui/SettingsPreferenceFragment.kt
@@ -185,6 +185,11 @@ class SettingsPreferenceFragment : PreferenceFragmentCompat() {
             true
         }
 
+        serviceMode.setOnPreferenceChangeListener { _, _ ->
+            if (DataStore.serviceState.started) SagerNet.stopService()
+            true
+        }
+
         val tunImplementation = findPreference<SimpleMenuPreference>(Key.TUN_IMPLEMENTATION)!!
         val resolveDestination = findPreference<SwitchPreference>(Key.RESOLVE_DESTINATION)!!
         val acquireWakeLock = findPreference<SwitchPreference>(Key.ACQUIRE_WAKE_LOCK)!!
@@ -195,7 +200,6 @@ class SettingsPreferenceFragment : PreferenceFragmentCompat() {
             true
         }
 
-        serviceMode.onPreferenceChangeListener = reloadListener
         mixedPort.onPreferenceChangeListener = reloadListener
         appendHttpProxy.onPreferenceChangeListener = reloadListener
         showDirectSpeed.onPreferenceChangeListener = reloadListener