android: Only prompt for a password before initiating on Android < 7

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileControlActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileControlActivity.java
index 1497e0295ad16e7c96ee639586efc5947c18c15b..08e0d96a2bff1636ae9973f1a96a006e5847d990 100644 (file)
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileControlActivity.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileControlActivity.java
@@ -311,7 +311,9 @@ public class VpnProfileControlActivity extends AppCompatActivity
         */
        private void startVpnProfile(Bundle profileInfo)
        {
-               if (profileInfo.getBoolean(PROFILE_REQUIRES_PASSWORD) &&
+               /* only ask for the password here on older Android versions */
+               if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N &&
+                       profileInfo.getBoolean(PROFILE_REQUIRES_PASSWORD) &&
                        profileInfo.getString(VpnProfileDataSource.KEY_PASSWORD) == null)
                {
                        LoginDialogFragment login = LoginDialogFragment.newInstance(profileInfo, password -> {