From 6403ad5457af029c1f8cad088faf39271150160a Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 14 Nov 2017 10:23:09 +0100
Subject: [PATCH] android: Import IKE/ESP proposals

We currently don't validate them here, only when used later will they
get parsed (which includes some checks).
---
 .../org/strongswan/android/ui/VpnProfileImportActivity.java     | 2 ++
 1 file changed, 2 insertions(+)

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 cee95c36f..97ba11bf7 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
@@ -497,6 +497,8 @@ public class VpnProfileImportActivity extends AppCompatActivity
 			}
 		}
 
+		profile.setIkeProposal(obj.optString("ike-proposal", null));
+		profile.setEspProposal(obj.optString("esp-proposal", null));
 		profile.setMTU(getInteger(obj, "mtu", Constants.MTU_MIN, Constants.MTU_MAX));
 		profile.setNATKeepAlive(getInteger(obj, "nat-keepalive", Constants.NAT_KEEPALIVE_MIN, Constants.NAT_KEEPALIVE_MAX));
 		JSONObject split = obj.optJSONObject("split-tunneling");