|
@@ -632,16 +632,36 @@ fun Home(
|
|
|
onClick = {
|
|
|
Log.d("test_button", "onClick Smart Connect ${smartServer?.server_name}")
|
|
|
// basePreferenceHelper.setSmartServerObject(smartServer)
|
|
|
- basePreferenceHelper.setConnectedServer(smartServer)
|
|
|
- if (isConnect == App.CONNECTED || isConnect == App.CONNECTING) {
|
|
|
+// basePreferenceHelper.setConnectedServer(smartServer)
|
|
|
+
|
|
|
+ if (isConnect == App.CONNECTED) {
|
|
|
Log.d("isConnect_State_vpn", "stopVPN")
|
|
|
+ val lastServer = basePreferenceHelper.getConnectedServer()
|
|
|
+ Log.d("test_conn_ser_obj", "smart => ${lastServer?.server_name} ${smartServer?.server_name}")
|
|
|
+
|
|
|
+ if (lastServer?.id != smartServer?.id) {
|
|
|
+ isServerDialog.value = true
|
|
|
+ if (smartServer != null) {
|
|
|
+ serverObj.value = smartServer
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ vpnConnectionsUtil.stopVpn()
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+// vpnConnectionsUtil.stopVpn()
|
|
|
+// Handler().postDelayed(Runnable {
|
|
|
+// vpnConnectionsUtil.startVpn()
|
|
|
+// }, 500)
|
|
|
+// homeViewModel.getIp()
|
|
|
+ }
|
|
|
+ else if (isConnect == App.CONNECTING) {
|
|
|
vpnConnectionsUtil.stopVpn()
|
|
|
- Handler().postDelayed(Runnable {
|
|
|
- vpnConnectionsUtil.startVpn()
|
|
|
- }, 500)
|
|
|
- homeViewModel.getIp()
|
|
|
- } else {
|
|
|
+ }
|
|
|
+ else if (isConnect == App.DISCONNECTED) {
|
|
|
Log.d("isConnect_State_vpn", "startVPN")
|
|
|
+ basePreferenceHelper.setConnectedServer(smartServer)
|
|
|
vpnConnectionsUtil.startVpn()
|
|
|
}
|
|
|
|