Skip to content

perf(android): lazy-load split tunnel app list #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hidden-Node merged 1 commit into from
May 13, 2026
Merged

perf(android): lazy-load split tunnel app list #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions android/app/src/main/java/com/masterdns/vpn/ui/settings/GlobalSettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ fun GlobalSettingsScreen(vm: GlobalSettingsViewModel = viewModel()) {
availableQuery = ""
selectedQuery = ""
activeTab = "AVAILABLE"
vm.loadInstalledAppsIfNeeded()
showAppPicker = true
},
modifier = Modifier.fillMaxWidth()
Expand Down
13 changes: 7 additions & 6 deletions android/app/src/main/java/com/masterdns/vpn/ui/settings/GlobalSettingsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import androidx.lifecycle.viewModelScope
import com.masterdns.vpn.util.GlobalSettings
import com.masterdns.vpn.util.GlobalSettingsStore
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.MutableStateFlow
Expand All @@ -28,19 +29,18 @@ class GlobalSettingsViewModel(app: Application) : AndroidViewModel(app) {

private val _installedApps = MutableStateFlow<List<AppEntry>>(emptyList())
val installedApps: StateFlow<List<AppEntry>> = _installedApps

init {
loadInstalledApps()
}
private var installedAppsJob: Job? = null
private var installedAppsLoaded = false

fun save(settings: GlobalSettings) {
viewModelScope.launch {
GlobalSettingsStore.save(getApplication(), settings)
}
}

private fun loadInstalledApps() {
viewModelScope.launch {
fun loadInstalledAppsIfNeeded() {
if (installedAppsLoaded || installedAppsJob?.isActive == true) return
installedAppsJob = viewModelScope.launch {
val appList = withContext(Dispatchers.IO) {
val packageManager = getApplication<Application>().packageManager
val launcherIntent = Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER)
Expand Down Expand Up @@ -69,6 +69,7 @@ class GlobalSettingsViewModel(app: Application) : AndroidViewModel(app) {
.toList()
}
_installedApps.value = appList
installedAppsLoaded = true
}
}
}
Loading