From 5dc693c64c14000a3a03903736d000a45795bcee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 9 Sep 2013 12:59:53 +0200 Subject: Make asciiArmor a parameter, extend advanced app settings --- .../keychain/demo/CryptoProviderDemoActivity.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java') 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 db84a1742..f60db04b2 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 @@ -74,7 +74,7 @@ public class CryptoProviderDemoActivity extends Activity { @Override public void onSuccess(final byte[] outputBytes, CryptoSignatureResult signatureResult) throws RemoteException { - Log.d(Constants.TAG, "onEncryptSignSuccess"); + Log.d(Constants.TAG, "encryptCallback"); runOnUiThread(new Runnable() { @@ -92,12 +92,12 @@ public class CryptoProviderDemoActivity extends Activity { }; - final ICryptoCallback.Stub decryptCallback = new ICryptoCallback.Stub() { + final ICryptoCallback.Stub decryptAndVerifyCallback = new ICryptoCallback.Stub() { @Override public void onSuccess(final byte[] outputBytes, final CryptoSignatureResult signatureResult) throws RemoteException { - Log.d(Constants.TAG, "onDecryptVerifySuccess"); + Log.d(Constants.TAG, "decryptAndVerifyCallback"); runOnUiThread(new Runnable() { @@ -136,7 +136,7 @@ public class CryptoProviderDemoActivity extends Activity { try { mCryptoServiceConnection.getService().encrypt(inputBytes, - mEncryptUserIds.getText().toString().split(","), encryptCallback); + mEncryptUserIds.getText().toString().split(","), true, encryptCallback); } catch (RemoteException e) { Log.e(Constants.TAG, "CryptoProviderDemo", e); } @@ -146,7 +146,7 @@ public class CryptoProviderDemoActivity extends Activity { byte[] inputBytes = mMessage.getText().toString().getBytes(); try { - mCryptoServiceConnection.getService().sign(inputBytes, encryptCallback); + mCryptoServiceConnection.getService().sign(inputBytes, true, encryptCallback); } catch (RemoteException e) { Log.e(Constants.TAG, "CryptoProviderDemo", e); } @@ -157,17 +157,18 @@ public class CryptoProviderDemoActivity extends Activity { try { mCryptoServiceConnection.getService().encryptAndSign(inputBytes, - mEncryptUserIds.getText().toString().split(","), encryptCallback); + mEncryptUserIds.getText().toString().split(","), true, encryptCallback); } catch (RemoteException e) { Log.e(Constants.TAG, "CryptoProviderDemo", e); } } - public void decryptOnClick(View view) { + public void decryptAndVerifyOnClick(View view) { byte[] inputBytes = mCiphertext.getText().toString().getBytes(); try { - mCryptoServiceConnection.getService().decryptAndVerify(inputBytes, decryptCallback); + mCryptoServiceConnection.getService().decryptAndVerify(inputBytes, + decryptAndVerifyCallback); } catch (RemoteException e) { Log.e(Constants.TAG, "CryptoProviderDemo", e); } -- cgit v1.2.3