From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 28 Aug 2012 12:47:00 +0000 (+0200)
Subject: android: Display the selected certificate alias in the profile list
X-Git-Tag: 5.0.1~152^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6de38fe88aac4706dd9f2b7377695e4ae8c5d6bd;p=thirdparty%2Fstrongswan.git

android: Display the selected certificate alias in the profile list
---

diff --git a/src/frontends/android/res/layout/profile_list_item.xml b/src/frontends/android/res/layout/profile_list_item.xml
index f55c8357a9..93df7b6491 100644
--- a/src/frontends/android/res/layout/profile_list_item.xml
+++ b/src/frontends/android/res/layout/profile_list_item.xml
@@ -46,4 +46,14 @@
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:layout_marginLeft="15dp" />
 
+    <TextView
+        android:id="@+id/profile_item_certificate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="?android:textColorSecondary"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:singleLine="true"
+        android:ellipsize="end"
+        android:layout_marginLeft="15dp" />
+
 </LinearLayout>
diff --git a/src/frontends/android/src/org/strongswan/android/ui/adapter/VpnProfileAdapter.java b/src/frontends/android/src/org/strongswan/android/ui/adapter/VpnProfileAdapter.java
index 39e3e586a2..85dc8370a3 100644
--- a/src/frontends/android/src/org/strongswan/android/ui/adapter/VpnProfileAdapter.java
+++ b/src/frontends/android/src/org/strongswan/android/ui/adapter/VpnProfileAdapter.java
@@ -64,7 +64,25 @@ public class VpnProfileAdapter extends ArrayAdapter<VpnProfile>
 		tv = (TextView)vpnProfileView.findViewById(R.id.profile_item_gateway);
 		tv.setText(getContext().getString(R.string.profile_gateway_label) + " " + profile.getGateway());
 		tv = (TextView)vpnProfileView.findViewById(R.id.profile_item_username);
-		tv.setText(getContext().getString(R.string.profile_username_label) + " " + profile.getUsername());
+		if (profile.getVpnType().getRequiresUsernamePassword())
+		{	/* 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());
+		}
+		else
+		{
+			tv.setVisibility(View.GONE);
+		}
+		tv = (TextView)vpnProfileView.findViewById(R.id.profile_item_certificate);
+		if (profile.getVpnType().getRequiresCertificate())
+		{
+			tv.setText(getContext().getString(R.string.profile_user_certificate_label) + " " + profile.getUserCertificateAlias());
+			tv.setVisibility(View.VISIBLE);
+		}
+		else
+		{
+			tv.setVisibility(View.GONE);
+		}
 		return vpnProfileView;
 	}