Browse Source

change filename from WireGuardConnection to VPNConnectionsUtil

Khubaib 1 year ago
parent
commit
7a35e36845

+ 9 - 9
app/src/main/java/com/vpn/fastestvpnservice/screens/bottomNavBarScreens/HomeScreen.kt

@@ -107,7 +107,7 @@ import com.vpn.fastestvpnservice.ui.theme.FastestVPNTheme
 import com.vpn.fastestvpnservice.ui.theme.customTypography
 import com.vpn.fastestvpnservice.ui.theme.customTypography
 import com.vpn.fastestvpnservice.ui.theme.customTypography2
 import com.vpn.fastestvpnservice.ui.theme.customTypography2
 import com.vpn.fastestvpnservice.utils.Utils
 import com.vpn.fastestvpnservice.utils.Utils
-import com.vpn.fastestvpnservice.utils.WireGuardConnection
+import com.vpn.fastestvpnservice.utils.VPNConnectionsUtil
 import com.vpn.fastestvpnservice.viewmodels.HomeViewModel
 import com.vpn.fastestvpnservice.viewmodels.HomeViewModel
 import com.vpn.fastestvpnservice.viewmodels.ServerListViewModel
 import com.vpn.fastestvpnservice.viewmodels.ServerListViewModel
 import com.vpn.fastestvpnservice.viewmodels.SplashViewModel
 import com.vpn.fastestvpnservice.viewmodels.SplashViewModel
@@ -131,7 +131,7 @@ lateinit var homeViewModel1: HomeViewModel
     override fun onServerSelected(
     override fun onServerSelected(
         context: Context, homeViewModel: HomeViewModel,
         context: Context, homeViewModel: HomeViewModel,
         onClick: () -> Unit, isServerDialogShown: Boolean, server: Server) {
         onClick: () -> Unit, isServerDialogShown: Boolean, server: Server) {
-        val wg = WireGuardConnection(context, act ,homeViewModel)
+        val wg = VPNConnectionsUtil(context, act ,homeViewModel)
          val basePreferenceHelper = BasePreferenceHelper(context)
          val basePreferenceHelper = BasePreferenceHelper(context)
 
 
         Log.d("ServerCallbacks", "onServerSelected called!")
         Log.d("ServerCallbacks", "onServerSelected called!")
@@ -164,7 +164,7 @@ lateinit var homeViewModel1: HomeViewModel
 
 
      override fun onChangeProtocol(protocol: Protocol, context: Context) {
      override fun onChangeProtocol(protocol: Protocol, context: Context) {
          val prefHelper = BasePreferenceHelper(context)
          val prefHelper = BasePreferenceHelper(context)
-         val wg = WireGuardConnection(context, act , homeViewModel1)
+         val wg = VPNConnectionsUtil(context, act , homeViewModel1)
          protocolObj.value = protocol
          protocolObj.value = protocol
 
 
          Log.d("OnChangeProtocol", "OnChangeProtocol ${protocol.full_name} ${protocol.title}!")
          Log.d("OnChangeProtocol", "OnChangeProtocol ${protocol.full_name} ${protocol.title}!")
@@ -217,8 +217,8 @@ fun Home(navHostController: NavHostController, activity: ComponentActivity) {
         SplashViewModel(context)
         SplashViewModel(context)
     }
     }
     var server: Server = Server()
     var server: Server = Server()
-    val wireGuardConnection = WireGuardConnection(context, activity, homeViewModel)
-    val wg = WireGuardConnection(context, activity, homeViewModel)
+    val vpnConnectionsUtil = VPNConnectionsUtil(context, activity, homeViewModel)
+    val wg = VPNConnectionsUtil(context, activity, homeViewModel)
     homeViewModel1 = homeViewModel
     homeViewModel1 = homeViewModel
 
 
     var isConnect: Int? = homeViewModel.isConnect.observeAsState().value
     var isConnect: Int? = homeViewModel.isConnect.observeAsState().value
@@ -353,10 +353,10 @@ fun Home(navHostController: NavHostController, activity: ComponentActivity) {
             onClick = {
             onClick = {
                 Log.d("isConnect_State", "onClick{} -> $isConnect")
                 Log.d("isConnect_State", "onClick{} -> $isConnect")
                 if (isConnect == App.CONNECTED || isConnect == App.CONNECTING) {
                 if (isConnect == App.CONNECTED || isConnect == App.CONNECTING) {
-                    wireGuardConnection.stopVpn()
+                    vpnConnectionsUtil.stopVpn()
                     homeViewModel.getIp()
                     homeViewModel.getIp()
                 } else {
                 } else {
-                    wireGuardConnection.startVpn()
+                    vpnConnectionsUtil.startVpn()
                 }
                 }
 
 
 //                isConnect = !isConnect
 //                isConnect = !isConnect
@@ -681,7 +681,7 @@ fun Home(navHostController: NavHostController, activity: ComponentActivity) {
 @Composable
 @Composable
 fun BoxScope.ShowServerDialog(
 fun BoxScope.ShowServerDialog(
     prefHelper: BasePreferenceHelper,
     prefHelper: BasePreferenceHelper,
-    wg: WireGuardConnection
+    wg: VPNConnectionsUtil
 ) {
 ) {
     AlertDialog(
     AlertDialog(
         onDismissRequest = { isServerDialog.value = false },
         onDismissRequest = { isServerDialog.value = false },
@@ -807,7 +807,7 @@ fun BoxScope.ShowServerDialog(
 @Composable
 @Composable
 fun BoxScope.ShowProtocolDialog(
 fun BoxScope.ShowProtocolDialog(
     prefHelper: BasePreferenceHelper,
     prefHelper: BasePreferenceHelper,
-    wg: WireGuardConnection
+    wg: VPNConnectionsUtil
 ) {
 ) {
     AlertDialog(
     AlertDialog(
         onDismissRequest = { isProtocolDialog.value = false },
         onDismissRequest = { isProtocolDialog.value = false },

+ 1 - 6
app/src/main/java/com/vpn/fastestvpnservice/utils/WireGuardConnection.kt

@@ -7,9 +7,6 @@ import android.net.NetworkCapabilities
 import android.os.AsyncTask
 import android.os.AsyncTask
 import android.util.Log
 import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.ComponentActivity
-import androidx.lifecycle.viewmodel.compose.viewModel
-import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
 import com.vpn.fastestvpnservice.application.App
 import com.vpn.fastestvpnservice.application.App
 import com.vpn.fastestvpnservice.constants.AppEnum
 import com.vpn.fastestvpnservice.constants.AppEnum
 import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper
 import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper
@@ -23,9 +20,8 @@ import com.wireguard.config.InetNetwork
 import com.wireguard.config.Interface
 import com.wireguard.config.Interface
 import com.wireguard.config.Peer
 import com.wireguard.config.Peer
 import wireguard.WgTunnel
 import wireguard.WgTunnel
-import java.util.SortedSet
 
 
-class WireGuardConnection {
+class VPNConnectionsUtil {
 
 
     var context: Context
     var context: Context
     var activity: ComponentActivity
     var activity: ComponentActivity
@@ -82,7 +78,6 @@ class WireGuardConnection {
         }
         }
     }
     }
 
 
-
     fun vpnWireGuard(isUp: Boolean) {
     fun vpnWireGuard(isUp: Boolean) {
         Log.d("test_wg", "vpnWireGuard = $isUp")
         Log.d("test_wg", "vpnWireGuard = $isUp")