Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

android 10 support added. #57

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ apply plugin: 'com.android.application'
apply plugin: 'com.google.firebase.firebase-perf'
apply plugin: 'io.fabric'
android {
compileSdkVersion 28
compileSdkVersion 29
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
defaultConfig {
applicationId "com.buzz.vpn"
minSdkVersion 21
targetSdkVersion 28
targetSdkVersion 29
vectorDrawables.useSupportLibrary = true
// api.major.patch
// api when you obsolete the existing api
Expand All @@ -25,7 +25,7 @@ android {
versionName "2.8.2000"
//abiFilters "armeabi-v7a"
ndk {
abiFilters "arm64-v8a", "armeabi-v7a"
abiFilters "arm64-v8a", "armeabi-v7a", "x86", "x86_64"
}
resConfigs "en", "zh-rCN"
}
Expand Down
9 changes: 3 additions & 6 deletions app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,11 @@
import android.os.Message;
import android.os.ParcelFileDescriptor;
import android.os.RemoteException;

import androidx.annotation.RequiresApi;
import androidx.core.app.NotificationCompat;
import android.system.OsConstants;
import android.text.TextUtils;
import android.util.Log;
import android.widget.Toast;

import com.buzz.vpn.BuildConfig;
import com.buzz.vpn.Data;
import com.buzz.vpn.MainActivity;
import com.buzz.vpn.R;
Expand All @@ -59,7 +55,8 @@
import java.util.Vector;
import java.util.concurrent.TimeUnit;


import androidx.annotation.RequiresApi;
import androidx.core.app.NotificationCompat;
import de.blinkt.openvpn.VpnProfile;
import de.blinkt.openvpn.core.VpnStatus.ByteCountListener;
import de.blinkt.openvpn.core.VpnStatus.StateListener;
Expand Down Expand Up @@ -540,7 +537,7 @@ private void startOpenVPN() {
// Start a new session by creating a new thread.
SharedPreferences prefs = Preferences.getDefaultSharedPreferences(this);
mOvpn3 = prefs.getBoolean("ovpn3", false);
if (!"ovpn3".equals(BuildConfig.FLAVOR)) mOvpn3 = false;
//if (!"ovpn3".equals(BuildConfig.FLAVOR)) mOvpn3 = false;
// Open the Management Interface
if (!mOvpn3) {
// start a Thread that handles incoming messages of the managment socket
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,16 @@ public class VPNLaunchHelper {
private static final String MINIPIEVPN = "pie_openvpn";
private static final String OVPNCONFIGFILE = "android.conf";
private static String writeMiniVPN(Context context) {
String nativeAPI = NativeUtils.getNativeAPI();
/* Q does not allow executing binaries written in temp directory anymore */
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
return new File(context.getApplicationInfo().nativeLibraryDir, "libovpnexec.so").getPath();
String[] abis;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
abis = getSupportedABIsLollipop();
else
//noinspection deprecation
abis = new String[]{Build.CPU_ABI, Build.CPU_ABI2};
String nativeAPI = NativeUtils.getNativeAPI();
if (!nativeAPI.equals(abis[0])) {
VpnStatus.logWarning(R.string.abi_mismatch, Arrays.toString(abis), nativeAPI);
abis = new String[]{nativeAPI};
Expand Down
Binary file added app/src/main/jniLibs/arm64-v8a/libovpnexec.so
Binary file not shown.
Binary file added app/src/main/jniLibs/armeabi-v7a/libovpnexec.so
Binary file not shown.
Binary file added app/src/main/jniLibs/x86/libjbcrypto.so
Binary file not shown.
Binary file added app/src/main/jniLibs/x86/libopenvpn.so
Binary file not shown.
Binary file added app/src/main/jniLibs/x86/libopvpnutil.so
Binary file not shown.
Binary file added app/src/main/jniLibs/x86/libovpnexec.so
Binary file not shown.
Binary file added app/src/main/jniLibs/x86_64/libjbcrypto.so
Binary file not shown.
Binary file added app/src/main/jniLibs/x86_64/libopenvpn.so
Binary file not shown.
Binary file added app/src/main/jniLibs/x86_64/libopvpnutil.so
Binary file not shown.
Binary file added app/src/main/jniLibs/x86_64/libovpnexec.so
Binary file not shown.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ buildscript {

}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.3'
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.google.gms:google-services:4.3.3'
classpath 'com.google.firebase:perf-plugin:1.3.1'
classpath 'io.fabric.tools:gradle:1.30.0'
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Apr 29 07:49:03 IST 2019
#Fri Sep 04 14:33:57 IST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip