diff options
| author | Aleksandr Granin <aleksandr@mullvad.net> | 2021-03-31 18:08:14 +0200 |
|---|---|---|
| committer | Aleksandr Granin <aleksandr@mullvad.net> | 2021-04-01 13:30:37 +0200 |
| commit | 818a60da2ae1df45dc7d522bc244aeb9700e346e (patch) | |
| tree | 594f02a6eeb741a267ace7eb0970eabb92d467f9 /android/src/main | |
| parent | 3308421996fd57cc4e8670f7d28bb3bc0e4af205 (diff) | |
| download | mullvadvpn-818a60da2ae1df45dc7d522bc244aeb9700e346e.tar.xz mullvadvpn-818a60da2ae1df45dc7d522bc244aeb9700e346e.zip | |
Remove Deferred from ApplicationsProvider
Diffstat (limited to 'android/src/main')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsProvider.kt | 8 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModel.kt | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsProvider.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsProvider.kt index 182d6608fd..a097ffd231 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsProvider.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsProvider.kt @@ -3,8 +3,6 @@ package net.mullvad.mullvadvpn.applist import android.Manifest import android.content.pm.ApplicationInfo import android.content.pm.PackageManager -import kotlinx.coroutines.CompletableDeferred -import kotlinx.coroutines.Deferred class ApplicationsProvider( private val packageManager: PackageManager, @@ -16,15 +14,15 @@ class ApplicationsProvider( !isSelfApplication(appInfo.packageName) } - fun getAppsList(): Deferred<List<AppData>> = CompletableDeferred( - packageManager.getInstalledApplications(PackageManager.GET_META_DATA) + fun getAppsList(): List<AppData> { + return packageManager.getInstalledApplications(PackageManager.GET_META_DATA) .asSequence() .filter(applicationFilterPredicate) .map { info -> AppData(info.packageName, info.icon, info.loadLabel(packageManager).toString()) } .toList() - ) + } private fun hasInternetPermission(packageName: String): Boolean { return PackageManager.PERMISSION_GRANTED == diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModel.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModel.kt index 9ce3254f63..98730de960 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModel.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModel.kt @@ -91,7 +91,7 @@ class SplitTunnelingViewModel( } private suspend fun fetchData() { - appsProvider.getAppsList().await() + appsProvider.getAppsList() .partition { app -> splitTunneling.excludedAppList.contains(app.packageName) } .let { (excludedAppsList, notExcludedAppsList) -> // TODO: remove potential package names from splitTunneling list |