moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-01-11 21:48:17 -05:00
Code Issues Releases Wiki Activity

more cleanup

Browse Source
This commit is contained in:
Dominik Schürmann 2014-11-21 23:55:04 +01:00
parent dd65d10406
commit a805069c59
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
View File

@ -155,7 +155,6 @@ public class KeychainIntentService extends IntentService implements Progressable
public static final String IMPORT_KEY_SERVER = "import_key_server"; public static final String IMPORT_KEY_SERVER = "import_key_server";
// export key // 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_FILENAME = "export_filename";
public static final String EXPORT_URI = "export_uri"; public static final String EXPORT_URI = "export_uri";
public static final String EXPORT_SECRET = "export_secret"; public static final String EXPORT_SECRET = "export_secret";
@ -181,10 +180,6 @@ public class KeychainIntentService extends IntentService implements Progressable
// decrypt/verify // decrypt/verify
public static final String RESULT_DECRYPTED_BYTES = "decrypted_data"; 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; 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 { private String getOriginalFilename(Bundle data) throws PgpGeneralException, FileNotFoundException {
int target = data.getInt(TARGET); int target = data.getInt(TARGET);
switch (target) { switch (target) {
@ -785,4 +771,13 @@ public class KeychainIntentService extends IntentService implements Progressable
break; 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);
}
} }