From 227b277931b3bfbc1d72483e79525f22cde8b242 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 6 Sep 2013 18:54:55 +0200
Subject: sign and encrypt basically working

---
 .../src/org/openintents/crypto/ICryptoService.aidl                 | 6 ++----
 .../keychain/demo/CryptoProviderDemoActivity.java                  | 7 ++-----
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'OpenPGP-Keychain-API-Demo')

diff --git a/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoService.aidl b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoService.aidl
index c84ca28fb..b74ab642c 100644
--- a/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoService.aidl
+++ b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoService.aidl
@@ -41,12 +41,10 @@ interface ICryptoService {
      *
      * @param inputBytes
      *            Byte array you want to encrypt
-     * @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);
+    oneway void sign(in byte[] inputBytes, in ICryptoCallback callback);
     
     /**
      * Encrypt and sign
@@ -60,7 +58,7 @@ interface ICryptoService {
      * @param callback
      *            Callback where to return results
      */
-    oneway void encryptAndSign(in byte[] inputBytes, in String[] encryptionUserIds, String signatureUserId, in ICryptoCallback callback);
+    oneway void encryptAndSign(in byte[] inputBytes, in String[] encryptionUserIds, in ICryptoCallback callback);
     
     /**
      * Decrypts and verifies given input bytes. If no signature is present this method
diff --git a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java
index 319820d7c..ca8824815 100644
--- a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java
+++ b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java
@@ -49,7 +49,6 @@ public class CryptoProviderDemoActivity extends Activity {
     EditText mMessage;
     EditText mCiphertext;
     EditText mEncryptUserId;
-    EditText mSignUserId;
 
     private CryptoServiceConnection mCryptoServiceConnection;
 
@@ -136,8 +135,7 @@ public class CryptoProviderDemoActivity extends Activity {
         byte[] inputBytes = mMessage.getText().toString().getBytes();
 
         try {
-            mCryptoServiceConnection.getService().sign(inputBytes,
-                    mSignUserId.getText().toString(), encryptCallback);
+            mCryptoServiceConnection.getService().sign(inputBytes, encryptCallback);
         } catch (RemoteException e) {
             Log.e(Constants.TAG, "CryptoProviderDemo", e);
         }
@@ -148,8 +146,7 @@ public class CryptoProviderDemoActivity extends Activity {
 
         try {
             mCryptoServiceConnection.getService().encryptAndSign(inputBytes,
-                    new String[] { mEncryptUserId.getText().toString() },
-                    mSignUserId.getText().toString(), encryptCallback);
+                    new String[] { mEncryptUserId.getText().toString() }, encryptCallback);
         } catch (RemoteException e) {
             Log.e(Constants.TAG, "CryptoProviderDemo", e);
         }
-- 
cgit v1.2.3