denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: Display the selected certificate alias in the profile list

Browse Source
This commit is contained in:
Tobias Brunner
2012-08-31 18:24:45 +02:00
parent f46da851ab
commit 6de38fe88a
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/res/layout/profile_list_item.xml
+10
View File
@@ -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>
src/frontends/android/src/org/strongswan/android/ui/adapter/VpnProfileAdapter.java
+19 -1
View File
@@ -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;
}