Merge branch '5561-name_the_vpn_already_running' into 'main'

5561: display name of other VPNrunning always on.

See merge request e/os/advanced-privacy!96

1 files changed, 14 insertions, 12 deletions

diff --git a/app/src/main/java/foundation/e/privacycentralapp/DependencyContainer.kt b/app/src/main/java/foundation/e/privacycentralapp/DependencyContainer.kt
index 2e24d4c..670b81e 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/DependencyContainer.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/DependencyContainer.kt
@@ -106,15 +106,17 @@ class DependencyContainer(val app: Application) {
         )
     }
 
-    val viewModelsFactory by lazy { ViewModelsFactory(
-        getQuickPrivacyStateUseCase = getQuickPrivacyStateUseCase,
-        trackersStatisticsUseCase = trackersStatisticsUseCase,
-        trackersStateUseCase = trackersStateUseCase,
-        fakeLocationStateUseCase = fakeLocationStateUseCase,
-        ipScramblerModule = ipScramblerModule,
-        ipScramblingStateUseCase = ipScramblingStateUseCase,
-        appListUseCase = appListUseCase
-    ) }
+    val viewModelsFactory by lazy {
+        ViewModelsFactory(
+            getQuickPrivacyStateUseCase = getQuickPrivacyStateUseCase,
+            trackersStatisticsUseCase = trackersStatisticsUseCase,
+            trackersStateUseCase = trackersStateUseCase,
+            fakeLocationStateUseCase = fakeLocationStateUseCase,
+            ipScramblerModule = ipScramblerModule,
+            ipScramblingStateUseCase = ipScramblingStateUseCase,
+            appListUseCase = appListUseCase
+        )
+    }
 
     // Background
     fun initBackgroundSingletons() {
@@ -140,15 +142,15 @@ class ViewModelsFactory(
     private val ipScramblerModule: IIpScramblerModule,
     private val ipScramblingStateUseCase: IpScramblingStateUseCase,
     private val appListUseCase: AppListUseCase
-): ViewModelProvider.Factory {
+) : ViewModelProvider.Factory {
 
     @Suppress("UNCHECKED_CAST")
     override fun <T : ViewModel> create(modelClass: Class<T>, extras: CreationExtras): T {
         return when (modelClass) {
             AppTrackersViewModel::class.java -> {
                 val fallbackUid = android.os.Process.myPid()
-                val appUid = extras[DEFAULT_ARGS_KEY]?.
-                    getInt(AppTrackersFragment.PARAM_APP_UID, fallbackUid)?: fallbackUid
+                val appUid = extras[DEFAULT_ARGS_KEY]
+                    ?.getInt(AppTrackersFragment.PARAM_APP_UID, fallbackUid) ?: fallbackUid
 
                 AppTrackersViewModel(
                     appUid = appUid,