Merge pull request #1117 from danielnelz/development

#1042: Replaced ints with enums 

18 files changed, 108 insertions, 73 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
index d95701458..bf6a62782 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
@@ -60,6 +60,7 @@ import org.sufficientlysecure.keychain.pgp.SignEncryptParcel;
 import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
 import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralMsgIdException;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler.MessageStatus;
 import org.sufficientlysecure.keychain.util.FileHelper;
 import org.sufficientlysecure.keychain.util.InputData;
 import org.sufficientlysecure.keychain.util.Log;
@@ -126,8 +127,21 @@ public class KeychainIntentService extends IntentService implements Progressable
     public static final String SOURCE = "source";
 
     // possible targets:
-    public static final int IO_BYTES = 1;
-    public static final int IO_URI = 2;
+    public static enum IOType {
+        UNKNOWN,
+        BYTES,
+        URI;
+
+        private static final IOType[] values = values();
+
+        public static IOType fromInt(int n) {
+            if(n < 0 || n >= values.length) {
+                return UNKNOWN;
+            } else {
+                return values[n];
+            }
+        }
+    }
 
     // encrypt
     public static final String ENCRYPT_DECRYPT_INPUT_URI = "input_uri";
@@ -244,7 +258,7 @@ public class KeychainIntentService extends IntentService implements Progressable
                 CertifyResult result = op.certify(parcel, keyServerUri);
 
                 // Result
-                sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, result);
+                sendMessageToHandler(MessageStatus.OKAY, result);
 
                 break;
             }
@@ -259,7 +273,7 @@ public class KeychainIntentService extends IntentService implements Progressable
                 }
 
                 // Result
-                sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, result);
+                sendMessageToHandler(MessageStatus.OKAY, result);
 
                 break;
             }
@@ -288,7 +302,7 @@ public class KeychainIntentService extends IntentService implements Progressable
 
                     DecryptVerifyResult decryptVerifyResult = builder.build().execute();
 
-                    sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, decryptVerifyResult);
+                    sendMessageToHandler(MessageStatus.OKAY, decryptVerifyResult);
                 } catch (Exception e) {
                     sendErrorToHandler(e);
                 }
@@ -349,7 +363,7 @@ public class KeychainIntentService extends IntentService implements Progressable
                     }
 
                     // kind of awkward, but this whole class wants to pull bytes out of “data”
-                    data.putInt(KeychainIntentService.TARGET, KeychainIntentService.IO_BYTES);
+                    data.putInt(KeychainIntentService.TARGET, IOType.BYTES.ordinal());
                     data.putByteArray(KeychainIntentService.DECRYPT_CIPHERTEXT_BYTES, messageBytes);
 
                     InputData inputData = createDecryptInputData(data);
@@ -386,7 +400,7 @@ public class KeychainIntentService extends IntentService implements Progressable
                     resultData.putString(KeychainIntentServiceHandler.KEYBASE_PROOF_URL, prover.getProofUrl());
                     resultData.putString(KeychainIntentServiceHandler.KEYBASE_PRESENCE_URL, prover.getPresenceUrl());
                     resultData.putString(KeychainIntentServiceHandler.KEYBASE_PRESENCE_LABEL, prover.getPresenceLabel());
-                    sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, resultData);
+                    sendMessageToHandler(MessageStatus.OKAY, resultData);
                 } catch (Exception e) {
                     sendErrorToHandler(e);
                 }
@@ -429,7 +443,7 @@ public class KeychainIntentService extends IntentService implements Progressable
 
                     Log.logDebugBundle(resultData, "resultData");
 
-                    sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, resultData);
+                    sendMessageToHandler(MessageStatus.OKAY, resultData);
                 } catch (Exception e) {
                     sendErrorToHandler(e);
                 }
@@ -447,7 +461,7 @@ public class KeychainIntentService extends IntentService implements Progressable
                 DeleteResult result = op.execute(masterKeyIds, isSecret);
 
                 // Result
-                sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, result);
+                sendMessageToHandler(MessageStatus.OKAY, result);
 
                 break;
             }
