recent 1.0.x changes into trunk

1 files changed, 3 insertions, 7 deletions

diff --git a/src/org/thialfihar/android/apg/Apg.java b/src/org/thialfihar/android/apg/Apg.java
index 77e64d27a..8ccc3a2c0 100644
--- a/src/org/thialfihar/android/apg/Apg.java
+++ b/src/org/thialfihar/android/apg/Apg.java
@@ -152,7 +152,6 @@ public class Apg {
             Uri.parse("content://" + AUTHORITY + "/key_rings/public/emails/");

 

     private static String VERSION = null;

-    private static String FULL_VERSION = null;

 

     private static final int[] PREFERRED_SYMMETRIC_ALGORITHMS =

             new int[] {

@@ -1131,7 +1130,7 @@ public class Apg {
         OutputStream encryptOut = null;

         if (armored) {

             armorOut = new ArmoredOutputStream(outStream);

-            armorOut.setHeader("Version", FULL_VERSION);

+            armorOut.setHeader("Version", getFullVersion(context));

             out = armorOut;

         } else {

             out = outStream;

@@ -1251,7 +1250,7 @@ public class Apg {
         Security.addProvider(new BouncyCastleProvider());

 

         ArmoredOutputStream armorOut = new ArmoredOutputStream(outStream);

-        armorOut.setHeader("Version", FULL_VERSION);

+        armorOut.setHeader("Version", getFullVersion(context));

 

         PGPSecretKey signingKey = null;

         PGPSecretKeyRing signingKeyRing = null;

@@ -1853,9 +1852,6 @@ public class Apg {
     }

 

     public static String getFullVersion(Context context) {

-        if (FULL_VERSION == null) {

-            FULL_VERSION = "APG v" + getVersion(context);

-        }

-        return FULL_VERSION;

+        return "APG v" + getVersion(context);

     }

 }