1 files changed, 15 insertions, 14 deletions

diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/IOpenPgpService.aidl b/OpenPGP-Keychain/src/org/openintents/openpgp/IOpenPgpService.aidl
index 69a608dc6..7cbf96b56 100644
--- a/OpenPGP-Keychain/src/org/openintents/openpgp/IOpenPgpService.aidl
+++ b/OpenPGP-Keychain/src/org/openintents/openpgp/IOpenPgpService.aidl
@@ -25,12 +25,12 @@ import org.openintents.openpgp.IOpenPgpKeyIdsCallback;
  * Results are returned to the callback, which has to be implemented on client side.
  */
 interface IOpenPgpService {
-    
+
     /**
-     * Encrypt
-     * 
-     * After successful encryption, callback's onSuccess will contain the resulting output bytes.
+     * Sign
      * 
+     * After successful signing, callback's onSuccess will contain the resulting output.
+     *
      * @param input
      *            OpenPgpData object containing String, byte[], ParcelFileDescriptor, or Uri
      * @param output
@@ -45,18 +45,17 @@ interface IOpenPgpService {
      *                Writes output to given Uri
      *            new OpenPgpData(fileDescriptor)
      *                Writes output to given ParcelFileDescriptor
-     * @param keyIds
-     *            Key Ids of recipients. Can be retrieved with getKeyIds()
      * @param callback
      *            Callback where to return results
      */
-    oneway void encrypt(in OpenPgpData input, in OpenPgpData output, in long[] keyIds, in IOpenPgpCallback callback);
+    oneway void sign(in OpenPgpData input, in OpenPgpData output, in IOpenPgpCallback callback);
+    
     
     /**
-     * Sign
+     * Encrypt
+     * 
+     * After successful encryption, callback's onSuccess will contain the resulting output.
      * 
-     * After successful signing, callback's onSuccess will contain the resulting output bytes.
-     *
      * @param input
      *            OpenPgpData object containing String, byte[], ParcelFileDescriptor, or Uri
      * @param output
@@ -71,15 +70,17 @@ interface IOpenPgpService {
      *                Writes output to given Uri
      *            new OpenPgpData(fileDescriptor)
      *                Writes output to given ParcelFileDescriptor
+     * @param keyIds
+     *            Key Ids of recipients. Can be retrieved with getKeyIds()
      * @param callback
      *            Callback where to return results
      */
-    oneway void sign(in OpenPgpData input, in OpenPgpData output, in IOpenPgpCallback callback);
+    oneway void encrypt(in OpenPgpData input, in OpenPgpData output, in long[] keyIds, in IOpenPgpCallback callback);
     
     /**
      * Sign then encrypt
      * 
-     * After successful signing and encryption, callback's onSuccess will contain the resulting output bytes.
+     * After successful signing and encryption, callback's onSuccess will contain the resulting output.
      *
      * @param input
      *            OpenPgpData object containing String, byte[], ParcelFileDescriptor, or Uri
@@ -104,9 +105,9 @@ interface IOpenPgpService {
     
     /**
      * Decrypts and verifies given input bytes. This methods handles encrypted-only, signed-and-encrypted,
-     * and also signed-only inputBytes.
+     * and also signed-only input.
      * 
-     * After successful decryption/verification, callback's onSuccess will contain the resulting output bytes.
+     * After successful decryption/verification, callback's onSuccess will contain the resulting output.
      * The signatureResult in onSuccess is only non-null if signed-and-encrypted or signed-only inputBytes were given.
      * 
      * @param input