From e02b59b44235d86cf06534d32244b6b39c01c713 Mon Sep 17 00:00:00 2001
From: M66B <marcel@faircode.eu>
Date: Wed, 21 Dec 2016 22:12:52 +0100
Subject: [PATCH] Added allways-on VPN hint after cancelled VPN connection

---
 app/src/main/java/eu/faircode/netguard/ActivityMain.java | 3 ++-
 app/src/main/res/values/strings.xml                      | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/netguard/ActivityMain.java b/app/src/main/java/eu/faircode/netguard/ActivityMain.java
index 7e11334c..85d8335c 100644
--- a/app/src/main/java/eu/faircode/netguard/ActivityMain.java
+++ b/app/src/main/java/eu/faircode/netguard/ActivityMain.java
@@ -508,7 +508,8 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
             if (resultCode == RESULT_OK) {
                 ServiceSinkhole.start("prepared", this);
                 checkDoze();
-            }
+            } else if (resultCode == RESULT_CANCELED)
+                Toast.makeText(this, R.string.msg_vpn_cancelled, Toast.LENGTH_LONG).show();
 
         } else if (requestCode == REQUEST_INVITE) {
             // Do nothing
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9e9eba2c..18556e6b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -202,6 +202,7 @@ Your internet traffic is not being sent to a remote VPN server.</string>
     <string name="msg_push">Incoming (push) messages are mostly handled by the system component Play services, which is allowed internet access by default</string>
     <string name="msg_system">Managing all (system) applications can be enabled in the settings</string>
     <string name="msg_issue">Please describe the problem and indicate the time of the problem:</string>
+    <string name="msg_vpn_cancelled">VPN connection cancelled\nDid you configure another VPN to be an always-on VPN?</string>
 
     <string name="title_unmetered_allowed">Unmetered traffic is allowed</string>
     <string name="title_unmetered_blocked">Unmetered traffic is blocked</string>