@@ -462,7 +476,7 @@ public class KeychainIntentService extends IntentService implements Progressable
                 EditKeyResult result = op.execute(saveParcel, passphrase);
 
                 // Result
-                sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, result);
+                sendMessageToHandler(MessageStatus.OKAY, result);
 
                 break;
             }
@@ -476,7 +490,7 @@ public class KeychainIntentService extends IntentService implements Progressable
                 PromoteKeyResult result = op.execute(keyRingId);
 
                 // Result
-                sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, result);
+                sendMessageToHandler(MessageStatus.OKAY, result);
 
                 break;
             }
@@ -500,7 +514,7 @@ public class KeychainIntentService extends IntentService implements Progressable
                 }
 
                 // Result
-                sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, result);
+                sendMessageToHandler(MessageStatus.OKAY, result);
 
                 break;
             }
@@ -521,7 +535,7 @@ public class KeychainIntentService extends IntentService implements Progressable
                         : importExportOperation.importKeyRings(cache, keyServer);
 
                 // Result
-                sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, result);
+                sendMessageToHandler(MessageStatus.OKAY, result);
 
                 break;
 
@@ -537,7 +551,7 @@ public class KeychainIntentService extends IntentService implements Progressable
                 SignEncryptResult result = op.execute(inputParcel);
 
                 // Result
-                sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, result);
+                sendMessageToHandler(MessageStatus.OKAY, result);
 
                 break;
             }
@@ -560,7 +574,7 @@ public class KeychainIntentService extends IntentService implements Progressable
                         throw new PgpGeneralException("Unable to export key to selected server");
                     }
 
-                    sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY);
+                    sendMessageToHandler(MessageStatus.OKAY);
                 } catch (Exception e) {
                     sendErrorToHandler(e);
                 }
@@ -582,7 +596,7 @@ public class KeychainIntentService extends IntentService implements Progressable
     private void sendProofError(String msg) {
         Bundle bundle = new Bundle();
         bundle.putString(KeychainIntentServiceHandler.DATA_ERROR, msg);
-        sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, bundle);
+        sendMessageToHandler(MessageStatus.OKAY, bundle);
     }
 
     private void sendErrorToHandler(Exception e) {
@@ -599,14 +613,14 @@ public class KeychainIntentService extends IntentService implements Progressable
 
         Bundle data = new Bundle();
         data.putString(KeychainIntentServiceHandler.DATA_ERROR, message);
-        sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_EXCEPTION, null, data);
+        sendMessageToHandler(MessageStatus.EXCEPTION, null, data);
     }
 
-    private void sendMessageToHandler(Integer arg1, Integer arg2, Bundle data) {
+    private void sendMessageToHandler(MessageStatus status, Integer arg2, Bundle data) {
 
         Message msg = Message.obtain();
         assert msg != null;
-        msg.arg1 = arg1;
+        msg.arg1 = status.ordinal();
         if (arg2 != null) {
             msg.arg2 = arg2;
         }
@@ -623,18 +637,18 @@ public class KeychainIntentService extends IntentService implements Progressable
         }
     }
 
