denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: Import local identity for all authentication types

Browse Source
This commit is contained in:
Tobias Brunner
2019-10-15 17:05:56 +02:00
parent 698a18e7a5
commit a82673346e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java
+2 -1
View File
@@ -505,6 +505,8 @@ public class VpnProfileImportActivity extends AppCompatActivity
JSONObject local = obj.optJSONObject("local"); JSONObject local = obj.optJSONObject("local");
if (local != null) if (local != null)
{ {
profile.setLocalId(local.optString("id", null));
if (type.has(VpnTypeFeature.USER_PASS)) if (type.has(VpnTypeFeature.USER_PASS))
{ {
profile.setUsername(local.optString("eap_id", null)); profile.setUsername(local.optString("eap_id", null));
@@ -512,7 +514,6 @@ public class VpnProfileImportActivity extends AppCompatActivity
if (type.has(VpnTypeFeature.CERTIFICATE)) if (type.has(VpnTypeFeature.CERTIFICATE))
{ {
profile.setLocalId(local.optString("id", null));
profile.PKCS12 = decodeBase64(local.optString("p12", null)); profile.PKCS12 = decodeBase64(local.optString("p12", null));
if (local.optBoolean("rsa-pss", false)) if (local.optBoolean("rsa-pss", false))