fix upgrade popup not showing once shown.

Author: Ginder-Singh

mobile/src/main/java/com/windscribe/mobile/ui/connection/ConnectionViewmodel.kt

@@ -13,6 +13,7 @@ import com.windscribe.mobile.ui.preferences.lipstick.LookAndFeelHelper.bundledBa
 import com.windscribe.mobile.ui.preferences.lipstick.LookAndFeelHelper.getSoundFile
 import com.windscribe.mobile.ui.common.isEnabled
 import com.windscribe.mobile.ui.home.HomeGoto
+import com.windscribe.mobile.ui.home.HomeScreen
 import com.windscribe.mobile.ui.serverlist.ServerListItem
 import com.windscribe.vpn.Windscribe.Companion.appContext
 import com.windscribe.vpn.apppreference.PreferencesHelper
@@ -144,6 +145,7 @@ abstract class ConnectionViewmodel : ViewModel() {
     abstract val toastMessage: StateFlow<ToastMessage>
     abstract fun clearToast()
     abstract fun onProtocolChangeClick()
+    abstract fun onGoToHandled()
 }
 
 class ConnectionViewmodelImpl @Inject constructor(
@@ -178,7 +180,7 @@ class ConnectionViewmodelImpl @Inject constructor(
     override val isAntiCensorshipEnabled: StateFlow<Boolean> = _isAntiCensorshipEnabled
     private val _isPreferredProtocolEnabled = MutableStateFlow(false)
     override val isPreferredProtocolEnabled: StateFlow<Boolean> = _isPreferredProtocolEnabled
-    private val _goto = MutableSharedFlow<HomeGoto>(extraBufferCapacity = 1)
+    private val _goto = MutableSharedFlow<HomeGoto>(replay = 0)
     override val goto: SharedFlow<HomeGoto> = _goto
     private val _newFeedCount = MutableStateFlow(0)
     override val newFeedCount: StateFlow<Int> = _newFeedCount
@@ -751,9 +753,19 @@ class ConnectionViewmodelImpl @Inject constructor(
         }
     }
 
+    override fun onGoToHandled() {
+        viewModelScope.launch {
+            _goto.emit(HomeGoto.None)
+            _toastMessage.emit(ToastMessage.None)
+        }
+    }
+
     override fun onCleared() {
         networkInfoManager.removeNetworkInfoListener(networkListener!!)
         preferences.removeObserver(preferenceChangeListener!!)
+        viewModelScope.launch {
+            _goto.emit(HomeGoto.None)
+        }
         super.onCleared()
     }
 }

mobile/src/main/java/com/windscribe/mobile/ui/home/HomeScreen.kt

