put signatureType where it belongs

1 files changed, 8 insertions, 8 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
index 589b06274..e370f5cf6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
@@ -276,14 +276,6 @@ public class PgpSignEncrypt {
             mEncryptionMasterKeyIds[mEncryptionMasterKeyIds.length - 1] = mSignatureMasterKeyId;
         }
 
-        int signatureType;
-        if (mEnableAsciiArmorOutput && enableSignature && !enableEncryption && !enableCompression) {
-            // for sign-only ascii text
-            signatureType = PGPSignature.CANONICAL_TEXT_DOCUMENT;
-        } else {
-            signatureType = PGPSignature.BINARY_DOCUMENT;
-        }
-
         ArmoredOutputStream armorOut = null;
         OutputStream out;
         if (mEnableAsciiArmorOutput) {
@@ -377,6 +369,14 @@ public class PgpSignEncrypt {
                     signingKey.getPublicKey().getAlgorithm(), mSignatureHashAlgorithm)
                     .setProvider(Constants.BOUNCY_CASTLE_PROVIDER_NAME);
 
+            int signatureType;
+            if (mEnableAsciiArmorOutput && !enableEncryption) {
+                // for sign-only ascii text and sign-only binary input (files)
+                signatureType = PGPSignature.CANONICAL_TEXT_DOCUMENT;
+            } else {
+                signatureType = PGPSignature.BINARY_DOCUMENT;
+            }
+
             if (mSignatureForceV3) {
                 signatureV3Generator = new PGPV3SignatureGenerator(contentSignerBuilder);
                 signatureV3Generator.init(signatureType, signaturePrivateKey);