android: Import local identity for all authentication types

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java
index eae76837825edd4211b14c540174852812088aae..14fa70014f26bb48b5f21fff9da725013732c19f 100644 (file)
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java
@@ -505,6 +505,8 @@ public class VpnProfileImportActivity extends AppCompatActivity
                JSONObject local = obj.optJSONObject("local");
                if (local != null)
                {
+                       profile.setLocalId(local.optString("id", null));
+
                        if (type.has(VpnTypeFeature.USER_PASS))
                        {
                                profile.setUsername(local.optString("eap_id", null));
@@ -512,7 +514,6 @@ public class VpnProfileImportActivity extends AppCompatActivity
 
                        if (type.has(VpnTypeFeature.CERTIFICATE))
                        {
-                               profile.setLocalId(local.optString("id", null));
                                profile.PKCS12 = decodeBase64(local.optString("p12", null));
 
                                if (local.optBoolean("rsa-pss", false))