Disallow disconnecting in minimal UI mode

Author: schwabe

main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java

@@ -19,6 +19,7 @@
 
 import de.blinkt.openvpn.LaunchVPN;
 import de.blinkt.openvpn.R;
+import de.blinkt.openvpn.core.GlobalPreferences;
 import de.blinkt.openvpn.core.IOpenVPNServiceInternal;
 import de.blinkt.openvpn.core.OpenVPNService;
 import de.blinkt.openvpn.core.Preferences;
@@ -82,7 +83,8 @@ private void showDisconnectDialog() {
         builder.setTitle(R.string.title_cancel);
         builder.setMessage(R.string.cancel_connection_query);
         builder.setNegativeButton(android.R.string.cancel, this);
-        builder.setPositiveButton(R.string.cancel_connection, this);
+        if (!GlobalPreferences.getForceConnected())
+            builder.setPositiveButton(R.string.cancel_connection, this);
         builder.setNeutralButton(R.string.reconnect, this);
         builder.setOnCancelListener(this);
 

main/src/main/java/de/blinkt/openvpn/api/AppRestrictions.java

@@ -174,6 +174,12 @@ private static void setMiscSettings(Context c, Bundle restrictions) {
 
 
         boolean minimalUi = restrictions.getBoolean("minimal_ui", false);
+        if (minimalUi && defaultPrefs.getBoolean("showlogwindow", true)){
+            SharedPreferences.Editor editor = defaultPrefs.edit();
+            editor.putBoolean("showlogwindow", false);
+            editor.apply();
+        }
+
         boolean forceConnected = restrictions.getBoolean("always_connected", false);
         GlobalPreferences.setInstance(minimalUi, forceConnected);
     }

main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java

@@ -426,7 +426,11 @@ private void addVpnActionsToNotification(Notification.Builder nbuilder) {
         PendingIntent disconnectPendingIntent = PendingIntent.getActivity(this, 0, disconnectVPN, PendingIntent.FLAG_IMMUTABLE);
 
         nbuilder.addAction(R.drawable.ic_menu_close_clear_cancel,
-                getString(R.string.cancel_connection), disconnectPendingIntent);
+                getString(GlobalPreferences.getForceConnected() ? R.string.reconnect : R.string.cancel_connection), disconnectPendingIntent);
+
+        /* do not allow to pause the VPN is force connection is enabled */
+        if (GlobalPreferences.getForceConnected())
+            return;
 
         Intent pauseVPN = new Intent(this, OpenVPNService.class);
         if (mDeviceStateReceiver == null || !mDeviceStateReceiver.isUserPaused()) {