Implemented issue #53 - Change intent actions from extra ints to intent actions

11 files changed, 48 insertions, 84 deletions

diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java
index 711cdae24..9a64bc880 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java
@@ -65,27 +65,26 @@ public class KeychainIntentService extends IntentService implements ProgressDial
 
     /* extras that can be given by intent */
     public static final String EXTRA_MESSENGER = "messenger";
-    public static final String EXTRA_ACTION = "action";
     public static final String EXTRA_DATA = "data";
 
     /* possible EXTRA_ACTIONs */
-    public static final int ACTION_ENCRYPT_SIGN = 10;
+    public static final String ACTION_ENCRYPT_SIGN = "org.sufficientlysecure.serviceaction.encryt_sign";
 
-    public static final int ACTION_DECRYPT_VERIFY = 20;
+    public static final String ACTION_DECRYPT_VERIFY = "org.sufficientlysecure.serviceaction.decrypt_verify";
 
-    public static final int ACTION_SAVE_KEYRING = 30;
-    public static final int ACTION_GENERATE_KEY = 31;
-    public static final int ACTION_GENERATE_DEFAULT_RSA_KEYS = 32;
+    public static final String ACTION_SAVE_KEYRING = "org.sufficientlysecure.serviceaction.save_keyring";
+    public static final String ACTION_GENERATE_KEY = "org.sufficientlysecure.serviceaction.generate_key";
+    public static final String ACTION_GENERATE_DEFAULT_RSA_KEYS = "org.sufficientlysecure.serviceaction.generate_default_rsa_keys";
 
-    public static final int ACTION_DELETE_FILE_SECURELY = 40;
+    public static final String ACTION_DELETE_FILE_SECURELY = "org.sufficientlysecure.serviceaction.delete_file_securely";
 
-    public static final int ACTION_IMPORT_KEYRING = 50;
-    public static final int ACTION_EXPORT_KEYRING = 51;
+    public static final String ACTION_IMPORT_KEYRING = "org.sufficientlysecure.serviceaction.import_keyring";
+    public static final String ACTION_EXPORT_KEYRING = "org.sufficientlysecure.serviceaction.export_keyring";
 
-    public static final int ACTION_UPLOAD_KEYRING = 60;
-    public static final int ACTION_QUERY_KEYRING = 61;
+    public static final String ACTION_UPLOAD_KEYRING = "org.sufficientlysecure.serviceaction.upload_keyring";
+    public static final String ACTION_QUERY_KEYRING = "org.sufficientlysecure.serviceaction.query_keyring";
 
-    public static final int ACTION_SIGN_KEYRING = 70;
+    public static final String ACTION_SIGN_KEYRING = "org.sufficientlysecure.serviceaction.sign_keyring";
 
     /* keys for data bundle */
 
@@ -216,8 +215,8 @@ public class KeychainIntentService extends IntentService implements ProgressDial
             return;
         }
 
