From bd6aeea6db7d5af5b3751453db95b6c968d54100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 11 Apr 2014 19:14:39 +0200
Subject: PgpSignEncrypt is now context-free

---
 .../src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java')

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";
         }
     }
 
-- 
cgit v1.2.3