PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Edited comments

Browse source
This commit is contained in:
Alex Fong 2016-04-17 18:07:23 +08:00
parent 89cf3bb6d9
commit 01c2e1429b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
View file

@ -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;
}