Quellcode durchsuchen

replace App file, now using openvpn.core.App file..

Khubaib vor 1 Jahr
Ursprung
Commit
fcce19a22a

+ 1 - 1
app/src/main/AndroidManifest.xml

@@ -11,7 +11,7 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <application
-        android:name=".application.App"
+        android:name="de.blinkt.openvpn.core.App"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"

+ 1 - 1
app/src/main/java/com/vpn/fastestvpnservice/MainActivity.kt

@@ -27,7 +27,7 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.get
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.compose.rememberNavController
-import com.vpn.fastestvpnservice.application.App
+import de.blinkt.openvpn.core.App
 import com.vpn.fastestvpnservice.beans.isDarkTheme
 import com.vpn.fastestvpnservice.beans.selectedtheme
 import com.vpn.fastestvpnservice.beans.themesList

+ 1 - 1
app/src/main/java/com/vpn/fastestvpnservice/broadcasts/ConnectivityReceiver.java

@@ -5,7 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import com.vpn.fastestvpnservice.application.App;
+import de.blinkt.openvpn.core.App;
 
 public class ConnectivityReceiver
         extends BroadcastReceiver {

+ 1 - 1
app/src/main/java/com/vpn/fastestvpnservice/fcm/PetsFirebaseMessagingService.java

@@ -15,7 +15,7 @@ import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
 import com.vpn.fastestvpnservice.MainActivity;
 import com.vpn.fastestvpnservice.R;
-import com.vpn.fastestvpnservice.application.App;
+import de.blinkt.openvpn.core.App;
 import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper;
 
 import kotlinx.coroutines.Job;

+ 1 - 1
app/src/main/java/com/vpn/fastestvpnservice/helpers/UIHelper.java

@@ -24,7 +24,7 @@ import android.widget.Toast;
 import androidx.annotation.StringRes;
 
 import com.vpn.fastestvpnservice.MainActivity;
-import com.vpn.fastestvpnservice.application.App;
+import de.blinkt.openvpn.core.App;
 
 import java.io.File;
 import java.io.FileInputStream;

+ 1 - 1
app/src/main/java/com/vpn/fastestvpnservice/retrofit/RetrofitNetworkHandling.java

@@ -6,7 +6,7 @@ import android.view.View;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.vpn.fastestvpnservice.R;
-import com.vpn.fastestvpnservice.application.App;
+import de.blinkt.openvpn.core.App;
 import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper;
 import com.vpn.fastestvpnservice.helpers.UIHelper;
 import com.vpn.fastestvpnservice.utils.CheckInternetConnection;

+ 1 - 1
app/src/main/java/com/vpn/fastestvpnservice/retrofit/WebServiceFactory.java

@@ -1,7 +1,7 @@
 package com.vpn.fastestvpnservice.retrofit;
 
 import com.stealthcopter.networktools.Ping;
-import com.vpn.fastestvpnservice.application.App;
+import de.blinkt.openvpn.core.App;
 import com.vpn.fastestvpnservice.constants.AppConstant;
 import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper;
 import com.vpn.fastestvpnservice.retrofit.entities.GsonFactory;

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

@@ -95,7 +95,7 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
-import com.vpn.fastestvpnservice.application.App
+import de.blinkt.openvpn.core.App
 import com.vpn.fastestvpnservice.beans.Protocol
 import com.vpn.fastestvpnservice.beans.Server
 import com.vpn.fastestvpnservice.beans.isDarkTheme

+ 32 - 1
app/src/main/java/com/vpn/fastestvpnservice/utils/VPNConnectionsUtil.kt

@@ -1,13 +1,16 @@
 package com.vpn.fastestvpnservice.utils
 
+import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
+import android.content.ServiceConnection
 import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
 import android.os.AsyncTask
+import android.os.IBinder
 import android.util.Log
 import androidx.activity.ComponentActivity
-import com.vpn.fastestvpnservice.application.App
+import de.blinkt.openvpn.core.App
 import com.vpn.fastestvpnservice.constants.AppEnum
 import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper
 import com.vpn.fastestvpnservice.viewmodels.HomeViewModel
@@ -19,7 +22,13 @@ import com.wireguard.config.InetEndpoint
 import com.wireguard.config.InetNetwork
 import com.wireguard.config.Interface
 import com.wireguard.config.Peer
+import de.blinkt.openvpn.VpnProfile
+import de.blinkt.openvpn.core.ConfigParser
+import de.blinkt.openvpn.core.IOpenVPNServiceInternal
+import de.blinkt.openvpn.core.ProfileManager
 import wireguard.WgTunnel
+import java.io.BufferedReader
+import java.io.InputStream
 
 class VPNConnectionsUtil {
 
@@ -28,11 +37,33 @@ class VPNConnectionsUtil {
     var basePreferenceHelper: BasePreferenceHelper
     var homeViewModel: HomeViewModel
 
+    /* WireGuard */
     var backend: Backend? = null
     final var peerBuilder = Peer.Builder()
     final var tunnel: Tunnel = WgTunnel()
     lateinit var tunnelStatus: Tunnel.State
 
+    /*TCP, UDP*/
+    var mService: IOpenVPNServiceInternal? = null
+    var inputStream: InputStream? = null
+    var bufferedReader: BufferedReader? = null
+    var cp: ConfigParser? = null
+    var vp: VpnProfile? = null
+    var pm: ProfileManager? = null
+    var thread: Thread? = null
+
+    private val mConnection: ServiceConnection = object : ServiceConnection {
+        override fun onServiceConnected(className: ComponentName, service: IBinder) {
+            de.blinkt.openvpn.core.App.mService = IOpenVPNServiceInternal.Stub.asInterface(service)
+            Log.d("test_openvpn", "onServiceConnected: ${de.blinkt.openvpn.core.App.mService}")
+        }
+
+        override fun onServiceDisconnected(arg0: ComponentName) {
+            de.blinkt.openvpn.core.App.mService = null
+            Log.d("test_openvpn", "onServiceDisconnected: ${de.blinkt.openvpn.core.App.mService}")
+        }
+    }
+
     constructor(context: Context, activity: ComponentActivity, homeViewModel: HomeViewModel) {
         this.context = context
         this.activity = activity

+ 1 - 1
app/src/main/java/com/vpn/fastestvpnservice/viewmodels/BillingViewModel.kt

@@ -9,7 +9,7 @@ import com.android.billingclient.api.Purchase
 import com.android.billingclient.api.PurchasesUpdatedListener
 import com.android.billingclient.api.SkuDetails
 import com.android.billingclient.api.SkuDetailsParams
-import com.vpn.fastestvpnservice.application.App
+import de.blinkt.openvpn.core.App
 import com.vpn.fastestvpnservice.application.BaseApplication
 import com.vpn.fastestvpnservice.beans.ProductFeatures
 import com.vpn.fastestvpnservice.beans.UpgradePriceList

+ 1 - 1
app/src/main/java/com/vpn/fastestvpnservice/viewmodels/SubscriptionViewModel.kt

@@ -22,7 +22,7 @@ import com.android.billingclient.api.SkuDetailsParams
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.vpn.fastestvpnservice.R
-import com.vpn.fastestvpnservice.application.App
+import de.blinkt.openvpn.core.App
 import com.vpn.fastestvpnservice.beans.DataResponse
 import com.vpn.fastestvpnservice.beans.DataResponseServers
 import com.vpn.fastestvpnservice.beans.Features

+ 4 - 0
app/src/main/java/de/blinkt/openvpn/core/App.java

@@ -65,6 +65,10 @@ public class App extends /*com.orm.SugarApp*/ Application {
     public static App mInstance = null;
     public static IOpenVPNServiceInternal mService = null;
 
+    public static final int DISCONNECTED = 0;
+    public static final int CONNECTING = 1;
+    public static final int CONNECTED = 2;
+
     public static WgTunnel getTunnel() {
         try {
             tunnel.getName();