cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Slight layout change, keep id on single line

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-04-03 01:06:11 +02:00
parent ee7706b5e9
commit 650fb911ff
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/RemoteSelectIdKeyActivity.java
View File

@@ -444,12 +444,14 @@ public class RemoteSelectIdKeyActivity extends FragmentActivity {
void bind(KeyInfo keyInfo, Drawable selectionIcon) { void bind(KeyInfo keyInfo, Drawable selectionIcon) {
Context context = vCreation.getContext(); Context context = vCreation.getContext();
String email = keyInfo.getEmail();
String name = keyInfo.getName(); String name = keyInfo.getName();
if (name != null) { if (email != null) {
vName.setText(context.getString(R.string.use_key, email));
} else if (name != null) {
vName.setText(context.getString(R.string.use_key, name)); vName.setText(context.getString(R.string.use_key, name));
} else { } else {
String email = keyInfo.getEmail(); vName.setText(context.getString(R.string.use_key_no_name));
vName.setText(context.getString(R.string.use_key, email));
} }
String dateTime = DateUtils.formatDateTime(context, keyInfo.getCreationDate(), String dateTime = DateUtils.formatDateTime(context, keyInfo.getCreationDate(),

2
OpenKeychain/src/main/res/layout/api_select_identity_item.xml
View File

@@ -30,6 +30,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:maxLines="1"
android:ellipsize="end"
tools:text="Use key: look@my.amazin.horse" tools:text="Use key: look@my.amazin.horse"
/> />