From 61451fa5b5dd197eede698ff8fe590cb46ced9f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 28 May 2013 23:42:45 +0200
Subject: [PATCH] update API

---
 .../crypto/CryptoServiceConnection.java       | 16 +++++++++
 .../com/android/crypto/ICryptoService.aidl    | 34 +++++++++----------
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/OpenPGP-Keychain/src/com/android/crypto/CryptoServiceConnection.java b/OpenPGP-Keychain/src/com/android/crypto/CryptoServiceConnection.java
index 4d659d344..96a07a067 100644
--- a/OpenPGP-Keychain/src/com/android/crypto/CryptoServiceConnection.java
+++ b/OpenPGP-Keychain/src/com/android/crypto/CryptoServiceConnection.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2013 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.android.crypto;
 
 import android.content.ComponentName;
diff --git a/OpenPGP-Keychain/src/com/android/crypto/ICryptoService.aidl b/OpenPGP-Keychain/src/com/android/crypto/ICryptoService.aidl
index 05baa16e0..0f295d183 100644
--- a/OpenPGP-Keychain/src/com/android/crypto/ICryptoService.aidl
+++ b/OpenPGP-Keychain/src/com/android/crypto/ICryptoService.aidl
@@ -29,38 +29,36 @@ interface ICryptoService {
      * 
      * @param inputBytes
      *            Byte array you want to encrypt
-     * @param encryptionKeyIds
-     *            Ids of public keys used for encryption
-     * @param handler
-     *            Results are returned to this Handler after successful encryption
+     * @param encryptionUserIds
+     *            User Ids (emails) of recipients
+     * @param callback
+     *            Callback where to return results
      */
     oneway void encrypt(in byte[] inputBytes, in String[] encryptionUserIds, in ICryptoCallback callback);
     
     /**
      * Encrypt and sign
      *
-     * 
-     * 
      * @param inputBytes
      *            Byte array you want to encrypt
-     * @param signatureKeyId
-     *            Key id of key to sign with
-     * @param handler
-     *            Results are returned to this Handler after successful encryption and signing
+     * @param encryptionUserIds
+     *            User Ids (emails) of recipients
+     * @param signatureUserId
+     *            User Ids (email) of sender
+     * @param callback
+     *            Callback where to return results
      */
     oneway void encryptAndSign(in byte[] inputBytes, in String[] encryptionUserIds, String signatureUserId, in ICryptoCallback callback);
     
     /**
      * Sign
      *
-     * 
-     * 
      * @param inputBytes
      *            Byte array you want to encrypt
-     * @param signatureId
-     *            
-     * @param handler
-     *            Results are returned to this Handler after successful encryption and signing
+     * @param signatureUserId
+     *            User Ids (email) of sender
+     * @param callback
+     *            Callback where to return results
      */
     oneway void sign(in byte[] inputBytes, String signatureUserId, in ICryptoCallback callback);
     
@@ -70,8 +68,8 @@ interface ICryptoService {
      * 
      * @param inputBytes
      *            Byte array you want to decrypt and verify
-     * @param handler
-     *            Handler where to return results to after successful encryption
+     * @param callback
+     *            Callback where to return results
      */
     oneway void decryptAndVerify(in byte[] inputBytes, in ICryptoCallback callback);