Merge branch 'development' into keybase-proofs

1 files changed, 10 insertions, 15 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 954963fb6..92c64a4e1 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
@@ -92,7 +92,7 @@ import de.measite.minidns.record.Data;
 import de.measite.minidns.record.TXT;
 
 /**
- * This Service contains all important long lasting operations for APG. It receives Intents with
+ * This Service contains all important long lasting operations for OpenKeychain. It receives Intents with
  * data from the activities or other apps, queues these intents, executes them, and stops itself
  * after doing them.
  */
@@ -176,7 +176,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";
@@ -202,10 +201,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;
 
@@ -839,15 +834,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) {
@@ -912,4 +898,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);
+    }
 }