mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Check for Always-on VPN

This commit is contained in:
M66B 2017-10-15 14:31:51 +02:00
parent 4eeadac598
commit b572773e3b
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/faircode/netguard/ActivityMain.java
View File

@ -50,6 +50,7 @@ import android.support.v7.widget.SwitchCompat;
import android.text.SpannableString;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextUtils;
import android.text.method.LinkMovementMethod;
import android.text.style.ImageSpan;
import android.text.style.UnderlineSpan;
@ -189,6 +190,14 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
prefs.edit().putBoolean("enabled", isChecked).apply();
if (isChecked) {
String alwaysOn = Settings.Secure.getString(getContentResolver(), "always_on_vpn_app");
Log.i(TAG, "Always-on=" + alwaysOn);
if (!TextUtils.isEmpty(alwaysOn) && !getPackageName().equals(alwaysOn)) {
swEnabled.setChecked(false);
Toast.makeText(ActivityMain.this, R.string.msg_always_on, Toast.LENGTH_LONG).show();
return;
}
try {
final Intent prepare = VpnService.prepare(ActivityMain.this);
if (prepare == null) {

1
app/src/main/res/values/strings.xml
View File

@ -223,6 +223,7 @@ Your internet traffic is not being sent to a remote VPN server.</string>
<string name="msg_vpn_cancelled">VPN connection cancelled\nDid you configure another VPN to be an always-on VPN?</string>
<string name="msg_on">Powering down your device with NetGuard enabled, will automatically start NetGuard on powering up your device</string>
<string name="msg_unavailable">This feature is not available on this Android version</string>
<string name="msg_always_on">Another VPN is set as Always-on VPN</string>
<string name="title_lockdown_enabled">Traffic is locked down</string>
<string name="title_unmetered_allowed">Unmetered traffic is allowed</string>