diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-11 19:14:39 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-11 19:14:39 +0200 |
commit | bd6aeea6db7d5af5b3751453db95b6c968d54100 (patch) | |
tree | 74bf627dc98ce8cdd34eae8857130fa7547b60c1 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java | |
parent | 5346d2e8786c176ff80a9be1651fe98b7e229ce5 (diff) | |
download | open-keychain-bd6aeea6db7d5af5b3751453db95b6c968d54100.tar.gz open-keychain-bd6aeea6db7d5af5b3751453db95b6c968d54100.tar.bz2 open-keychain-bd6aeea6db7d5af5b3751453db95b6c968d54100.zip |
PgpSignEncrypt is now context-free
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java index 2b518c7e6..ec2860593 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java @@ -27,6 +27,7 @@ import org.spongycastle.openpgp.PGPObjectFactory; import org.spongycastle.openpgp.PGPPublicKeyRing; import org.spongycastle.openpgp.PGPSecretKeyRing; import org.spongycastle.openpgp.PGPUtil; +import org.sufficientlysecure.keychain.BuildConfig; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.Id; import org.sufficientlysecure.keychain.R; @@ -55,14 +56,14 @@ public class PgpHelper { Pattern.DOTALL); public static String getVersion(Context context) { - String version = null; + String version; try { PackageInfo pi = context.getPackageManager().getPackageInfo(Constants.PACKAGE_NAME, 0); version = pi.versionName; return version; } catch (NameNotFoundException e) { Log.e(Constants.TAG, "Version could not be retrieved!", e); - return "0.0.0"; + return "0.0"; } } |