aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
diff options
context:
space:
mode:
authorAshley Hughes <spirit.returned@gmail.com>2014-02-01 17:29:23 +0000
committerAshley Hughes <spirit.returned@gmail.com>2014-02-01 17:29:23 +0000
commit1e565ef8724453e2ab3c5f661b270f7ead78cce3 (patch)
tree0af54d9b871ddb2053053110600518c9678f32ed /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
parent65d328be14d5b77dc4b787960ae7eb398417acea (diff)
parentabbdfd48dfef1a2cea5ac065bdbb4199e2b3b7de (diff)
downloadopen-keychain-1e565ef8724453e2ab3c5f661b270f7ead78cce3.tar.gz
open-keychain-1e565ef8724453e2ab3c5f661b270f7ead78cce3.tar.bz2
open-keychain-1e565ef8724453e2ab3c5f661b270f7ead78cce3.zip
Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java')
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index 638036701..e1cefbed1 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -330,7 +330,7 @@ public class ViewKeyActivity extends SherlockFragmentActivity implements
creationDate));
}
- // get creation date from EXPIRY
+ // get expiry date from EXPIRY
if (data.isNull(KEYS_INDEX_EXPIRY)) {
mExpiry.setText(R.string.none);
} else {
@@ -346,7 +346,7 @@ public class ViewKeyActivity extends SherlockFragmentActivity implements
byte[] fingerprintBlob = data.getBlob(KEYS_INDEX_FINGERPRINT);
if (fingerprintBlob == null) {
- // FALLBACK for old databases
+ // FALLBACK for old database entries
fingerprintBlob = ProviderHelper.getFingerprint(this, mDataUri);
}
String fingerprint = PgpKeyHelper.convertFingerprintToHex(fingerprintBlob, true);