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 f55c8357a99baad901b07c7e60429c4260e2944f..93df7b649118a720c2fa2fffadcb124fb9b81981 100644 (file)
--- 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 39e3e586a277aaa39574f39c2648271652bd948d..85dc8370a3193121f1d674e14d70cdbaf494c770 100644 (file)
--- 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;
        }