-    private void sendMessageToHandler(Integer arg1, OperationResult data) {
+    private void sendMessageToHandler(MessageStatus status, OperationResult data) {
         Bundle bundle = new Bundle();
         bundle.putParcelable(OperationResult.EXTRA_RESULT, data);
-        sendMessageToHandler(arg1, null, bundle);
+        sendMessageToHandler(status, null, bundle);
     }
 
-    private void sendMessageToHandler(Integer arg1, Bundle data) {
-        sendMessageToHandler(arg1, null, data);
+    private void sendMessageToHandler(MessageStatus status, Bundle data) {
+        sendMessageToHandler(status, null, data);
     }
 
-    private void sendMessageToHandler(Integer arg1) {
-        sendMessageToHandler(arg1, null, null);
+    private void sendMessageToHandler(MessageStatus status) {
+        sendMessageToHandler(status, null, null);
     }
 
     /**
@@ -651,7 +665,7 @@ public class KeychainIntentService extends IntentService implements Progressable
         data.putInt(KeychainIntentServiceHandler.DATA_PROGRESS, progress);
         data.putInt(KeychainIntentServiceHandler.DATA_PROGRESS_MAX, max);
 
-        sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_UPDATE_PROGRESS, null, data);
+        sendMessageToHandler(MessageStatus.UPDATE_PROGRESS, null, data);
     }
 
     public void setProgress(int resourceId, int progress, int max) {
@@ -664,7 +678,7 @@ public class KeychainIntentService extends IntentService implements Progressable
 
     @Override
     public void setPreventCancel() {
-        sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_PREVENT_CANCEL);
+        sendMessageToHandler(MessageStatus.PREVENT_CANCEL);
     }
 
     private InputData createDecryptInputData(Bundle data) throws IOException, PgpGeneralException {
@@ -673,35 +687,37 @@ public class KeychainIntentService extends IntentService implements Progressable
 
     private InputData createCryptInputData(Bundle data, String bytesName) throws PgpGeneralException, IOException {
         int source = data.get(SOURCE) != null ? data.getInt(SOURCE) : data.getInt(TARGET);
-        switch (source) {
-            case IO_BYTES: /* encrypting bytes directly */
+        IOType type = IOType.fromInt(source);
+        switch (type) {
+            case BYTES: /* encrypting bytes directly */
                 byte[] bytes = data.getByteArray(bytesName);
                 return new InputData(new ByteArrayInputStream(bytes), bytes.length);
 
-            case IO_URI: /* encrypting content uri */
+            case URI: /* encrypting content uri */
                 Uri providerUri = data.getParcelable(ENCRYPT_DECRYPT_INPUT_URI);
 
                 // InputStream
                 return new InputData(getContentResolver().openInputStream(providerUri), FileHelper.getFileSize(this, providerUri, 0));
 
             default:
-                throw new PgpGeneralException("No target choosen!");
+                throw new PgpGeneralException("No target chosen!");
         }
     }
 
     private OutputStream createCryptOutputStream(Bundle data) throws PgpGeneralException, FileNotFoundException {
         int target = data.getInt(TARGET);
-        switch (target) {
-            case IO_BYTES:
+        IOType type = IOType.fromInt(target);
+        switch (type) {
+            case BYTES:
                 return new ByteArrayOutputStream();
 
-            case IO_URI:
+            case URI:
                 Uri providerUri = data.getParcelable(ENCRYPT_DECRYPT_OUTPUT_URI);
 
                 return getContentResolver().openOutputStream(providerUri);
 
             default:
-                throw new PgpGeneralException("No target choosen!");
+                throw new PgpGeneralException("No target chosen!");
         }
     }
 
@@ -711,12 +727,13 @@ public class KeychainIntentService extends IntentService implements Progressable
 
     private void finalizeCryptOutputStream(Bundle data, Bundle resultData, OutputStream outStream, String bytesName) {
         int target = data.getInt(TARGET);
-        switch (target) {
-            case IO_BYTES:
+        IOType type = IOType.fromInt(target);
+        switch (type) {
+            case BYTES:
                 byte output[] = ((ByteArrayOutputStream) outStream).toByteArray();
                 resultData.putByteArray(bytesName, output);
                 break;
-            case IO_URI:
+            case URI:
                 // nothing, output was written, just send okay and verification bundle
 
                 break;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java
index 635fe86f1..bd047518d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java
@@ -32,11 +32,25 @@ import org.sufficientlysecure.keychain.util.Log;
 
 public class KeychainIntentServiceHandler extends Handler {
 
-    // possible messages send from this service to handler on ui
-    public static final int MESSAGE_OKAY = 1;
-    public static final int MESSAGE_EXCEPTION = 2;
-    public static final int MESSAGE_UPDATE_PROGRESS = 3;
-    public static final int MESSAGE_PREVENT_CANCEL = 4;
+    // possible messages sent from this service to handler on ui
+    public static enum MessageStatus{
+        UNKNOWN,
+        OKAY,
+        EXCEPTION,
+        UPDATE_PROGRESS,
+        PREVENT_CANCEL;
+
+        private static final MessageStatus[] values = values();
+
+        public static MessageStatus fromInt(int n)
+        {
+            if(n < 0 || n >= values.length) {
+                return UNKNOWN;
+            } else {
+                return values[n];
+            }
+        }
+    }
 
     // possible data keys for messages
     public static final String DATA_ERROR = "error";
@@ -103,13 +117,14 @@ public class KeychainIntentServiceHandler extends Handler {
             return;
         }
 
-        switch (message.arg1) {
-            case MESSAGE_OKAY:
+        MessageStatus status = MessageStatus.fromInt(message.arg1);
+        switch (status) {
+            case OKAY:
                 mProgressDialogFragment.dismissAllowingStateLoss();
 
                 break;
 
-            case MESSAGE_EXCEPTION:
+            case EXCEPTION:
                 mProgressDialogFragment.dismissAllowingStateLoss();
 
                 // show error from service
@@ -121,7 +136,7 @@ public class KeychainIntentServiceHandler extends Handler {
 
                 break;
 
-            case MESSAGE_UPDATE_PROGRESS:
+            case UPDATE_PROGRESS:
                 if (data.containsKey(DATA_PROGRESS) && data.containsKey(DATA_PROGRESS_MAX)) {
 
                     // update progress from service
@@ -139,7 +154,7 @@ public class KeychainIntentServiceHandler extends Handler {
 
                 break;
 
-            case MESSAGE_PREVENT_CANCEL:
+            case PREVENT_CANCEL:
                 mProgressDialogFragment.setPreventCancel(true);
                 break;
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
index e1467ec61..1e1bd32c1 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
@@ -395,7 +395,7 @@ public class CertifyKeyFragment extends LoaderFragment
                     // handle messages by standard KeychainIntentServiceHandler first
                     super.handleMessage(message);
 
-                    if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
+                    if (message.arg1 == MessageStatus.OKAY.ordinal()) {
                         Bundle data = message.getData();
                         CertifyResult result = data.getParcelable(CertifyResult.EXTRA_RESULT);
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java
index f0ef8b9ef..c55aad1f9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java
@@ -57,7 +57,7 @@ public class ConsolidateDialogActivity extends FragmentActivity {
                 // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
-                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == MessageStatus.OKAY.ordinal()) {
                     /* don't care about the results (for now?)
 
                     // get returned data bundle
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
index 4853c61c5..ae42c891d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
@@ -214,7 +214,7 @@ public class CreateKeyFinalFragment extends Fragment {
                 // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
-                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == MessageStatus.OKAY.ordinal()) {
                     // get returned data bundle
                     Bundle returnData = message.getData();
                     if (returnData == null) {
@@ -284,7 +284,7 @@ public class CreateKeyFinalFragment extends Fragment {
                 // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
-                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == MessageStatus.OKAY.ordinal()) {
                     // TODO: upload operation needs a result!
                     // TODO: then combine these results
                     //if (result.getResult() == OperationResultParcel.RESULT_OK) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
index 5606523be..c808557a6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
@@ -37,6 +37,7 @@ import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult;
 import org.sufficientlysecure.keychain.service.KeychainIntentService;
+import org.sufficientlysecure.keychain.service.KeychainIntentService.IOType;
 import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
 import org.sufficientlysecure.keychain.ui.dialog.DeleteFileDialogFragment;
 import org.sufficientlysecure.keychain.ui.util.Notify;
@@ -182,10 +183,10 @@ public class DecryptFilesFragment extends DecryptFragment {
         // data
         Log.d(Constants.TAG, "mInputUri=" + mInputUri + ", mOutputUri=" + mOutputUri);
 
-        data.putInt(KeychainIntentService.SOURCE, KeychainIntentService.IO_URI);
+        data.putInt(KeychainIntentService.SOURCE, IOType.URI.ordinal());
         data.putParcelable(KeychainIntentService.ENCRYPT_DECRYPT_INPUT_URI, mInputUri);
 
-        data.putInt(KeychainIntentService.TARGET, KeychainIntentService.IO_URI);
+        data.putInt(KeychainIntentService.TARGET, IOType.URI.ordinal());
         data.putParcelable(KeychainIntentService.ENCRYPT_DECRYPT_OUTPUT_URI, mOutputUri);
 
         data.putString(KeychainIntentService.DECRYPT_PASSPHRASE, mPassphrase);
@@ -200,7 +201,7 @@ public class DecryptFilesFragment extends DecryptFragment {
                 // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
-                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == MessageStatus.OKAY.ordinal()) {
                     // get returned data bundle
                     Bundle returnData = message.getData();
 
@@ -256,10 +257,10 @@ public class DecryptFilesFragment extends DecryptFragment {
         // data
         Log.d(Constants.TAG, "mInputUri=" + mInputUri + ", mOutputUri=" + mOutputUri);
 
-        data.putInt(KeychainIntentService.SOURCE, KeychainIntentService.IO_URI);
+        data.putInt(KeychainIntentService.SOURCE, IOType.URI.ordinal());
         data.putParcelable(KeychainIntentService.ENCRYPT_DECRYPT_INPUT_URI, mInputUri);
 
-        data.putInt(KeychainIntentService.TARGET, KeychainIntentService.IO_URI);
+        data.putInt(KeychainIntentService.TARGET, IOType.URI.ordinal());
         data.putParcelable(KeychainIntentService.ENCRYPT_DECRYPT_OUTPUT_URI, mOutputUri);
 
         data.putString(KeychainIntentService.DECRYPT_PASSPHRASE, mPassphrase);
@@ -274,7 +275,7 @@ public class DecryptFilesFragment extends DecryptFragment {
                 // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
-                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == MessageStatus.OKAY.ordinal()) {
                     // get returned data bundle
                     Bundle returnData = message.getData();
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
index a15b23c06..1b34f6bf0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
@@ -36,6 +36,7 @@ import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.compatibility.ClipboardReflection;
 import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult;
 import org.sufficientlysecure.keychain.service.KeychainIntentService;
+import org.sufficientlysecure.keychain.service.KeychainIntentService.IOType;
 import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
 import org.sufficientlysecure.keychain.ui.util.Notify;
 import org.sufficientlysecure.keychain.util.Log;
@@ -158,7 +159,7 @@ public class DecryptTextFragment extends DecryptFragment {
         intent.setAction(KeychainIntentService.ACTION_DECRYPT_VERIFY);
 
         // data
-        data.putInt(KeychainIntentService.TARGET, KeychainIntentService.IO_BYTES);
+        data.putInt(KeychainIntentService.TARGET, IOType.BYTES.ordinal());
         data.putByteArray(KeychainIntentService.DECRYPT_CIPHERTEXT_BYTES, mCiphertext.getBytes());
         data.putString(KeychainIntentService.DECRYPT_PASSPHRASE, mPassphrase);
         data.putByteArray(KeychainIntentService.DECRYPT_NFC_DECRYPTED_SESSION_KEY, mNfcDecryptedSessionKey);
@@ -172,7 +173,7 @@ public class DecryptTextFragment extends DecryptFragment {
                 // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
-                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == MessageStatus.OKAY.ordinal()) {
                     // get returned data bundle
                     Bundle returnData = message.getData();
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
index 1e9a90fc8..8b9323f19 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
@@ -605,7 +605,7 @@ public class EditKeyFragment extends LoaderFragment implements
                 // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
-                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == MessageStatus.OKAY.ordinal()) {
 
                     // get returned data bundle
                     Bundle returnData = message.getData();
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
index ed5920cde..35dfcb87c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
@@ -128,7 +128,7 @@ public abstract class EncryptActivity extends BaseActivity {
                 // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
-                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == MessageStatus.OKAY.ordinal()) {
                     SignEncryptResult result =
                             message.getData().getParcelable(SignEncryptResult.EXTRA_RESULT);
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index 71f6fd4bf..d51e2c7fc 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -302,7 +302,7 @@ public class ImportKeysActivity extends BaseActivity {
                 // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
-                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == MessageStatus.OKAY.ordinal()) {
                     // get returned data bundle
                     Bundle returnData = message.getData();
                     if (returnData == null) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
index 948da94d8..cc8b47971 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
@@ -222,7 +222,7 @@ public class ImportKeysProxyActivity extends FragmentActivity {
                 // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
-                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == MessageStatus.OKAY.ordinal()) {
                     // get returned data bundle
                     Bundle returnData = message.getData();
                     if (returnData == null) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
index 43d893fa6..b7f9bc99f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
@@ -552,7 +552,7 @@ public class KeyListFragment extends LoaderFragment
                 // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
-                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == MessageStatus.OKAY.ordinal()) {
                     // get returned data bundle
                     Bundle returnData = message.getData();
                     if (returnData == null) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
index d1df2906d..d0cea5f05 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
@@ -132,7 +132,7 @@ public class SafeSlingerActivity extends BaseActivity {
                     // handle messages by standard KeychainIntentServiceHandler first
                     super.handleMessage(message);
 
-                    if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
+                    if (message.arg1 == MessageStatus.OKAY.ordinal()) {
                         // get returned data bundle
                         Bundle returnData = message.getData();
                         if (returnData == null) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
index e19793fd5..4fb2074a5 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
@@ -113,7 +113,7 @@ public class UploadKeyActivity extends BaseActivity {
                 // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
-                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == MessageStatus.OKAY.ordinal()) {
 
                     Toast.makeText(UploadKeyActivity.this, R.string.msg_crt_upload_success,
                             Toast.LENGTH_SHORT).show();
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index c94b29bac..56c60506a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -72,6 +72,7 @@ import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.service.KeychainIntentService;
 import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
+import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler.MessageStatus;
 import org.sufficientlysecure.keychain.ui.util.FormattingUtils;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils.State;
@@ -429,7 +430,7 @@ public class ViewKeyActivity extends BaseActivity implements
                 // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
-                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == MessageStatus.OKAY.ordinal()) {
                     Bundle data = message.getData();
                     CertifyResult result = data.getParcelable(CertifyResult.EXTRA_RESULT);
 
@@ -486,7 +487,7 @@ public class ViewKeyActivity extends BaseActivity implements
         Handler returnHandler = new Handler() {
             @Override
             public void handleMessage(Message message) {
-                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == MessageStatus.OKAY.ordinal()) {
                     setResult(RESULT_CANCELED);
                     finish();
                 }
@@ -595,7 +596,7 @@ public class ViewKeyActivity extends BaseActivity implements
                 // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
-                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == MessageStatus.OKAY.ordinal()) {
                     // get returned data bundle
                     Bundle returnData = message.getData();
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java
index d22f01a48..e20796f8f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java
@@ -368,7 +368,7 @@ public class ViewKeyTrustFragment extends LoaderFragment implements
                 // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
-                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == MessageStatus.OKAY.ordinal()) {
                     Bundle returnData = message.getData();
                     String msg = returnData.getString(KeychainIntentServiceHandler.DATA_MESSAGE);
                     SpannableStringBuilder ssb = new SpannableStringBuilder();
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
index 32789d53b..20f20c32e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
@@ -142,7 +142,7 @@ public class DeleteKeyDialogFragment extends DialogFragment {
                     public void handleMessage(Message message) {
                         super.handleMessage(message);
                         // handle messages by standard KeychainIntentServiceHandler first
-                        if (message.arg1 == MESSAGE_OKAY) {
+                        if (message.arg1 == MessageStatus.OKAY.ordinal()) {
                             try {
                                 Message msg = Message.obtain();
                                 msg.copyFrom(message);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ExportHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ExportHelper.java
index 1d78ed80e..cda5892fe 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ExportHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ExportHelper.java
@@ -124,7 +124,7 @@ public class ExportHelper {
                 // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
-                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == MessageStatus.OKAY.ordinal()) {
                     // get returned data bundle
                     Bundle data = message.getData();