aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-08-14 11:44:47 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-08-14 11:44:47 +0200
commitd0987edab96573b210ce14432432248f609b14f0 (patch)
tree785f3cc803a34f94fc7964e9bc4fe0ebd69c1055 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
parentf941431d634b1e008726ce5501ffed55cb6899de (diff)
downloadopen-keychain-d0987edab96573b210ce14432432248f609b14f0.tar.gz
open-keychain-d0987edab96573b210ce14432432248f609b14f0.tar.bz2
open-keychain-d0987edab96573b210ce14432432248f609b14f0.zip
Dont write version header by default
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index 99b622f69..a13bb9c98 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -862,7 +862,10 @@ public class ProviderHelper {
UncachedKeyRing keyRing = UncachedKeyRing.decodeFromData(data);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
- keyRing.encodeArmored(bos, PgpHelper.getFullVersion(mContext));
+ String version = PgpHelper.getVersionForHeader(mContext);
+ if (version != null) {
+ keyRing.encodeArmored(bos, version);
+ }
String armoredKey = bos.toString("UTF-8");
Log.d(Constants.TAG, "armoredKey:" + armoredKey);