From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 29 Jun 2017 11:00:19 +0000 (+0200)
Subject: android: Import the flag to suppress certificate requests
X-Git-Tag: 5.6.0dr1~22^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11eb7e0898656c633d7894ffa7bd2a347f463234;p=thirdparty%2Fstrongswan.git

android: Import the flag to suppress certificate requests
---

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 0625b3918d..5cfcf48954 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
@@ -463,6 +463,7 @@ public class VpnProfileImportActivity extends AppCompatActivity
 			return null;
 		}
 		ParsedVpnProfile profile = new ParsedVpnProfile();
+		Integer flags = 0;
 
 		profile.setUUID(uuid);
 		profile.setName(obj.getString("name"));
@@ -475,6 +476,11 @@ public class VpnProfileImportActivity extends AppCompatActivity
 		profile.setRemoteId(remote.optString("id", null));
 		profile.Certificate = decodeBase64(remote.optString("cert", null));
 
+		if (remote.optBoolean("certreq", false))
+		{
+			flags |= VpnProfile.FLAGS_SUPPRESS_CERT_REQS;
+		}
+
 		JSONObject local = obj.optJSONObject("local");
 		if (local != null)
 		{
@@ -517,6 +523,7 @@ public class VpnProfileImportActivity extends AppCompatActivity
 			profile.setSelectedApps(excludedApps);
 			profile.setSelectedAppsHandling(SelectedAppsHandling.SELECTED_APPS_EXCLUDE);
 		}
+		profile.setFlags(flags);
 		return profile;
 	}