cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

recent 1.0.x changes into trunk

Browse Source
This commit is contained in:
Thialfihar
2010-06-17 13:08:28 +00:00
parent 720e5371e0
commit 865c998abd
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/org/thialfihar/android/apg/Apg.java
View File

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