android: Don't require a password on Android 7 and newer

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
index c46605dfcbd8c9ac38a5455da14de9b573f0e021..71635123459d4443e65201e6f16ef9ef1fef768d 100644 (file)
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
@@ -307,7 +307,8 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe
                                                {
                                                        Log.i(TAG, "charon started");
 
-                                                       if (mCurrentProfile.getVpnType().has(VpnTypeFeature.USER_PASS) &&
+                                                       if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N &&
+                                                               mCurrentProfile.getVpnType().has(VpnTypeFeature.USER_PASS) &&
                                                                mCurrentProfile.getPassword() == null)
                                                        {       /* this can happen if Always-on VPN is enabled with an incomplete profile */
                                                                setError(ErrorState.PASSWORD_MISSING);

diff --git a/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_service.c b/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_service.c
index c1c1e3acd5bcc4052191a111f789f578d887bedf..9c65768f19b1afb178c492447ddacf6b574c2046 100644 (file)
--- a/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_service.c
+++ b/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_service.c
@@ -662,7 +662,10 @@ static void add_auth_cfg_pw(private_android_service_t *this,
        }
        auth->add(auth, AUTH_RULE_IDENTITY, id);
 
-       this->creds->add_username_password(this->creds, username, password);
+       if (password)
+       {
+               this->creds->add_username_password(this->creds, username, password);
+       }
        peer_cfg->add_auth_cfg(peer_cfg, auth, TRUE);
 }