aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
diff options
context:
space:
mode:
authorAlex Fong <alexfongg@gmail.com>2016-04-17 18:07:23 +0800
committerAlex Fong <alexfongg@gmail.com>2016-05-05 07:57:20 +0800
commit01c2e1429bfbf399856c25ad291a63d88139cfc6 (patch)
treec6511904ed7023001aa66a675d085404db6cb66e /OpenKeychain/src/main/java/org/sufficientlysecure
parent89cf3bb6d962a5baa6024a5c7d515263c79cc003 (diff)
downloadopen-keychain-01c2e1429bfbf399856c25ad291a63d88139cfc6.tar.gz
open-keychain-01c2e1429bfbf399856c25ad291a63d88139cfc6.tar.bz2
open-keychain-01c2e1429bfbf399856c25ad291a63d88139cfc6.zip
Edited comments
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
index f98ee0d06..404e07230 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
@@ -1315,7 +1315,7 @@ public class PgpKeyOperation {
ok = true;
} catch (PGPException e) {
- // if this is the master key, error!
+ // if the master key failed && it's not stripped, error!
if (sKey.getKeyID() == masterPublicKey.getKeyID() && !isDummy(sKey)) {
log.add(LogType.MSG_MF_ERROR_PASSPHRASE_MASTER, indent+1);
return null;
@@ -1347,7 +1347,7 @@ public class PgpKeyOperation {
}
if(!keysModified) {
- // no passphrase is changed
+ // no passphrase was changed
log.add(LogType.MSG_MF_ERROR_PASSPHRASES_UNCHANGED, indent+1);
return null;
}