mirror/openvpn-android
0
0
Fork 0
mirror of https://github.com/schwabe/ics-openvpn.git synced 2024-09-19 19:42:29 +02:00
Code

Fix OpenVPN not starting from Quick in upsidedown cake (closes #1652)

Browse Source
This commit is contained in:
Arne Schwabe 2023-10-10 19:38:44 +02:00
parent 83e20b974f
commit c53c6853dc
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
View File

@ -759,6 +759,9 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
private static String getTunConfigString(TunConfig tc) {
// The format of the string is not important, only that
// two identical configurations produce the same result
if (tc == null)
return "NULL";
String cfg = "TUNCFG UNQIUE STRING ips:";
if (tc.mLocalIP != null)
@ -1323,7 +1326,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
}
public String getTunReopenStatus() {
String currentConfiguration = getTunConfigString(mLastTunCfg);
String currentConfiguration = getTunConfigString(tunConfig);
if (currentConfiguration.equals(getTunConfigString(mLastTunCfg))) {
return "NOACTION";
} else {

11
main/src/ui/java/de/blinkt/openvpn/OpenVPNTileService.java
View File

@ -7,7 +7,6 @@ package de.blinkt.openvpn;
import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.app.PendingIntent;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@ -23,6 +22,7 @@ import de.blinkt.openvpn.core.ConnectionStatus;
import de.blinkt.openvpn.core.IOpenVPNServiceInternal;
import de.blinkt.openvpn.core.OpenVPNService;
import de.blinkt.openvpn.core.ProfileManager;
import de.blinkt.openvpn.core.VPNLaunchHelper;
import de.blinkt.openvpn.core.VpnStatus;
@ -85,14 +85,7 @@ public class OpenVPNTileService extends TileService implements VpnStatus.StateLi
@SuppressLint("Override")
@TargetApi(Build.VERSION_CODES.N)
void launchVPN(VpnProfile profile, Context context) {
Intent startVpnIntent = new Intent(Intent.ACTION_MAIN);
startVpnIntent.setClass(context, LaunchVPN.class);
startVpnIntent.putExtra(LaunchVPN.EXTRA_KEY, profile.getUUIDString());
startVpnIntent.putExtra(LaunchVPN.EXTRA_START_REASON, "QuickTile");
startVpnIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startVpnIntent.putExtra(LaunchVPN.EXTRA_HIDELOG, true);
context.startActivity(startVpnIntent);
VPNLaunchHelper.startOpenVpn(profile, getBaseContext(), "QuickTile");
}
@TargetApi(Build.VERSION_CODES.N)