From: Tobias Brunner <tobias@strongswan.org>
Date: Sat, 30 Apr 2016 15:14:34 +0000 (+0200)
Subject: android: Show selected user identity in profile list
X-Git-Tag: 5.4.1dr2~16^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e69781b1a2e15a2a6c01d9a0b67426ddbc799efc;p=thirdparty%2Fstrongswan.git

android: Show selected user identity in profile list

This also readds the colons that were removed from the labels.
---

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/adapter/VpnProfileAdapter.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/adapter/VpnProfileAdapter.java
index f3bb271bc2..58296a018c 100644
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/adapter/VpnProfileAdapter.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/adapter/VpnProfileAdapter.java
@@ -63,12 +63,18 @@ public class VpnProfileAdapter extends ArrayAdapter<VpnProfile>
 		TextView tv = (TextView)vpnProfileView.findViewById(R.id.profile_item_name);
 		tv.setText(profile.getName());
 		tv = (TextView)vpnProfileView.findViewById(R.id.profile_item_gateway);
-		tv.setText(getContext().getString(R.string.profile_gateway_label) + " " + profile.getGateway());
+		tv.setText(getContext().getString(R.string.profile_gateway_label) + ": " + profile.getGateway());
 		tv = (TextView)vpnProfileView.findViewById(R.id.profile_item_username);
 		if (profile.getVpnType().has(VpnTypeFeature.USER_PASS))
 		{	/* if the view is reused we make sure it is visible */
 			tv.setVisibility(View.VISIBLE);
-			tv.setText(getContext().getString(R.string.profile_username_label) + " " + profile.getUsername());
+			tv.setText(getContext().getString(R.string.profile_username_label) + ": " + profile.getUsername());
+		}
+		else if (profile.getVpnType().has(VpnTypeFeature.CERTIFICATE) &&
+				 profile.getLocalId() != null)
+		{
+			tv.setVisibility(View.VISIBLE);
+			tv.setText(getContext().getString(R.string.profile_user_select_id_label) + ": " + profile.getLocalId());
 		}
 		else
 		{
@@ -77,7 +83,7 @@ public class VpnProfileAdapter extends ArrayAdapter<VpnProfile>
 		tv = (TextView)vpnProfileView.findViewById(R.id.profile_item_certificate);
 		if (profile.getVpnType().has(VpnTypeFeature.CERTIFICATE))
 		{
-			tv.setText(getContext().getString(R.string.profile_user_certificate_label) + " " + profile.getUserCertificateAlias());
+			tv.setText(getContext().getString(R.string.profile_user_certificate_label) + ": " + profile.getUserCertificateAlias());
 			tv.setVisibility(View.VISIBLE);
 		}
 		else