From: Tobias Brunner Date: Mon, 2 May 2016 16:39:26 +0000 (+0200) Subject: Merge branch 'android-gui-updates' X-Git-Tag: 5.4.1dr2~16 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b85df674a957f2b446013f4415ab06caa77d00b;p=thirdparty%2Fstrongswan.git Merge branch 'android-gui-updates' Removes the progress dialogs while connecting/disconnecting, updates the VPN profile editor (floating labels, helper texts) and allows configuration of the remote identity (disables loose identity matching), and selection of the local identity if certificates are used. Also fixes an issue when redirected during IKE_AUTH and increases the NAT-T keepalive interval. Fixes #1403. --- 5b85df674a957f2b446013f4415ab06caa77d00b