|
@@ -239,7 +239,7 @@ lateinit var vpnConnectionsUtil: VPNConnectionsUtil
|
|
|
|
|
|
@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class)
|
|
|
@Composable
|
|
|
-fun Home(navHostController: NavHostController, activity: ComponentActivity) {
|
|
|
+fun Home(navHostController: NavHostController, activity: ComponentActivity, settingsNavHostController: NavHostController) {
|
|
|
|
|
|
Log.d("OnChangeProtocol", "Home called!")
|
|
|
navHostController1 = navHostController
|
|
@@ -340,23 +340,29 @@ fun Home(navHostController: NavHostController, activity: ComponentActivity) {
|
|
|
}
|
|
|
|
|
|
val ip = homeViewModel.mutableLiveDataIpInfo.observeAsState().value
|
|
|
- val validateResponse = homeViewModel._mutableLiveDataValidate.observeAsState().value
|
|
|
+ val validateResponse = homeViewModel.liveDataValidate.observeAsState().value
|
|
|
validateResponse?.let {
|
|
|
- Log.d("test_api_validate", it.message.toString())
|
|
|
- homeViewModel._mutableLiveDataValidate.value = null
|
|
|
- }
|
|
|
-
|
|
|
- LaunchedEffect(key1 = Unit){
|
|
|
- homeViewModel.validatePassword(
|
|
|
- prefHelper.getUser()?.userinfo?.email.toString(),
|
|
|
- prefHelper.getPassword().toString(),
|
|
|
- "android",
|
|
|
- android.os.Build.VERSION.RELEASE
|
|
|
- )
|
|
|
+ Log.d("test_api_validate", "home => ${it.status} ${it.message}")
|
|
|
|
|
|
+ if (!it.status) {
|
|
|
+ basePreferenceHelper.setLoggedInState(false)
|
|
|
+ basePreferenceHelper.clearAllData()
|
|
|
+ settingsNavHostController.popBackStack()
|
|
|
+ settingsNavHostController.navigate(Screen.Started.route)
|
|
|
+ }
|
|
|
|
|
|
+ homeViewModel._mutableLiveDataValidate.value = null
|
|
|
}
|
|
|
|
|
|
+// LaunchedEffect(key1 = Unit){
|
|
|
+// homeViewModel.validatePassword(
|
|
|
+// prefHelper.getUser()?.userinfo?.email.toString(),
|
|
|
+// prefHelper.getPassword().toString(),
|
|
|
+// "android",
|
|
|
+// android.os.Build.VERSION.RELEASE
|
|
|
+// )
|
|
|
+// }
|
|
|
+
|
|
|
Box(
|
|
|
modifier = Modifier
|
|
|
.background(MaterialTheme.colorScheme.background)
|