@@ -110,14 +110,19 @@ fun HomeScreen(
 fun HandleGoto(connectionViewmodel: ConnectionViewmodel, homeViewmodel: HomeViewmodel) {
     val connectionGoto by connectionViewmodel.goto.collectAsState(initial = null)
     val homeGoto by homeViewmodel.goto.collectAsState(initial = null)
-    HandleGotoAction(goto = connectionGoto)
-    HandleGotoAction(goto = homeGoto)
+    HandleGotoAction(goto = connectionGoto, homeViewmodel, connectionViewmodel)
+    HandleGotoAction(goto = homeGoto, homeViewmodel, connectionViewmodel)
 }
 
 @Composable
-private fun HandleGotoAction(goto: HomeGoto?) {
+private fun HandleGotoAction(
+    goto: HomeGoto?,
+    homeViewmodel: HomeViewmodel,
+    connectionViewmodel: ConnectionViewmodel
+) {
     val context = LocalContext.current
     val navController = LocalNavController.current
+    var didNavigate = false
     when (goto) {
         HomeGoto.Banned -> {
             val bannedData = AccountStatusDialogData(
@@ -131,33 +136,64 @@ private fun HandleGotoAction(goto: HomeGoto?) {
                 bannedLayout = true
             )
             navigateWithData(navController, Screen.AccountStatus.route, bannedData)
+            didNavigate = true
         }
 
         is HomeGoto.Expired -> {
             val expireData = AccountStatusDialogData(
                 title = stringResource(com.windscribe.vpn.R.string.you_re_out_of_data),
                 icon = R.drawable.garry_nodata,
-                description = stringResource(com.windscribe.vpn.R.string.upgrade_to_stay_protected, goto.date),
+                description = stringResource(
+                    com.windscribe.vpn.R.string.upgrade_to_stay_protected,
+                    goto.date
+                ),
                 showSkipButton = true,
                 skipText = stringResource(com.windscribe.vpn.R.string.upgrade_later),
                 showUpgradeButton = true,
                 upgradeText = stringResource(com.windscribe.vpn.R.string.upgrade),
             )
             navigateWithData(navController, Screen.AccountStatus.route, expireData)
+            didNavigate = true
         }
 
         is HomeGoto.EditCustomConfig -> {
             navController.currentBackStackEntry?.savedStateHandle?.set("config_id", goto.id)
             navController.currentBackStackEntry?.savedStateHandle?.set("connect", goto.connect)
             navController.navigate(Screen.EditCustomConfig.route)
+            didNavigate = true
+        }
+
+        is HomeGoto.Upgrade -> {
+            context.startActivity(UpgradeActivity.getStartIntent(context))
+            didNavigate = true
+        }
+
+        HomeGoto.PowerWhitelist -> {
+            navController.navigate(Screen.PowerWhitelist.route)
+            didNavigate = true
+        }
+
+        HomeGoto.ShareAppLink -> {
+            navController.navigate(Screen.ShareLink.route)
+            didNavigate = true
+        }
+
+        HomeGoto.LocationMaintenance -> {
+            navController.navigate(Screen.LocationUnderMaintenance.route)
+            didNavigate = true
+        }
+
+        HomeGoto.MainMenu -> {
+            navController.navigate(Screen.MainMenu.route)
+            didNavigate = true
         }
 
-        is HomeGoto.Upgrade -> context.startActivity(UpgradeActivity.getStartIntent(context))
-        HomeGoto.PowerWhitelist -> navController.navigate(Screen.PowerWhitelist.route)
-        HomeGoto.ShareAppLink -> navController.navigate(Screen.ShareLink.route)
-        HomeGoto.LocationMaintenance -> navController.navigate(Screen.LocationUnderMaintenance.route)
-        HomeGoto.MainMenu -> navController.navigate(Screen.MainMenu.route)
-        null -> Unit
+        HomeGoto.None -> {}
+        null -> {}
+    }
+    if (didNavigate) {
+        connectionViewmodel.onGoToHandled()
+        homeViewmodel.onGoToHandled()
     }
 }
 
@@ -348,7 +384,13 @@ internal fun BoxScope.NetworkInfoSheet(
     val showContextMenu by connectionViewmodel.ipContextMenuState.collectAsState()
     val isHapticEnabled by homeViewmodel.hapticFeedbackEnabled.collectAsState()
     val hideIp = remember { mutableStateOf(false) }
-    Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.align(Alignment.BottomCenter).offset(y = (-66).dp).padding(end = 12.dp)) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier
+            .align(Alignment.BottomCenter)
+            .offset(y = (-66).dp)
+            .padding(end = 12.dp)
+    ) {
         NetworkNameSheet(connectionViewmodel, homeViewmodel)
         Row(
             modifier = Modifier

mobile/src/main/java/com/windscribe/mobile/ui/home/HomeViewmodel.kt

@@ -5,6 +5,7 @@ import android.os.Build
 import android.os.PowerManager
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.windscribe.mobile.ui.connection.ToastMessage
 import com.windscribe.vpn.Windscribe.Companion.appContext
 import com.windscribe.vpn.apppreference.PreferencesHelper
 import com.windscribe.vpn.model.User
@@ -30,6 +31,7 @@ sealed class HomeGoto {
     object LocationMaintenance : HomeGoto()
     data class EditCustomConfig(val id: Int, val connect: Boolean) : HomeGoto()
     object MainMenu: HomeGoto()
+    object None: HomeGoto()
 }
 
 sealed class UserState() {
@@ -50,6 +52,7 @@ abstract class HomeViewmodel : ViewModel() {
     abstract val hapticFeedbackEnabled: StateFlow<Boolean>
     abstract val showLocationLoad: StateFlow<Boolean>
     abstract fun onMainMenuClick()
+    abstract fun onGoToHandled()
 }
 
 class HomeViewmodelImpl(
@@ -58,7 +61,7 @@ class HomeViewmodelImpl(
     private val preferences: PreferencesHelper
 ) : HomeViewmodel() {
 
-    private val _goto = MutableSharedFlow<HomeGoto>(extraBufferCapacity = 1)
+    private val _goto = MutableSharedFlow<HomeGoto>(replay = 0)
     override val goto: SharedFlow<HomeGoto> = _goto
     private val _userState = MutableStateFlow<UserState>(UserState.Loading)
     override val userState: StateFlow<UserState> = _userState
@@ -164,6 +167,15 @@ class HomeViewmodelImpl(
 
     override fun onCleared() {
         preferences.removeObserver(trayPreferenceChangeListener)
+        viewModelScope.launch {
+            _goto.emit(HomeGoto.None)
+        }
         super.onCleared()
     }
+
+    override fun onGoToHandled() {
+        viewModelScope.launch {
+            _goto.emit(HomeGoto.None)
+        }
+    }
 }