some fixes all over

2 files changed, 46 insertions, 20 deletions

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 04c8eb30e..53f39dffc 100644
--- a/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoService.aidl
+++ b/OpenPGP-Keychain-API-Demo/src/org/openintents/crypto/ICryptoService.aidl
@@ -37,30 +37,30 @@ interface ICryptoService {
     oneway void encrypt(in byte[] inputBytes, in String[] encryptionUserIds, in ICryptoCallback callback);
     
     /**
-     * Encrypt and sign
+     * Sign
      *
      * @param inputBytes
      *            Byte array you want to encrypt
-     * @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);
+    oneway void sign(in byte[] inputBytes, String signatureUserId, in ICryptoCallback callback);
     
     /**
-     * Sign
+     * Encrypt and sign
      *
      * @param inputBytes
      *            Byte array you want to encrypt
+     * @param encryptionUserIds
+     *            User Ids (emails) of recipients
      * @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 encryptAndSign(in byte[] inputBytes, in String[] encryptionUserIds, String signatureUserId, 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 4522110f0..831c269e1 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
@@ -39,15 +39,17 @@ import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+import android.widget.EditText;
 import android.widget.ListAdapter;
 import android.widget.TextView;
 
 public class CryptoProviderDemoActivity extends Activity {
     Activity mActivity;
 
-    TextView mMessageTextView;
-    TextView mCiphertextTextView;
-    TextView mDataTextView;
+    EditText mMessage;
+    EditText mCiphertext;
+    EditText mEncryptUserId;
+    EditText mSignUserId;
 
     private CryptoServiceConnection mCryptoServiceConnection;
 
@@ -58,9 +60,10 @@ public class CryptoProviderDemoActivity extends Activity {
 
         mActivity = this;
 
-        mMessageTextView = (TextView) findViewById(R.id.crypto_provider_demo_message);
-        mCiphertextTextView = (TextView) findViewById(R.id.crypto_provider_demo_ciphertext);
-        mDataTextView = (TextView) findViewById(R.id.aidl_demo_data);
+        mMessage = (EditText) findViewById(R.id.crypto_provider_demo_message);
+        mCiphertext = (EditText) findViewById(R.id.crypto_provider_demo_ciphertext);
+        mEncryptUserId = (EditText) findViewById(R.id.crypto_provider_demo_encrypt_user_id);
+        mSignUserId = (EditText) findViewById(R.id.crypto_provider_demo_sign_user_id);
 
         selectCryptoProvider();
     }
@@ -72,7 +75,9 @@ public class CryptoProviderDemoActivity extends Activity {
 
         @Override
         public void onEncryptSignSuccess(byte[] outputBytes) throws RemoteException {
-            // not needed here
+            Log.d(Constants.TAG, "onEncryptSignSuccess");
+
+            // TODO
         }
 
         @Override
@@ -80,32 +85,53 @@ public class CryptoProviderDemoActivity extends Activity {
                 throws RemoteException {
             Log.d(Constants.TAG, "onDecryptVerifySuccess");
 
-            // PgpData data = new PgpData();
-            // data.setDecryptedData(new String(outputBytes));
-            // mFragment.setMessageWithPgpData(data);
+            mMessage.setText(new String(outputBytes));
         }
 
         @Override
         public void onError(CryptoError error) throws RemoteException {
             Log.e(Constants.TAG, "onError getErrorId:" + error.getErrorId());
-            Log.e(Constants.TAG, "onError getErrorId:" + error.getMessage());
+            Log.e(Constants.TAG, "onError getMessage:" + error.getMessage());
         }
 
     };
 
     public void encryptOnClick(View view) {
-        byte[] inputBytes = mMessageTextView.getText().toString().getBytes();
+        byte[] inputBytes = mMessage.getText().toString().getBytes();
 
         try {
             mCryptoServiceConnection.getService().encrypt(inputBytes,
-                    new String[] { "dominik@dominikschuermann.de" }, callback);
+                    new String[] { mEncryptUserId.getText().toString() }, callback);
+        } catch (RemoteException e) {
+            Log.e(Constants.TAG, "CryptoProviderDemo", e);
+        }
+    }
+
+    public void signOnClick(View view) {
+        byte[] inputBytes = mMessage.getText().toString().getBytes();
+
+        try {
+            mCryptoServiceConnection.getService().sign(inputBytes,
+                    mSignUserId.getText().toString(), callback);
+        } catch (RemoteException e) {
+            Log.e(Constants.TAG, "CryptoProviderDemo", e);
+        }
+    }
+
+    public void encryptAndSignOnClick(View view) {
+        byte[] inputBytes = mMessage.getText().toString().getBytes();
+
+        try {
+            mCryptoServiceConnection.getService().encryptAndSign(inputBytes,
+                    new String[] { mEncryptUserId.getText().toString() },
+                    mSignUserId.getText().toString(), callback);
         } catch (RemoteException e) {
             Log.e(Constants.TAG, "CryptoProviderDemo", e);
         }
     }
 
     public void decryptOnClick(View view) {
-        byte[] inputBytes = mCiphertextTextView.getText().toString().getBytes();
+        byte[] inputBytes = mCiphertext.getText().toString().getBytes();
 
         try {
             mCryptoServiceConnection.getService().decryptAndVerify(inputBytes, callback);