Northern_Lights/NekoBoxForAndroid
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/NekoBoxForAndroid.git synced 2025-12-19 22:50:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

revert serviceMode.setOnPreferenceChangeListener

Browse Source
This commit is contained in:
arm64v8a 2023-05-26 16:48:20 +09:00
parent 1f59432337
commit a868ae948b
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/io/nekohasekai/sagernet/ktx/Utils.kt
View File

@ -269,6 +269,7 @@ var isExpert: Boolean
val isExpertFlavor = ((BuildConfig.FLAVOR == "expert") || BuildConfig.DEBUG) val isExpertFlavor = ((BuildConfig.FLAVOR == "expert") || BuildConfig.DEBUG)
const val isOss = BuildConfig.FLAVOR == "oss" const val isOss = BuildConfig.FLAVOR == "oss"
const val isFdroid = BuildConfig.FLAVOR == "fdroid" const val isFdroid = BuildConfig.FLAVOR == "fdroid"
const val isPlay = BuildConfig.FLAVOR == "play"
fun <T> Continuation<T>.tryResume(value: T) { fun <T> Continuation<T>.tryResume(value: T) {
try { try {

16
app/src/main/java/io/nekohasekai/sagernet/ui/MainActivity.kt
View File

@ -94,7 +94,7 @@ class MainActivity : ThemedActivity(),
if (checkPermission != PackageManager.PERMISSION_GRANTED) { if (checkPermission != PackageManager.PERMISSION_GRANTED) {
//动态申请 //动态申请
ActivityCompat.requestPermissions( 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) { fun refreshNavMenu(clashApi: Boolean) {
if (::navigation.isInitialized) { if (::navigation.isInitialized) {
navigation.menu.findItem(R.id.nav_traffic)?.isVisible = clashApi 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 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( private fun changeState(
state: BaseService.State, state: BaseService.State,
msg: String? = null, msg: String? = null,

6
app/src/main/java/io/nekohasekai/sagernet/ui/SettingsPreferenceFragment.kt
View File

@ -185,6 +185,11 @@ class SettingsPreferenceFragment : PreferenceFragmentCompat() {
true true
} }
serviceMode.setOnPreferenceChangeListener { _, _ ->
if (DataStore.serviceState.started) SagerNet.stopService()
true
}
val tunImplementation = findPreference<SimpleMenuPreference>(Key.TUN_IMPLEMENTATION)!! val tunImplementation = findPreference<SimpleMenuPreference>(Key.TUN_IMPLEMENTATION)!!
val resolveDestination = findPreference<SwitchPreference>(Key.RESOLVE_DESTINATION)!! val resolveDestination = findPreference<SwitchPreference>(Key.RESOLVE_DESTINATION)!!
val acquireWakeLock = findPreference<SwitchPreference>(Key.ACQUIRE_WAKE_LOCK)!! val acquireWakeLock = findPreference<SwitchPreference>(Key.ACQUIRE_WAKE_LOCK)!!
@ -195,7 +200,6 @@ class SettingsPreferenceFragment : PreferenceFragmentCompat() {
true true
} }
serviceMode.onPreferenceChangeListener = reloadListener
mixedPort.onPreferenceChangeListener = reloadListener mixedPort.onPreferenceChangeListener = reloadListener
appendHttpProxy.onPreferenceChangeListener = reloadListener appendHttpProxy.onPreferenceChangeListener = reloadListener
showDirectSpeed.onPreferenceChangeListener = reloadListener showDirectSpeed.onPreferenceChangeListener = reloadListener