android: Import IKE/ESP proposals
authorTobias Brunner <tobias@strongswan.org>
Tue, 14 Nov 2017 09:23:09 +0000 (10:23 +0100)
committerTobias Brunner <tobias@strongswan.org>
Fri, 17 Nov 2017 13:31:06 +0000 (14:31 +0100)
We currently don't validate them here, only when used later will they
get parsed (which includes some checks).

src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java

index cee95c3..97ba11b 100644 (file)
@@ -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");