Removing remaining uses of Id, closing one of the oldest bugs #9

4 files changed, 27 insertions, 33 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 2cf1d99c9..692764393 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java
@@ -22,14 +22,7 @@ import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 
-import org.spongycastle.openpgp.PGPEncryptedDataList;
-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;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.ProgressDialogUpdater;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
index 480d74fc9..5b85d82a6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
@@ -31,7 +31,6 @@ import org.spongycastle.openpgp.PGPSecretKey;
 import org.spongycastle.openpgp.PGPSecretKeyRing;
 import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator;
 import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.Id;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
@@ -59,6 +58,11 @@ public class PgpImportExport {
 
     private ProviderHelper mProviderHelper;
 
+    public static final int RETURN_OK = 0;
+    public static final int RETURN_ERROR = -1;
+    public static final int RETURN_BAD = -2;
+    public static final int RETURN_UPDATED = 1;
+
     public PgpImportExport(Context context, ProgressDialogUpdater progress) {
         super();
         this.mContext = context;
@@ -112,8 +116,12 @@ public class PgpImportExport {
             return false;
         } finally {
             try {
-                if (aos != null) { aos.close(); }
-                if (bos != null) { bos.close(); }
+                if (aos != null) {
+                    aos.close();
+                }
+                if (bos != null) {
+                    bos.close();
+                }
             } catch (IOException e) {
             }
         }
@@ -142,17 +150,17 @@ public class PgpImportExport {
 
                     int status = storeKeyRingInCache(keyring);
 
-                    if (status == Id.return_value.error) {
+                    if (status == RETURN_ERROR) {
                         throw new PgpGeneralException(
                                 mContext.getString(R.string.error_saving_keys));
                     }
 
                     // update the counts to display to the user at the end
-                    if (status == Id.return_value.updated) {
+                    if (status == RETURN_UPDATED) {
                         ++oldKeys;
-                    } else if (status == Id.return_value.ok) {
+                    } else if (status == RETURN_OK) {
                         ++newKeys;
-                    } else if (status == Id.return_value.bad) {
+                    } else if (status == RETURN_BAD) {
                         ++badKeys;
                     }
                 } else {
@@ -248,12 +256,9 @@ public class PgpImportExport {
         return returnData;
     }
 
-    /**
-     * TODO: implement Id.return_value.updated as status when key already existed
-     */
     @SuppressWarnings("unchecked")
     public int storeKeyRingInCache(PGPKeyRing keyring) {
-        int status = Integer.MIN_VALUE; // out of bounds value (Id.return_value.*)
+        int status = RETURN_ERROR;
         try {
             if (keyring instanceof PGPSecretKeyRing) {
                 PGPSecretKeyRing secretKeyRing = (PGPSecretKeyRing) keyring;
@@ -265,7 +270,7 @@ public class PgpImportExport {
                         if (testSecretKey.isPrivateKeyEmpty()) {
                             // this is bad, something is very wrong...
                             save = false;
-                            status = Id.return_value.bad;
+                            status = RETURN_BAD;
                         }
                     }
                 }
@@ -286,17 +291,15 @@ public class PgpImportExport {
                         mProviderHelper.saveKeyRing(newPubRing);
                     }
                     mProviderHelper.saveKeyRing(secretKeyRing);
-                    // TODO: remove status returns, use exceptions!
-                    status = Id.return_value.ok;
+                    status = RETURN_OK;
                 }
             } else if (keyring instanceof PGPPublicKeyRing) {
                 PGPPublicKeyRing publicKeyRing = (PGPPublicKeyRing) keyring;
                 mProviderHelper.saveKeyRing(publicKeyRing);
-                // TODO: remove status returns, use exceptions!
-                status = Id.return_value.ok;
+                status = RETURN_OK;
             }
         } catch (IOException e) {
-            status = Id.return_value.error;
+            status = RETURN_ERROR;
         }
 
         return status;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
index 9ccc2fd94..32cf2041c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
@@ -48,7 +48,6 @@ import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder;
 import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder;
 
 import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.Id;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralMsgIdException;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
@@ -144,14 +143,14 @@ public class PgpKeyOperation {
         KeyPairGenerator keyGen;
 
         switch (algorithmChoice) {
-            case Id.choice.algorithm.dsa: {
+            case Constants.choice.algorithm.dsa: {
                 keyGen = KeyPairGenerator.getInstance("DSA", Constants.BOUNCY_CASTLE_PROVIDER_NAME);
                 keyGen.initialize(keySize, new SecureRandom());
                 algorithm = PGPPublicKey.DSA;
                 break;
             }
 
-            case Id.choice.algorithm.elgamal: {
+            case Constants.choice.algorithm.elgamal: {
                 if (isMasterKey) {
                     throw new PgpGeneralMsgIdException(R.string.error_master_key_must_not_be_el_gamal);
                 }
@@ -166,7 +165,7 @@ public class PgpKeyOperation {
                 break;
             }
 
-            case Id.choice.algorithm.rsa: {
+            case Constants.choice.algorithm.rsa: {
                 keyGen = KeyPairGenerator.getInstance("RSA", Constants.BOUNCY_CASTLE_PROVIDER_NAME);
                 keyGen.initialize(keySize, new SecureRandom());
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
index 8e4dbca34..c61223fe2 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
@@ -41,7 +41,6 @@ import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder;
 import org.spongycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder;
 import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator;
 import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.Id;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.util.InputData;
@@ -123,11 +122,11 @@ public class PgpSignEncrypt {
         // optional
         private ProgressDialogUpdater mProgress = null;
         private boolean mEnableAsciiArmorOutput = false;
-        private int mCompressionId = Id.choice.compression.none;
+        private int mCompressionId = Constants.choice.compression.none;
         private long[] mEncryptionMasterKeyIds = null;
         private String mSymmetricPassphrase = null;
         private int mSymmetricEncryptionAlgorithm = 0;
-        private long mSignatureMasterKeyId = Id.key.none;
+        private long mSignatureMasterKeyId = Constants.key.none;
         private int mSignatureHashAlgorithm = 0;
         private boolean mSignatureForceV3 = false;
         private String mSignaturePassphrase = null;
@@ -252,10 +251,10 @@ public class PgpSignEncrypt {
             throws IOException, PGPException, NoSuchProviderException,
             NoSuchAlgorithmException, SignatureException, KeyExtractionException, NoSigningKeyException, NoPassphraseException {
 
-        boolean enableSignature = mSignatureMasterKeyId != Id.key.none;
+        boolean enableSignature = mSignatureMasterKeyId != Constants.key.none;
         boolean enableEncryption = ((mEncryptionMasterKeyIds != null && mEncryptionMasterKeyIds.length > 0)
                 || mSymmetricPassphrase != null);
-        boolean enableCompression = (mCompressionId != Id.choice.compression.none);
+        boolean enableCompression = (mCompressionId != Constants.choice.compression.none);
 
         Log.d(Constants.TAG, "enableSignature:" + enableSignature
                 + "\nenableEncryption:" + enableEncryption