|
@@ -30,6 +30,7 @@ import com.vpn.fastestvpnservice.constants.splitList
|
|
import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper
|
|
import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper
|
|
import com.vpn.fastestvpnservice.helpers.UIHelper
|
|
import com.vpn.fastestvpnservice.helpers.UIHelper
|
|
import com.vpn.fastestvpnservice.openVpnUtils.EncryptData
|
|
import com.vpn.fastestvpnservice.openVpnUtils.EncryptData
|
|
|
|
+import com.vpn.fastestvpnservice.screens.bottomNavBarScreens.ikev2Callback
|
|
import com.vpn.fastestvpnservice.viewmodels.HomeViewModel
|
|
import com.vpn.fastestvpnservice.viewmodels.HomeViewModel
|
|
import com.wireguard.android.backend.Backend
|
|
import com.wireguard.android.backend.Backend
|
|
import com.wireguard.android.backend.GoBackend
|
|
import com.wireguard.android.backend.GoBackend
|
|
@@ -433,8 +434,12 @@ class VPNConnectionsUtil: VpnStatus.StateListener {
|
|
val intent = Intent(context, VpnProfileControlActivity::class.java)
|
|
val intent = Intent(context, VpnProfileControlActivity::class.java)
|
|
intent.action = VpnProfileControlActivity.DISCONNECT
|
|
intent.action = VpnProfileControlActivity.DISCONNECT
|
|
context.startActivity(intent)
|
|
context.startActivity(intent)
|
|
- homeViewModel.setConnectState(App.DISCONNECTED)
|
|
|
|
|
|
|
|
|
|
+ val connectState = homeViewModel.isConnect.value
|
|
|
|
+ Log.d("disconnect_ikev2", "connectState = $connectState")
|
|
|
|
+ if (connectState == 1) {
|
|
|
|
+ homeViewModel.setConnectState(App.DISCONNECTED)
|
|
|
|
+ }
|
|
}
|
|
}
|
|
/*Disconnect Wireguard*/
|
|
/*Disconnect Wireguard*/
|
|
else if (basePreferenceHelper.getProtocol().title.toLowerCase()
|
|
else if (basePreferenceHelper.getProtocol().title.toLowerCase()
|
|
@@ -527,18 +532,23 @@ class VPNConnectionsUtil: VpnStatus.StateListener {
|
|
App.connection_status = App.CONNECTION_STATE_CONNECTED
|
|
App.connection_status = App.CONNECTION_STATE_CONNECTED
|
|
Log.d("ikev2_rec_conn", "ACTION_VPN_CONNECTED $connectState")
|
|
Log.d("ikev2_rec_conn", "ACTION_VPN_CONNECTED $connectState")
|
|
|
|
|
|
- if (connectState == 1) {
|
|
|
|
- Log.d("ikev2_rec_conn", "setConnectState(2) $connectState")
|
|
|
|
- homeViewModel.setConnectState(App.CONNECTED)
|
|
|
|
- }
|
|
|
|
- else if (connectState == 0) {
|
|
|
|
- Log.d("ikev2_rec_conn", "setConnectState(0) $connectState")
|
|
|
|
- homeViewModel.setConnectState(App.DISCONNECTED)
|
|
|
|
- }
|
|
|
|
|
|
+// val status = isVPNConnected()
|
|
|
|
+// Log.d("ikev2_rec_conn", "isVPNConnected $status")
|
|
|
|
+
|
|
|
|
+ homeViewModel.setConnectState(App.CONNECTED)
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+// if (connectState == 1) {
|
|
|
|
+// Log.d("ikev2_rec_conn", "setConnectState(2) $connectState")
|
|
|
|
+// homeViewModel.setConnectState(App.CONNECTED)
|
|
|
|
+// }
|
|
|
|
+// else if (connectState == 0) {
|
|
|
|
+// Log.d("ikev2_rec_conn", "setConnectState(0) $connectState")
|
|
|
|
+// homeViewModel.setConnectState(App.DISCONNECTED)
|
|
|
|
+// }
|
|
Log.d("vpnConnectionCall_ip", "ACTION_VPN_CONNECTED $connectState")
|
|
Log.d("vpnConnectionCall_ip", "ACTION_VPN_CONNECTED $connectState")
|
|
|
|
|
|
- val status = isVPNConnected()
|
|
|
|
- Log.d("vpnConnectionCall_ip", "isVPNConnected $status")
|
|
|
|
|
|
+
|
|
// val widgetIntent1 = Intent(context, SimpleAppWidget::class.java)
|
|
// val widgetIntent1 = Intent(context, SimpleAppWidget::class.java)
|
|
// widgetIntent1.action = SimpleAppWidget.ACTION_CONNECT_VPN
|
|
// widgetIntent1.action = SimpleAppWidget.ACTION_CONNECT_VPN
|
|
// context?.sendBroadcast(widgetIntent1)
|
|
// context?.sendBroadcast(widgetIntent1)
|
|
@@ -576,6 +586,9 @@ class VPNConnectionsUtil: VpnStatus.StateListener {
|
|
CharonVpnService.ACTION_VPN_SERVER_NOT_RESPONDING -> {
|
|
CharonVpnService.ACTION_VPN_SERVER_NOT_RESPONDING -> {
|
|
Log.d("vpnConnectionCall_ip", "ACTION_VPN_SERVER_NOT_RESPONDING")
|
|
Log.d("vpnConnectionCall_ip", "ACTION_VPN_SERVER_NOT_RESPONDING")
|
|
App.connection_status = App.CONNECTION_STATE_SERVER_NOT_RESPONDING
|
|
App.connection_status = App.CONNECTION_STATE_SERVER_NOT_RESPONDING
|
|
|
|
+ if (context != null) {
|
|
|
|
+ ikev2Callback.ServerNotResponding(context, homeViewModel)
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|