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

ImportKeys: Get reference to canonicalized key without saving and refactoring (WIP)

Browse Source
This commit is contained in:
Andrea Torlaschi
2016-07-22 23:57:46 +02:00
parent 68b015122b
commit 15b7845b16
12 changed files with 287 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text='@{userIdEmail != null ? "Key ID: " + userIdEmail : ""}'
android:text='@{keyId != null ? "Key ID: " + keyId : ""}'
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@{revoked || expired ? revokedExpiredColor : standardColor}" />

1
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -419,6 +419,7 @@
<string name="progress_done">"Done."</string>
<string name="progress_cancel">"Cancel"</string>
<string name="progress_cancelling">"cancelling…"</string>
<string name="progress_downloading">"downloading…"</string>
<string name="progress_saving">"saving…"</string>
<string name="progress_importing">"importing…"</string>
<string name="progress_benchmarking">"benchmarking…"</string>