-        if (!(extras.containsKey(EXTRA_MESSENGER) || extras.containsKey(EXTRA_DATA) || extras
-                .containsKey(EXTRA_ACTION))) {
+        if (!(extras.containsKey(EXTRA_MESSENGER) || extras.containsKey(EXTRA_DATA) ||
+        		(intent.getAction() == null))) {
             Log.e(Constants.TAG,
                     "Extra bundle must contain a messenger, a data bundle, and an action!");
             return;
@@ -228,12 +227,10 @@ public class KeychainIntentService extends IntentService implements ProgressDial
 
         OtherHelper.logDebugBundle(data, "EXTRA_DATA");
 
-        int action = extras.getInt(EXTRA_ACTION);
-
+        String action = intent.getAction();
+        
         // execute action from extra bundle
-        switch (action) {
-        case ACTION_ENCRYPT_SIGN:
-
+        if( ACTION_ENCRYPT_SIGN.equals(action)) {
             try {
                 /* Input */
                 int target = data.getInt(TARGET);
@@ -382,10 +379,8 @@ public class KeychainIntentService extends IntentService implements ProgressDial
             } catch (Exception e) {
                 sendErrorToHandler(e);
             }
-
-            break;
-
-        case ACTION_DECRYPT_VERIFY:
+        }
+        else if(ACTION_DECRYPT_VERIFY.equals(action)) {
             try {
                 /* Input */
                 int target = data.getInt(TARGET);
@@ -514,11 +509,8 @@ public class KeychainIntentService extends IntentService implements ProgressDial
             } catch (Exception e) {
                 sendErrorToHandler(e);
             }
-
-            break;
-
-        case ACTION_SAVE_KEYRING:
-
+        }
+        else if(ACTION_SAVE_KEYRING.equals(action)) {
             try {
                 /* Input */
                 String oldPassPhrase = data.getString(SAVE_KEYRING_CURRENT_PASSPHRASE);
@@ -554,11 +546,8 @@ public class KeychainIntentService extends IntentService implements ProgressDial
             } catch (Exception e) {
                 sendErrorToHandler(e);
             }
-
-            break;
-
-        case ACTION_GENERATE_KEY:
-
+        }
+        else if(ACTION_GENERATE_KEY.equals(action)) {
             try {
                 /* Input */
                 int algorithm = data.getInt(GENERATE_KEY_ALGORITHM);
@@ -585,10 +574,8 @@ public class KeychainIntentService extends IntentService implements ProgressDial
             } catch (Exception e) {
                 sendErrorToHandler(e);
             }
-
-            break;
-
-        case ACTION_GENERATE_DEFAULT_RSA_KEYS:
+        }
+        else if(ACTION_GENERATE_DEFAULT_RSA_KEYS.equals(action)) {
             // generate one RSA 2048 key for signing and one subkey for encrypting!
             try {
                 /* Input */
@@ -614,10 +601,8 @@ public class KeychainIntentService extends IntentService implements ProgressDial
             } catch (Exception e) {
                 sendErrorToHandler(e);
             }
-
-            break;
-
-        case ACTION_DELETE_FILE_SECURELY:
+        }
+        else if(ACTION_DELETE_FILE_SECURELY.equals(action)) {
             try {
                 /* Input */
                 String deleteFile = data.getString(DELETE_FILE);
@@ -638,10 +623,8 @@ public class KeychainIntentService extends IntentService implements ProgressDial
             } catch (Exception e) {
                 sendErrorToHandler(e);
             }
-
-            break;
-
-        case ACTION_IMPORT_KEYRING:
+        }
+        else if(ACTION_IMPORT_KEYRING.equals(action)) {
             try {
 
                 /* Input */
@@ -688,10 +671,8 @@ public class KeychainIntentService extends IntentService implements ProgressDial
             } catch (Exception e) {
                 sendErrorToHandler(e);
             }
-
-            break;
-
-        case ACTION_EXPORT_KEYRING:
+        }
+        else if(ACTION_EXPORT_KEYRING.equals(action)) {
             try {
 
                 /* Input */
@@ -739,10 +720,8 @@ public class KeychainIntentService extends IntentService implements ProgressDial
             } catch (Exception e) {
                 sendErrorToHandler(e);
             }
-
-            break;
-
-        case ACTION_UPLOAD_KEYRING:
+        }
+        else if(ACTION_UPLOAD_KEYRING.equals(action)) {
             try {
 
                 /* Input */
@@ -766,10 +745,8 @@ public class KeychainIntentService extends IntentService implements ProgressDial
             } catch (Exception e) {
                 sendErrorToHandler(e);
             }
-
-            break;
-
-        case ACTION_QUERY_KEYRING:
+        }
+        else if(ACTION_QUERY_KEYRING.equals(action)) {
             try {
 
                 /* Input */
@@ -797,10 +774,8 @@ public class KeychainIntentService extends IntentService implements ProgressDial
             } catch (Exception e) {
                 sendErrorToHandler(e);
             }
-
-            break;
-
-        case ACTION_SIGN_KEYRING:
+        }
+        else if(ACTION_SIGN_KEYRING.equals(action)) {
             try {
 
                 /* Input */
@@ -824,13 +799,7 @@ public class KeychainIntentService extends IntentService implements ProgressDial
             } catch (Exception e) {
                 sendErrorToHandler(e);
             }
-
-            break;
-
-        default:
-            break;
         }
-
     }
 
     private void sendErrorToHandler(Exception e) {
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DecryptActivity.java
index ed81c2aa8..8b617b92b 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DecryptActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DecryptActivity.java
@@ -758,7 +758,7 @@ public class DecryptActivity extends SherlockFragmentActivity {
         // fill values for this action
         Bundle data = new Bundle();
 
-        intent.putExtra(KeychainIntentService.EXTRA_ACTION, KeychainIntentService.ACTION_DECRYPT_VERIFY);
+        intent.setAction(KeychainIntentService.ACTION_DECRYPT_VERIFY);
 
         // choose action based on input: decrypt stream, file or bytes
         if (mContentUri != null) {
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
index bc4467967..b710e69cf 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
@@ -238,8 +238,7 @@ public class EditKeyActivity extends SherlockFragmentActivity {
 
                     // Send all information needed to service generate keys in other thread
                     Intent serviceIntent = new Intent(this, KeychainIntentService.class);
-                    serviceIntent.putExtra(KeychainIntentService.EXTRA_ACTION,
-                            KeychainIntentService.ACTION_GENERATE_DEFAULT_RSA_KEYS);
+                    serviceIntent.setAction(KeychainIntentService.ACTION_GENERATE_DEFAULT_RSA_KEYS);
 
                     // fill values for this action
                     Bundle data = new Bundle();
@@ -438,8 +437,7 @@ public class EditKeyActivity extends SherlockFragmentActivity {
             // Send all information needed to service to edit key in other thread
             Intent intent = new Intent(this, KeychainIntentService.class);
 
-            intent.putExtra(KeychainIntentService.EXTRA_ACTION,
-                    KeychainIntentService.ACTION_SAVE_KEYRING);
+            intent.setAction(KeychainIntentService.ACTION_SAVE_KEYRING);
 
             // fill values for this action
             Bundle data = new Bundle();
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java
index c6b2d196a..25901d855 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java
@@ -693,7 +693,7 @@ public class EncryptActivity extends SherlockFragmentActivity {
             signOnly = (mEncryptionKeyIds == null || mEncryptionKeyIds.length == 0);
         }
 
-        intent.putExtra(KeychainIntentService.EXTRA_ACTION, KeychainIntentService.ACTION_ENCRYPT_SIGN);
+        intent.setAction(KeychainIntentService.ACTION_ENCRYPT_SIGN);
 
         // choose default settings, target and data bundle by target
         if (mStreamAndReturnUri != null) {
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index cd5a12df0..cb186ba16 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -321,7 +321,7 @@ public class ImportKeysActivity extends SherlockFragmentActivity {
             // Send all information needed to service to import key in other thread
             Intent intent = new Intent(this, KeychainIntentService.class);
 
-            intent.putExtra(KeychainIntentService.EXTRA_ACTION, KeychainIntentService.ACTION_IMPORT_KEYRING);
+            intent.setAction(KeychainIntentService.ACTION_IMPORT_KEYRING);
 
             // fill values for this action
             Bundle data = new Bundle();
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListActivity.java
index a128263c1..d96308a40 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListActivity.java
@@ -259,7 +259,7 @@ public class KeyListActivity extends SherlockFragmentActivity {
         // Send all information needed to service to export key in other thread
         Intent intent = new Intent(this, KeychainIntentService.class);
 
-        intent.putExtra(KeychainIntentService.EXTRA_ACTION, KeychainIntentService.ACTION_EXPORT_KEYRING);
+        intent.setAction(KeychainIntentService.ACTION_EXPORT_KEYRING);
 
         // fill values for this action
         Bundle data = new Bundle();
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerQueryActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerQueryActivity.java
index df8b7b374..b409698b0 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerQueryActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerQueryActivity.java
@@ -168,7 +168,7 @@ public class KeyServerQueryActivity extends SherlockFragmentActivity {
         // Send all information needed to service to query keys in other thread
         Intent intent = new Intent(this, KeychainIntentService.class);
 
-        intent.putExtra(KeychainIntentService.EXTRA_ACTION, KeychainIntentService.ACTION_QUERY_KEYRING);
+        intent.setAction(KeychainIntentService.ACTION_QUERY_KEYRING);
 
         // fill values for this action
         Bundle data = new Bundle();
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerUploadActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerUploadActivity.java
index 657044f2b..31486937d 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerUploadActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerUploadActivity.java
@@ -104,7 +104,7 @@ public class KeyServerUploadActivity extends SherlockFragmentActivity {
         // Send all information needed to service to upload key in other thread
         Intent intent = new Intent(this, KeychainIntentService.class);
 
-        intent.putExtra(KeychainIntentService.EXTRA_ACTION, KeychainIntentService.ACTION_UPLOAD_KEYRING);
+        intent.setAction(KeychainIntentService.ACTION_UPLOAD_KEYRING);
 
         // fill values for this action
         Bundle data = new Bundle();
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SignKeyActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SignKeyActivity.java
index 06d59b9a2..e8f989dff 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SignKeyActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SignKeyActivity.java
@@ -199,8 +199,7 @@ public class SignKeyActivity extends SherlockFragmentActivity {
         // Send all information needed to service to sign key in other thread
         Intent intent = new Intent(this, KeychainIntentService.class);
 
-        intent.putExtra(KeychainIntentService.EXTRA_ACTION,
-                KeychainIntentService.ACTION_SIGN_KEYRING);
+        intent.setAction(KeychainIntentService.ACTION_SIGN_KEYRING);
 
         // fill values for this action
         Bundle data = new Bundle();
@@ -251,8 +250,7 @@ public class SignKeyActivity extends SherlockFragmentActivity {
         // Send all information needed to service to upload key in other thread
         Intent intent = new Intent(this, KeychainIntentService.class);
 
-        intent.putExtra(KeychainIntentService.EXTRA_ACTION,
-                KeychainIntentService.ACTION_UPLOAD_KEYRING);
+        intent.setAction(KeychainIntentService.ACTION_UPLOAD_KEYRING);
 
         // fill values for this action
         Bundle data = new Bundle();
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
index defc3bc6c..303193c9a 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
@@ -76,7 +76,7 @@ public class DeleteFileDialogFragment extends DialogFragment {
                 // fill values for this action
                 Bundle data = new Bundle();
 
-                intent.putExtra(KeychainIntentService.EXTRA_ACTION, KeychainIntentService.ACTION_DELETE_FILE_SECURELY);
+                intent.setAction(KeychainIntentService.ACTION_DELETE_FILE_SECURELY);
                 data.putString(KeychainIntentService.DELETE_FILE, deleteFile);
                 intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SectionView.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SectionView.java
index 6992cc232..997352769 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SectionView.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SectionView.java
@@ -289,8 +289,7 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
         // Send all information needed to service to edit key in other thread
         Intent intent = new Intent(mActivity, KeychainIntentService.class);
 
-        intent.putExtra(KeychainIntentService.EXTRA_ACTION,
-                KeychainIntentService.ACTION_GENERATE_KEY);
+        intent.setAction(KeychainIntentService.ACTION_GENERATE_KEY);
 
         // fill values for this action
         Bundle data = new Bundle();