diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/viewmodel/MainViewModel.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/viewmodel/MainViewModel.kt index f807970e..50076246 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/viewmodel/MainViewModel.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/viewmodel/MainViewModel.kt @@ -43,7 +43,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { var subscriptionId: String = MmkvManager.settingsStorage.decodeString(AppConfig.CACHE_SUBSCRIPTION_ID, "").orEmpty() //var keywordFilter: String = MmkvManager.settingsStorage.decodeString(AppConfig.CACHE_KEYWORD_FILTER, "")?:"" - var keywordFilter = "" + var keywordFilter = "" val serversCache = mutableListOf() val isRunning by lazy { MutableLiveData() } val updateListAction by lazy { MutableLiveData() } @@ -153,7 +153,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { } fun updateConfigViaSubAll(): Int { - if (subscriptionId.isNullOrEmpty()) { + if (subscriptionId.isEmpty()) { return AngConfigManager.updateConfigViaSubAll() } else { val subItem = MmkvManager.decodeSubscription(subscriptionId) ?: return 0 @@ -163,7 +163,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { fun exportAllServer(): Int { val serverListCopy = - if (subscriptionId.isNullOrEmpty() && keywordFilter.isNullOrEmpty()) { + if (subscriptionId.isEmpty() && keywordFilter.isNullOrEmpty()) { serverList } else { serversCache.map { it.guid }.toList() @@ -281,7 +281,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { } fun removeAllServer() { - if (subscriptionId.isNullOrEmpty() && keywordFilter.isNullOrEmpty()) { + if (subscriptionId.isEmpty() && keywordFilter.isNullOrEmpty()) { MmkvManager.removeAllServer() } else { val serversCopy = serversCache.toList() @@ -292,7 +292,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { } fun removeInvalidServer() { - if (subscriptionId.isNullOrEmpty() && keywordFilter.isNullOrEmpty()) { + if (subscriptionId.isEmpty() && keywordFilter.isNullOrEmpty()) { MmkvManager.removeInvalidServer("") } else { val serversCopy = serversCache.toList() @@ -394,4 +394,4 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { } } } -} \ No newline at end of file +} diff --git a/V2rayNG/app/src/main/res/values/attrs.xml b/V2rayNG/app/src/main/res/values/attrs.xml index 0df1370f..52069cfb 100644 --- a/V2rayNG/app/src/main/res/values/attrs.xml +++ b/V2rayNG/app/src/main/res/values/attrs.xml @@ -1,6 +1,5 @@ -