diff options
Diffstat (limited to 'org_apg/src/org/thialfihar/android/apg/Apg.java')
| -rw-r--r-- | org_apg/src/org/thialfihar/android/apg/Apg.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/org_apg/src/org/thialfihar/android/apg/Apg.java b/org_apg/src/org/thialfihar/android/apg/Apg.java index 858cde9ff..66250b4d0 100644 --- a/org_apg/src/org/thialfihar/android/apg/Apg.java +++ b/org_apg/src/org/thialfihar/android/apg/Apg.java @@ -1304,7 +1304,7 @@ public class Apg { context.getString(R.string.error_noEncryptionKeysOrPassPhrase)); } - if (signatureKeyId != 0) { + if (signatureKeyId != -1) { signingKeyRing = getSecretKeyRing(signatureKeyId); signingKey = getSigningKey(signatureKeyId); if (signingKey == null) { @@ -1333,6 +1333,7 @@ public class Apg { if (encryptionKeyIds.length == 0) { // symmetric encryption + Log.d(Constants.TAG, "encryptionKeyIds length is 0 -> symmetric encryption"); cPk.addMethod(passPhrase.toCharArray()); } for (int i = 0; i < encryptionKeyIds.length; ++i) { @@ -1346,7 +1347,7 @@ public class Apg { PGPSignatureGenerator signatureGenerator = null; PGPV3SignatureGenerator signatureV3Generator = null; - if (signatureKeyId != 0) { + if (signatureKeyId != -1) { if (progress != null) progress.setProgress(R.string.progress_preparingSignature, 10, 100); if (forceV3Signature) { @@ -1373,7 +1374,7 @@ public class Apg { compressGen = new PGPCompressedDataGenerator(compression); bcpgOut = new BCPGOutputStream(compressGen.open(encryptOut)); } - if (signatureKeyId != 0) { + if (signatureKeyId != -1) { if (forceV3Signature) { signatureV3Generator.generateOnePassVersion(false).encode(bcpgOut); } else { @@ -1394,7 +1395,7 @@ public class Apg { InputStream in = data.getInputStream(); while ((n = in.read(buffer)) > 0) { pOut.write(buffer, 0, n); - if (signatureKeyId != 0) { + if (signatureKeyId != -1) { if (forceV3Signature) { signatureV3Generator.update(buffer, 0, n); } else { @@ -1410,7 +1411,7 @@ public class Apg { literalGen.close(); - if (signatureKeyId != 0) { + if (signatureKeyId != -1) { if (progress != null) progress.setProgress(R.string.progress_generatingSignature, 95, 100); if (forceV3Signature) { |