From 3d59796337e99c0153cf173eba617d156f158d3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 15 Feb 2014 15:46:30 +0100 Subject: Fix problem with unparceling by setting class loader in api lib, remove unneeded aidl classes --- .../keychain/demo/OpenPgpProviderActivity.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'OpenPGP-Keychain-API/example-app') diff --git a/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java b/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java index dee977657..7e71ca45f 100644 --- a/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java +++ b/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Dominik Schürmann + * Copyright (C) 2013-2014 Dominik Schürmann * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,6 @@ import org.openintents.openpgp.util.OpenPgpServiceConnection; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.InputStream; -import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.List; @@ -196,7 +195,7 @@ public class OpenPgpProviderActivity extends Activity { InputStream is = getInputstream(false); final ByteArrayOutputStream os = new ByteArrayOutputStream(); - OpenPgpApi api = new OpenPgpApi(mCryptoServiceConnection.getService()); + OpenPgpApi api = new OpenPgpApi(this, mCryptoServiceConnection.getService()); api.sign(params, is, os, new MyCallback(true, os, REQUEST_CODE_SIGN)); } @@ -207,7 +206,7 @@ public class OpenPgpProviderActivity extends Activity { InputStream is = getInputstream(false); final ByteArrayOutputStream os = new ByteArrayOutputStream(); - OpenPgpApi api = new OpenPgpApi(mCryptoServiceConnection.getService()); + OpenPgpApi api = new OpenPgpApi(this, mCryptoServiceConnection.getService()); api.encrypt(params, is, os, new MyCallback(true, os, REQUEST_CODE_ENCRYPT)); } @@ -218,7 +217,7 @@ public class OpenPgpProviderActivity extends Activity { InputStream is = getInputstream(false); final ByteArrayOutputStream os = new ByteArrayOutputStream(); - OpenPgpApi api = new OpenPgpApi(mCryptoServiceConnection.getService()); + OpenPgpApi api = new OpenPgpApi(this, mCryptoServiceConnection.getService()); api.signAndEncrypt(params, is, os, new MyCallback(true, os, REQUEST_CODE_SIGN_AND_ENCRYPT)); } @@ -228,7 +227,7 @@ public class OpenPgpProviderActivity extends Activity { InputStream is = getInputstream(true); final ByteArrayOutputStream os = new ByteArrayOutputStream(); - OpenPgpApi api = new OpenPgpApi(mCryptoServiceConnection.getService()); + OpenPgpApi api = new OpenPgpApi(this, mCryptoServiceConnection.getService()); api.decryptAndVerify(params, is, os, new MyCallback(true, os, REQUEST_CODE_DECRYPT_AND_VERIFY)); } -- cgit v1.2.3