Fix problem with unparceling by setting class loader in api lib, remove unneeded aidl classes

OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Dominik Schürmann <dominik@dominikschuermann.de>
+ * Copyright (C) 2013-2014 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.
@@ -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));
     }
 

OpenPGP-Keychain-API/libraries/keychain-api-library/src/main/aidl/org/openintents/openpgp/OpenPgpError.aidl

@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2014 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 org.openintents.openpgp;
-
-import org.openintents.openpgp.OpenPgpError;
-
-// Declare OpenPgpError so AIDL can find it and knows that it implements the parcelable protocol.
-parcelable OpenPgpError;

OpenPGP-Keychain-API/libraries/keychain-api-library/src/main/aidl/org/openintents/openpgp/OpenPgpSignatureResult.aidl

@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2014 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 org.openintents.openpgp;
-
-import org.openintents.openpgp.OpenPgpSignatureResult;
-
-// Declare OpenPgpSignatureResult so AIDL can find it and knows that it implements the parcelable protocol.
-parcelable OpenPgpSignatureResult;

OpenPGP-Keychain-API/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpApi.java

@@ -16,6 +16,7 @@
 
 package org.openintents.openpgp.util;
 
+import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.ParcelFileDescriptor;
@@ -30,6 +31,7 @@ import java.io.OutputStream;
 public class OpenPgpApi {
 
     IOpenPgpService mService;
+    Context mContext;
 
     private static final int OPERATION_SIGN = 0;
     private static final int OPERATION_ENCRYPT = 1;
@@ -37,7 +39,8 @@ public class OpenPgpApi {
     private static final int OPERATION_DECRYPT_VERIFY = 3;
     private static final int OPERATION_GET_KEY_IDS = 4;
 
-    public OpenPgpApi(IOpenPgpService service) {
+    public OpenPgpApi(Context context, IOpenPgpService service) {
+        this.mContext = context;
         this.mService = service;
     }
 
@@ -131,7 +134,7 @@ public class OpenPgpApi {
         try {
             params.putInt(OpenPgpConstants.PARAMS_API_VERSION, OpenPgpConstants.API_VERSION);
 
-            Bundle result = new Bundle();
+            Bundle result = null;
 
             if (operationId == OPERATION_GET_KEY_IDS) {
                 result = mService.getKeyIds(params);
@@ -174,6 +177,11 @@ public class OpenPgpApi {
                 // close() is required to halt the TransferThread
                 output.close();
 
+                // set class loader to current context to allow unparcelling
+                // of OpenPgpError and OpenPgpSignatureResult
+                // http://stackoverflow.com/a/3806769
+                result.setClassLoader(mContext.getClassLoader());
+
                 return result;
             }
         } catch (Exception e) {

libraries/keychain-api-library/src/main/aidl/org/openintents/openpgp/OpenPgpError.aidl

@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2014 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 org.openintents.openpgp;
-
-import org.openintents.openpgp.OpenPgpError;
-
-// Declare OpenPgpError so AIDL can find it and knows that it implements the parcelable protocol.
-parcelable OpenPgpError;

libraries/keychain-api-library/src/main/aidl/org/openintents/openpgp/OpenPgpSignatureResult.aidl

@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2014 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 org.openintents.openpgp;
-
-import org.openintents.openpgp.OpenPgpSignatureResult;
-
-// Declare OpenPgpSignatureResult so AIDL can find it and knows that it implements the parcelable protocol.
-parcelable OpenPgpSignatureResult;

libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpApi.java

@@ -16,6 +16,7 @@
 
 package org.openintents.openpgp.util;
 
+import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.ParcelFileDescriptor;
@@ -30,6 +31,7 @@ import java.io.OutputStream;
 public class OpenPgpApi {
 
     IOpenPgpService mService;
+    Context mContext;
 
     private static final int OPERATION_SIGN = 0;
     private static final int OPERATION_ENCRYPT = 1;
@@ -37,7 +39,8 @@ public class OpenPgpApi {
     private static final int OPERATION_DECRYPT_VERIFY = 3;
     private static final int OPERATION_GET_KEY_IDS = 4;
 
-    public OpenPgpApi(IOpenPgpService service) {
+    public OpenPgpApi(Context context, IOpenPgpService service) {
+        this.mContext = context;
         this.mService = service;
     }
 
@@ -131,7 +134,7 @@ public class OpenPgpApi {
         try {
             params.putInt(OpenPgpConstants.PARAMS_API_VERSION, OpenPgpConstants.API_VERSION);
 
-            Bundle result = new Bundle();
+            Bundle result = null;
 
             if (operationId == OPERATION_GET_KEY_IDS) {
                 result = mService.getKeyIds(params);
@@ -174,6 +177,11 @@ public class OpenPgpApi {
                 // close() is required to halt the TransferThread
                 output.close();
 
+                // set class loader to current context to allow unparcelling
+                // of OpenPgpError and OpenPgpSignatureResult
+                // http://stackoverflow.com/a/3806769
+                result.setClassLoader(mContext.getClassLoader());
+
                 return result;
             }
         } catch (Exception e) {