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

Working version with openssl 1.1.1l Updated #131

Merged
merged 11 commits into from
Nov 21, 2022
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 30
compileSdkVersion 33
defaultConfig {
minSdkVersion 16
targetSdkVersion 30
targetSdkVersion 33
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".view.MainActivity">
<activity android:name=".view.MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand All @@ -33,7 +34,8 @@

<service
android:name="de.blinkt.openvpn.core.OpenVPNService"
android:permission="android.permission.BIND_VPN_SERVICE">
android:permission="android.permission.BIND_VPN_SERVICE"
android:exported="true">
<intent-filter>
<action android:name="android.net.VpnService" />
</intent-filter>
Expand Down
9 changes: 5 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
buildscript {
repositories {
google()
jcenter()

mavenCentral()


}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.android.tools.build:gradle:4.0.2'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -17,7 +18,7 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
mavenCentral()
maven { url "https://jitpack.io" }

}
Expand Down
61 changes: 54 additions & 7 deletions vpnLib/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,13 @@ else if (channel.equals(NOTIFICATION_CHANNEL_USERREQ_ID))
nBuilder.setOngoing(true);
nBuilder.setSmallIcon(R.drawable.ic_notification);
if (status == LEVEL_WAITING_FOR_USER_INPUT) {
PendingIntent pIntent = PendingIntent.getActivity(this, 0, intent, 0);
PendingIntent pIntent = null;
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
pIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_IMMUTABLE);
}
else{
pIntent = PendingIntent.getActivity(this, 0, intent, 0);
}
nBuilder.setContentIntent(pIntent);
} else {
PendingIntent contentPendingIntent = getContentIntent();
Expand Down Expand Up @@ -449,21 +455,42 @@ private void jbNotificationExtras(int priority,
private void addVpnActionsToNotification(Notification.Builder nbuilder) {
Intent disconnectVPN = new Intent(this, DisconnectVPNActivity.class);
disconnectVPN.setAction(DISCONNECT_VPN);
PendingIntent disconnectPendingIntent = PendingIntent.getActivity(this, 0, disconnectVPN, 0);
PendingIntent disconnectPendingIntent = null;
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
disconnectPendingIntent = PendingIntent.getActivity(this, 0, disconnectVPN, PendingIntent.FLAG_IMMUTABLE);
}
else {
disconnectPendingIntent = PendingIntent.getActivity(this, 0, disconnectVPN, 0);

}

nbuilder.addAction(R.drawable.ic_menu_close_clear_cancel,
getString(R.string.cancel_connection), disconnectPendingIntent);

Intent pauseVPN = new Intent(this, OpenVPNService.class);
if (mDeviceStateReceiver == null || !mDeviceStateReceiver.isUserPaused()) {
pauseVPN.setAction(PAUSE_VPN);
PendingIntent pauseVPNPending = PendingIntent.getService(this, 0, pauseVPN, 0);
PendingIntent pauseVPNPending = null;
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
pauseVPNPending = PendingIntent.getService(this, 0, pauseVPN, PendingIntent.FLAG_IMMUTABLE);
}
else {
pauseVPNPending = PendingIntent.getService(this, 0, pauseVPN, 0);

}
nbuilder.addAction(R.drawable.ic_menu_pause,
getString(R.string.pauseVPN), pauseVPNPending);

} else {
pauseVPN.setAction(RESUME_VPN);
PendingIntent resumeVPNPending = PendingIntent.getService(this, 0, pauseVPN, 0);
PendingIntent resumeVPNPending = null;
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
resumeVPNPending = PendingIntent.getService(this, 0, pauseVPN, PendingIntent.FLAG_IMMUTABLE);
}
else {
resumeVPNPending = PendingIntent.getService(this, 0, pauseVPN, 0);

}
nbuilder.addAction(R.drawable.ic_menu_play,
getString(R.string.resumevpn), resumeVPNPending);
}
Expand All @@ -475,7 +502,14 @@ PendingIntent getUserInputIntent(String needed) {
intent.putExtra("need", needed);
Bundle b = new Bundle();
b.putString("need", needed);
PendingIntent pIntent = PendingIntent.getActivity(this, 12, intent, 0);
PendingIntent pIntent = null;
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
pIntent = PendingIntent.getActivity(this, 12, intent, PendingIntent.FLAG_IMMUTABLE);
}
else {
pIntent = PendingIntent.getActivity(this, 12, intent, 0);

}
return pIntent;
}

Expand All @@ -488,7 +522,13 @@ PendingIntent getGraphPendingIntent() {

intent.putExtra("PAGE", "graph");
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
PendingIntent startLW = PendingIntent.getActivity(this, 0, intent, 0);
PendingIntent startLW = null;
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
startLW = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_IMMUTABLE);
}
else {
startLW = PendingIntent.getActivity(this, 0, intent, 0);
}
return startLW;
}

Expand Down Expand Up @@ -1390,7 +1430,14 @@ public void trigger_sso(String info) {

// updateStateString trigger the notification of the VPN to be refreshed, save this intent
// to have that notification also this intent to be set
PendingIntent pIntent = PendingIntent.getActivity(this, 0, intent, 0);
PendingIntent pIntent = null;
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
pIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_IMMUTABLE);
}
else {
pIntent = PendingIntent.getActivity(this, 0, intent, 0);

}
VpnStatus.updateStateString("USER_INPUT", "waiting for user input", reason, LEVEL_WAITING_FOR_USER_INPUT, intent);
nbuilder.setContentIntent(pIntent);

Expand Down
Binary file modified vpnLib/src/main/jniLibs/arm64-v8a/libopenvpn.so
Binary file not shown.
Binary file modified vpnLib/src/main/jniLibs/arm64-v8a/libovpnexec.so
Binary file not shown.
Binary file added vpnLib/src/main/jniLibs/arm64-v8a/libovpnutil.so
Binary file not shown.
Binary file modified vpnLib/src/main/jniLibs/armeabi-v7a/libopenvpn.so
Binary file not shown.
Binary file modified vpnLib/src/main/jniLibs/armeabi-v7a/libovpnexec.so
Binary file not shown.
Binary file not shown.
Binary file modified vpnLib/src/main/jniLibs/x86/libopenvpn.so
Binary file not shown.
Binary file modified vpnLib/src/main/jniLibs/x86/libovpnexec.so
Binary file not shown.
Binary file added vpnLib/src/main/jniLibs/x86/libovpnutil.so
Binary file not shown.
Binary file modified vpnLib/src/main/jniLibs/x86_64/libopenvpn.so
Binary file not shown.
Binary file modified vpnLib/src/main/jniLibs/x86_64/libovpnexec.so
Binary file not shown.
Binary file added vpnLib/src/main/jniLibs/x86_64/libovpnutil.so
Binary file not shown.