diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-11-21 23:55:04 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-11-21 23:55:04 +0100 |
| commit | a805069c59586775fd5790c00cbd82f4dfeddcb6 (patch) | |
| tree | aca2f20d3ab76c158a32728ea49617c90a7b6715 /OpenKeychain | |
| parent | dd65d104064edc0487c5b3c656dc6ef3ee5eede9 (diff) | |
| download | open-keychain-a805069c59586775fd5790c00cbd82f4dfeddcb6.tar.gz open-keychain-a805069c59586775fd5790c00cbd82f4dfeddcb6.tar.bz2 open-keychain-a805069c59586775fd5790c00cbd82f4dfeddcb6.zip | |
more cleanup
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | 23 |
1 files changed, 9 insertions, 14 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 2911496a6..8c5050fdf 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -155,7 +155,6 @@ public class KeychainIntentService extends IntentService implements Progressable public static final String IMPORT_KEY_SERVER = "import_key_server"; // export key - public static final String EXPORT_OUTPUT_STREAM = "export_output_stream"; public static final String EXPORT_FILENAME = "export_filename"; public static final String EXPORT_URI = "export_uri"; public static final String EXPORT_SECRET = "export_secret"; @@ -181,10 +180,6 @@ public class KeychainIntentService extends IntentService implements Progressable // decrypt/verify public static final String RESULT_DECRYPTED_BYTES = "decrypted_data"; - public static final String RESULT_DECRYPT_VERIFY_RESULT = "signature"; - - // export - public static final String RESULT_EXPORT = "exported"; Messenger mMessenger; @@ -712,15 +707,6 @@ public class KeychainIntentService extends IntentService implements Progressable } } - @Override - public int onStartCommand(Intent intent, int flags, int startId) { - if (ACTION_CANCEL.equals(intent.getAction())) { - mActionCanceled.set(true); - return START_NOT_STICKY; - } - return super.onStartCommand(intent, flags, startId); - } - private String getOriginalFilename(Bundle data) throws PgpGeneralException, FileNotFoundException { int target = data.getInt(TARGET); switch (target) { @@ -785,4 +771,13 @@ public class KeychainIntentService extends IntentService implements Progressable break; } } + + @Override + public int onStartCommand(Intent intent, int flags, int startId) { + if (ACTION_CANCEL.equals(intent.getAction())) { + mActionCanceled.set(true); + return START_NOT_STICKY; + } + return super.onStartCommand(intent, flags, startId); + } } |