From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 8 Oct 2019 13:13:55 +0000 (+0200)
Subject: android: Import local identity for all authentication types
X-Git-Tag: 5.8.2dr1~7^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a82673346e3a29b530bd1a3edffe322a62cb34a1;p=thirdparty%2Fstrongswan.git

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 eae7683782..14fa70014f 100644
--- 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))