rename main folders

10 files changed, 0 insertions, 966 deletions

diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgData.java b/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgData.java
deleted file mode 100644
index 5ef20bfbb..000000000
--- a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgData.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2012 Dominik Schürmann <dominik@dominikschuermann.de>
- * Copyright (C) 2010-2011 K-9 Mail Contributors
- *
- * 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.thialfihar.android.apg.integration;
-
-import java.io.Serializable;
-import java.util.Arrays;
-
-public class ApgData implements Serializable {
-    private static final long serialVersionUID = 6314045536270848410L;
-    protected long mEncryptionKeyIds[] = null;
-    protected long mSignatureKeyId = 0;
-    protected String mSignatureUserId = null;
-    protected boolean mSignatureSuccess = false;
-    protected boolean mSignatureUnknown = false;
-    protected String mDecryptedData = null;
-    protected String mEncryptedData = null;
-
-    public void setSignatureKeyId(long keyId) {
-        mSignatureKeyId = keyId;
-    }
-
-    public long getSignatureKeyId() {
-        return mSignatureKeyId;
-    }
-
-    public void setEncryptionKeys(long keyIds[]) {
-        mEncryptionKeyIds = keyIds;
-    }
-
-    public long[] getEncryptionKeys() {
-        return mEncryptionKeyIds;
-    }
-
-    public boolean hasSignatureKey() {
-        return mSignatureKeyId != 0;
-    }
-
-    public boolean hasEncryptionKeys() {
-        return (mEncryptionKeyIds != null) && (mEncryptionKeyIds.length > 0);
-    }
-
-    public String getEncryptedData() {
-        return mEncryptedData;
-    }
-
-    public void setEncryptedData(String data) {
-        mEncryptedData = data;
-    }
-
-    public String getDecryptedData() {
-        return mDecryptedData;
-    }
-
-    public void setDecryptedData(String data) {
-        mDecryptedData = data;
-    }
-
-    public void setSignatureUserId(String userId) {
-        mSignatureUserId = userId;
-    }
-
-    public String getSignatureUserId() {
-        return mSignatureUserId;
-    }
-
-    public boolean getSignatureSuccess() {
-        return mSignatureSuccess;
-    }
-
-    public void setSignatureSuccess(boolean success) {
-        mSignatureSuccess = success;
-    }
-
-    public boolean getSignatureUnknown() {
-        return mSignatureUnknown;
-    }
-
-    public void setSignatureUnknown(boolean unknown) {
-        mSignatureUnknown = unknown;
-    }
-
-    @Override
-    public String toString() {
-        String output = "mEncryptionKeyIds: " + Arrays.toString(mEncryptionKeyIds)
-                + "\nmSignatureKeyId: " + mSignatureKeyId + "\nmSignatureUserId: "
-                + mSignatureUserId + "\nmSignatureSuccess: " + mSignatureSuccess
-                + "\nmSignatureUnknown: " + mSignatureUnknown + "\nmDecryptedData: "
-                + mDecryptedData + "\nmEncryptedData: " + mEncryptedData;
-
-        return output;
-    }
-}
\ No newline at end of file
diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java b/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java
deleted file mode 100644
index 77d1ebd42..000000000
--- a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Copyright (C) 2012 Dominik Schürmann <dominik@dominikschuermann.de>
- * Copyright (C) 2010-2011 K-9 Mail Contributors
- *
- * 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.thialfihar.android.apg.integration;
-
-import android.app.Activity;
-import android.content.ActivityNotFoundException;
-import android.content.Intent;
-import android.widget.Toast;
-
-public class ApgIntentHelper {
-
-    public static final String APG_INTENT_PREFIX = "org.thialfihar.android.apg.intent.";
-
-    // Intents
-    public static final String ACTION_DECRYPT = APG_INTENT_PREFIX + "DECRYPT";
-    public static final String ACTION_ENCRYPT = APG_INTENT_PREFIX + "ENCRYPT";
-    public static final String ACTION_DECRYPT_FILE = APG_INTENT_PREFIX + "DECRYPT_FILE";
-    public static final String ACTION_ENCRYPT_FILE = APG_INTENT_PREFIX + "ENCRYPT_FILE";
-    public static final String ACTION_DECRYPT_AND_RETURN = APG_INTENT_PREFIX + "DECRYPT_AND_RETURN";
-    public static final String ACTION_ENCRYPT_AND_RETURN = APG_INTENT_PREFIX + "ENCRYPT_AND_RETURN";
-    public static final String ACTION_SELECT_PUBLIC_KEYS = APG_INTENT_PREFIX + "SELECT_PUBLIC_KEYS";
-    public static final String ACTION_SELECT_SECRET_KEY = APG_INTENT_PREFIX + "SELECT_SECRET_KEY";
-    public static final String ACTION_CREATE_KEY = APG_INTENT_PREFIX + "CREATE_KEY";
-    public static final String ACTION_EDIT_KEY = APG_INTENT_PREFIX + "EDIT_KEY";
-
-    public static final String EXTRA_TEXT = "text";
-    public static final String EXTRA_DATA = "data";
-    public static final String EXTRA_ERROR = "error";
-    public static final String EXTRA_DECRYPTED_MESSAGE = "decryptedMessage";
-    public static final String EXTRA_ENCRYPTED_MESSAGE = "encryptedMessage";
-    public static final String EXTRA_SIGNATURE = "signature";
-    public static final String EXTRA_SIGNATURE_KEY_ID = "signatureKeyId";
-    public static final String EXTRA_SIGNATURE_USER_ID = "signatureUserId";
-    public static final String EXTRA_SIGNATURE_SUCCESS = "signatureSuccess";
-    public static final String EXTRA_SIGNATURE_UNKNOWN = "signatureUnknown";
-    public static final String EXTRA_USER_ID = "userId";
-    public static final String EXTRA_USER_IDS = "userIds";
-    public static final String EXTRA_KEY_ID = "keyId";
-    public static final String EXTRA_ENCRYPTION_KEY_IDS = "encryptionKeyIds";
-    public static final String EXTRA_SELECTION = "selection";
-    public static final String EXTRA_MESSAGE = "message";
-    public static final String EXTRA_NO_PASSPHRASE = "noPassphrase";
-    public static final String EXTRA_GENERATE_DEFAULT_KEYS = "generateDefaultKeys";
-    public static final String EXTRA_INTENT_VERSION = "intentVersion";
-
-    public static final String RESULT_EXTRA_MASTER_KEY_IDS = "masterKeyIds";
-    public static final String RESULT_EXTRA_USER_IDS = "userIds";
-
-    public static final String INTENT_VERSION = "1";
-
-    public static final int DECRYPT_MESSAGE = 0x21070001;
-    public static final int ENCRYPT_MESSAGE = 0x21070002;
-    public static final int SELECT_PUBLIC_KEYS = 0x21070003;
-    public static final int SELECT_SECRET_KEY = 0x21070004;
-    public static final int CREATE_KEY = 0x21070005;
-    public static final int EDIT_KEY = 0x21070006;
-
-    private Activity activity;
-
-    public ApgIntentHelper(Activity activity) {
-        this.activity = activity;
-    }
-
-    /**
-     * Opens APG activity to create new key
-     * 
-     * @param userIds
-     *            value to specify prefilled values for user that should be created
-     * @return true when activity was found and executed successfully
-     */
-    public boolean createNewKey(String userIds, boolean noPassphrase, boolean generateDefaultKeys) {
-        Intent intent = new Intent(ACTION_CREATE_KEY);
-        if (userIds != null) {
-            intent.putExtra(EXTRA_USER_IDS, userIds);
-        }
-        intent.putExtra(EXTRA_NO_PASSPHRASE, noPassphrase);
-        intent.putExtra(EXTRA_GENERATE_DEFAULT_KEYS, generateDefaultKeys);
-
-        intent.putExtra(EXTRA_INTENT_VERSION, INTENT_VERSION);
-        try {
-            activity.startActivityForResult(intent, CREATE_KEY);
-            return true;
-        } catch (ActivityNotFoundException e) {
-            activityNotFound();
-            return false;
-        }
-    }
-
-    /**
-     * Opens APG activity to create new key
-     * 
-     * @return true when activity was found and executed successfully
-     */
-    public boolean createNewKey() {
-        return createNewKey(null, false, false);
-    }
-
-    /**
-     * Opens APG activity to edit already existing key based on keyId
-     * 
-     * @param keyId
-     * @return true when activity was found and executed successfully
-     */
-    public boolean editKey(long keyId) {
-        Intent intent = new Intent(ACTION_EDIT_KEY);
-        intent.putExtra(EXTRA_KEY_ID, keyId);
-        intent.putExtra(EXTRA_INTENT_VERSION, INTENT_VERSION);
-        try {
-            activity.startActivityForResult(intent, EDIT_KEY);
-            return true;
-        } catch (ActivityNotFoundException e) {
-            activityNotFound();
-            return false;
-        }
-    }
-
-    /**
-     * Opens APG activity to select the signature key.
-     * 
-     * @return true when activity was found and executed successfully
-     */
-    public boolean selectSecretKey() {
-        Intent intent = new Intent(ACTION_SELECT_SECRET_KEY);
-        intent.putExtra(EXTRA_INTENT_VERSION, INTENT_VERSION);
-        try {
-            activity.startActivityForResult(intent, SELECT_SECRET_KEY);
-            return true;
-        } catch (ActivityNotFoundException e) {
-            activityNotFound();
-            return false;
-        }
-    }
-
-    /**
-     * Encrypts the given data by opening APGs encrypt activity. If encryptionKeys are given it
-     * encrypts immediately and goes back to your program after that
-     * 
-     * @param data
-     *            String that contains the message to be encrypted
-     * @param encryptionKeyIds
-     *            long[] that holds the ids of the encryption keys
-     * @param signatureKeyId
-     *            id of the signature key
-     * @return true when activity was found and executed successfully
-     */
-    public boolean encrypt(String data, long[] encryptionKeyIds, long signatureKeyId,
-            boolean returnResult) {
-        Intent intent = new Intent();
-        if (returnResult) {
-            intent.setAction(ACTION_ENCRYPT_AND_RETURN);
-        } else {
-            intent.setAction(ACTION_ENCRYPT);
-        }
-        intent.putExtra(EXTRA_INTENT_VERSION, INTENT_VERSION);
-        intent.setType("text/plain");
-        intent.putExtra(EXTRA_TEXT, data);
-        intent.putExtra(EXTRA_ENCRYPTION_KEY_IDS, encryptionKeyIds);
-        intent.putExtra(EXTRA_SIGNATURE_KEY_ID, signatureKeyId);
-        try {
-            activity.startActivityForResult(intent, ENCRYPT_MESSAGE);
-            return true;
-        } catch (ActivityNotFoundException e) {
-            activityNotFound();
-            return false;
-        }
-    }
-
-    /**
-     * Start the decrypt activity.
-     * 
-     * @param activity
-     * @param data
-     * @param pgpData
-     * @return true when activity was found and executed successfully
-     */
-    public boolean decrypt(String data, boolean returnResult) {
-        Intent intent = new Intent();
-        if (returnResult) {
-            intent.setAction(ACTION_DECRYPT_AND_RETURN);
-        } else {
-            intent.setAction(ACTION_DECRYPT);
-        }
-        intent.putExtra(EXTRA_INTENT_VERSION, INTENT_VERSION);
-        intent.setType("text/plain");
-        if (data == null) {
-            return false;
-        }
-        try {
-            intent.putExtra(EXTRA_TEXT, data);
-            activity.startActivityForResult(intent, DECRYPT_MESSAGE);
-            return true;
-        } catch (ActivityNotFoundException e) {
-            activityNotFound();
-            return false;
-        }
-    }
-
-    /**
-     * Handle the activity results that concern us.
-     * 
-     * @param requestCode
-     * @param resultCode
-     * @param data
-     * @return handled or not
-     */
-    public boolean onActivityResult(int requestCode, int resultCode, Intent data, ApgData apgData) {
-
-        switch (requestCode) {
-        case SELECT_SECRET_KEY:
-            if (resultCode != Activity.RESULT_OK || data == null) {
-                // user canceled!
-                break;
-            }
-            apgData.setSignatureKeyId(data.getLongExtra(EXTRA_KEY_ID, 0));
-            apgData.setSignatureUserId(data.getStringExtra(EXTRA_USER_ID));
-            break;
-
-        case SELECT_PUBLIC_KEYS:
-            if (resultCode != Activity.RESULT_OK || data == null) {
-                apgData.setEncryptionKeys(null);
-                break;
-            }
-            apgData.setEncryptionKeys(data.getLongArrayExtra(RESULT_EXTRA_MASTER_KEY_IDS));
-            break;
-
-        case ENCRYPT_MESSAGE:
-            if (resultCode != Activity.RESULT_OK || data == null) {
-                apgData.setEncryptionKeys(null);
-                break;
-            }
-            apgData.setEncryptedData(data.getStringExtra(EXTRA_ENCRYPTED_MESSAGE));
-            break;
-
-        case DECRYPT_MESSAGE:
-            if (resultCode != Activity.RESULT_OK || data == null) {
-                break;
-            }
-
-            apgData.setSignatureUserId(data.getStringExtra(EXTRA_SIGNATURE_USER_ID));
-            apgData.setSignatureKeyId(data.getLongExtra(EXTRA_SIGNATURE_KEY_ID, 0));
-            apgData.setSignatureSuccess(data.getBooleanExtra(EXTRA_SIGNATURE_SUCCESS, false));
-            apgData.setSignatureUnknown(data.getBooleanExtra(EXTRA_SIGNATURE_UNKNOWN, false));
-
-            apgData.setDecryptedData(data.getStringExtra(EXTRA_DECRYPTED_MESSAGE));
-            break;
-
-        default:
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Select encryption keys.
-     * 
-     * @param emails
-     *            The emails that should be used for preselection.
-     * @return true when activity was found and executed successfully
-     */
-    public boolean selectEncryptionKeys(String emails) {
-        return selectEncryptionKeys(emails, null);
-    }
-
-    /**
-     * Select encryption keys.
-     * 
-     * @param emails
-     *            The emails that should be used for preselection.
-     * @param apgData
-     *            ApgData with encryption keys and signature keys preselected
-     * @return true when activity was found and executed successfully
-     */
-    public boolean selectEncryptionKeys(String emails, ApgData apgData) {
-        Intent intent = new Intent(ACTION_SELECT_PUBLIC_KEYS);
-        intent.putExtra(EXTRA_INTENT_VERSION, INTENT_VERSION);
-
-        long[] initialKeyIds = null;
-        if (apgData == null || !apgData.hasEncryptionKeys()) {
-
-            ContentProviderHelper cPHelper = new ContentProviderHelper(activity);
-
-            initialKeyIds = cPHelper.getPublicKeyIdsFromEmail(emails);
-
-        } else {
-            initialKeyIds = apgData.getEncryptionKeys();
-        }
-        intent.putExtra(EXTRA_SELECTION, initialKeyIds);
-
-        try {
-            activity.startActivityForResult(intent, SELECT_PUBLIC_KEYS);
-            return true;
-        } catch (ActivityNotFoundException e) {
-            activityNotFound();
-            return false;
-        }
-    }
-
-    private void activityNotFound() {
-        Toast.makeText(activity, "APG Activity not found! Is APG installed correctly?",
-                Toast.LENGTH_LONG).show();
-    }
-}
diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgServiceHelper.java b/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgServiceHelper.java
deleted file mode 100644
index 3f71f9647..000000000
--- a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgServiceHelper.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2012 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.thialfihar.android.apg.integration;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.net.Uri;
-import android.util.Log;
-
-public class ApgServiceHelper {
-
-    private final static String BLOB_URI = "content://org.thialfihar.android.apg.provider.apgserviceblobprovider";
-
-    private Context context;
-
-    public ApgServiceHelper(Context context) {
-        this.context = context;
-    }
-    
-    /**
-     * Set up binary data to en/decrypt
-     * 
-     * @param is
-     *            InputStream to get the data from
-     */
-    public void setBlob(InputStream is) {
-        Log.d(Constants.TAG, "setBlob() called");
-        // 1. get the new contentUri
-        ContentResolver cr = context.getContentResolver();
-        Uri contentUri = cr.insert(Uri.parse(BLOB_URI), new ContentValues());
-
-        // 2. insert binary data
-        OutputStream os = null;
-        try {
-            os = cr.openOutputStream(contentUri, "w");
-        } catch (Exception e) {
-            Log.e(Constants.TAG, "... exception on setBlob", e);
-        }
-
-        byte[] buffer = new byte[8];
-        int len = 0;
-        try {
-            while ((len = is.read(buffer)) != -1) {
-                os.write(buffer, 0, len);
-            }
-            Log.d(Constants.TAG, "... write finished, now closing");
-            os.close();
-        } catch (Exception e) {
-            Log.e(Constants.TAG, "... error on writing buffer", e);
-        }
-
-//        mArgs.putString("BLOB", contentUri.toString());
-    }
-
-    /**
-     * Get the binary result
-     * 
-     * <p>
-     * This gets your binary result. It only works if you called {@link #setBlob(InputStream)}
-     * before.
-     * 
-     * If you did not call encrypt nor decrypt, this will be the same data as you inputed.
-     * </p>
-     * 
-     * @return InputStream of the binary data which was en/decrypted
-     * 
-     * @see #setBlob(InputStream)
-     * @see #getResult()
-     */
-    public InputStream getBlobResult() {
-        // if (mArgs.containsKey("BLOB")) {
-        ContentResolver cr = context.getContentResolver();
-        InputStream in = null;
-        try {
-//            in = cr.openInputStream(Uri.parse(mArgs.getString("BLOB")));
-        } catch (Exception e) {
-            Log.e(Constants.TAG, "Could not return blob in result", e);
-        }
-        return in;
-        // } else {
-        // return null;
-        // }
-    }
-}
diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/Constants.java b/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/Constants.java
deleted file mode 100644
index 7745f92d3..000000000
--- a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/Constants.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2012 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.thialfihar.android.apg.integration;
-
-public class Constants {
-    public static final String NAME = "apg";
-
-    public static final String TAG = "APG Integration Lib";
-
-    public static final String APG_PACKAGE_NAME = "org.thialfihar.android.apg";
-    public static final int MIN_REQUIRED_VERSION = 50;
-
-}
diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ContentProviderHelper.java b/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ContentProviderHelper.java
deleted file mode 100644
index 7b725fe06..000000000
--- a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ContentProviderHelper.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright (C) 2012 Dominik Schürmann <dominik@dominikschuermann.de>
- * Copyright (C) 2010-2011 K-9 Mail Contributors
- *
- * 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.thialfihar.android.apg.integration;
-
-import android.app.Activity;
-import android.content.ContentUris;
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.widget.Toast;
-
-public class ContentProviderHelper {
-    public static final String AUTHORITY = Constants.APG_PACKAGE_NAME;
-
-    public static final Uri CONTENT_URI_PUBLIC_KEY_RING_BY_KEY_ID = Uri.parse("content://"
-            + AUTHORITY + "/key_rings/public/key_id/");
-    public static final Uri CONTENT_URI_PUBLIC_KEY_RING_BY_EMAILS = Uri.parse("content://"
-            + AUTHORITY + "/key_rings/public/emails/");
-
-    public static final Uri CONTENT_URI_SECRET_KEY_RING_BY_KEY_ID = Uri.parse("content://"
-            + AUTHORITY + "/key_rings/secret/key_id/");
-    public static final Uri CONTENT_URI_SECRET_KEY_RING_BY_EMAILS = Uri.parse("content://"
-            + AUTHORITY + "/key_rings/secret/emails/");
-
-    private Context activity;
-
-    public ContentProviderHelper(Activity activity) {
-        this.activity = activity;
-    }
-
-    /**
-     * Get secret key ids based on a given email.
-     * 
-     * @param context
-     * @param email
-     *            The email in question.
-     * @return key ids
-     */
-    public long[] getSecretKeyIdsFromEmail(String email) {
-        long ids[] = null;
-        try {
-            Uri contentUri = Uri.withAppendedPath(CONTENT_URI_SECRET_KEY_RING_BY_EMAILS, email);
-            Cursor c = activity.getContentResolver().query(contentUri,
-                    new String[] { "master_key_id" }, null, null, null);
-            if (c != null && c.getCount() > 0) {
-                ids = new long[c.getCount()];
-                while (c.moveToNext()) {
-                    ids[c.getPosition()] = c.getLong(0);
-                }
-            }
-
-            if (c != null) {
-                c.close();
-            }
-        } catch (SecurityException e) {
-            insufficientPermissions();
-        }
-
-        return ids;
-    }
-
-    /**
-     * Get public key ids based on a given email.
-     * 
-     * @param context
-     * @param email
-     *            The email in question.
-     * @return key ids
-     */
-    public long[] getPublicKeyIdsFromEmail(String email) {
-        long ids[] = null;
-        try {
-            Uri contentUri = Uri.withAppendedPath(CONTENT_URI_PUBLIC_KEY_RING_BY_EMAILS, email);
-            Cursor c = activity.getContentResolver().query(contentUri,
-                    new String[] { "master_key_id" }, null, null, null);
-            if (c != null && c.getCount() > 0) {
-                ids = new long[c.getCount()];
-                while (c.moveToNext()) {
-                    ids[c.getPosition()] = c.getLong(0);
-                }
-            }
-
-            if (c != null) {
-                c.close();
-            }
-        } catch (SecurityException e) {
-            insufficientPermissions();
-        }
-
-        return ids;
-    }
-
-    /**
-     * Find out if a given email has a secret key.
-     * 
-     * @param context
-     * @param email
-     *            The email in question.
-     * @return true if there is a secret key for this email.
-     */
-    public boolean hasSecretKeyForEmail(String email) {
-        try {
-            Uri contentUri = Uri.withAppendedPath(CONTENT_URI_SECRET_KEY_RING_BY_EMAILS, email);
-            Cursor c = activity.getContentResolver().query(contentUri,
-                    new String[] { "master_key_id" }, null, null, null);
-            if (c != null && c.getCount() > 0) {
-                c.close();
-                return true;
-            }
-            if (c != null) {
-                c.close();
-            }
-        } catch (SecurityException e) {
-            insufficientPermissions();
-        }
-        return false;
-    }
-
-    /**
-     * Find out if a given email has a public key.
-     * 
-     * @param context
-     * @param email
-     *            The email in question.
-     * @return true if there is a public key for this email.
-     */
-    public boolean hasPublicKeyForEmail(String email) {
-        try {
-            Uri contentUri = Uri.withAppendedPath(CONTENT_URI_PUBLIC_KEY_RING_BY_EMAILS, email);
-            Cursor c = activity.getContentResolver().query(contentUri,
-                    new String[] { "master_key_id" }, null, null, null);
-            if (c != null && c.getCount() > 0) {
-                c.close();
-                return true;
-            }
-            if (c != null) {
-                c.close();
-            }
-        } catch (SecurityException e) {
-            insufficientPermissions();
-        }
-        return false;
-    }
-
-    /**
-     * Get the user id based on the key id.
-     * 
-     * @param context
-     * @param keyId
-     * @return user id
-     */
-    public String getUserId(long keyId) {
-        String userId = null;
-        try {
-            Uri contentUri = ContentUris.withAppendedId(CONTENT_URI_SECRET_KEY_RING_BY_KEY_ID,
-                    keyId);
-            Cursor c = activity.getContentResolver().query(contentUri, new String[] { "user_id" },
-                    null, null, null);
-            if (c != null && c.moveToFirst()) {
-                userId = c.getString(0);
-            }
-
-            if (c != null) {
-                c.close();
-            }
-        } catch (SecurityException e) {
-            insufficientPermissions();
-        }
-
-        if (userId == null) {
-            userId = "unknown";
-        }
-        return userId;
-    }
-
-    private void insufficientPermissions() {
-        Toast.makeText(activity, "Permission to access APG Provider is missing!", Toast.LENGTH_LONG)
-                .show();
-    }
-}
diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/Util.java b/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/Util.java
deleted file mode 100644
index 01c6bb699..000000000
--- a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/Util.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2012 Dominik Schürmann <dominik@dominikschuermann.de>
- * Copyright (C) 2010-2011 K-9 Mail Contributors
- *
- * 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.thialfihar.android.apg.integration;
-
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
-
-import android.widget.Toast;
-
-public class Util {
-
-    /**
-     * Check whether APG is installed and at a high enough version.
-     * 
-     * @param context
-     * @return whether a suitable version of APG was found
-     */
-    public boolean isApgAvailable(Context context) {
-        try {
-            PackageInfo pi = context.getPackageManager().getPackageInfo(Constants.APG_PACKAGE_NAME,
-                    0);
-            if (pi.versionCode >= Constants.MIN_REQUIRED_VERSION) {
-                return true;
-            } else {
-                Toast.makeText(context,
-                        "This APG version is not supported! Please update to a newer one!",
-                        Toast.LENGTH_LONG).show();
-            }
-        } catch (NameNotFoundException e) {
-            // not found
-        }
-
-        return false;
-    }
-}
diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgEncryptDecryptHandler.aidl b/org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgEncryptDecryptHandler.aidl
deleted file mode 100644
index ff6b7254c..000000000
--- a/org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgEncryptDecryptHandler.aidl
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.thialfihar.android.apg.service;
-
-interface IApgEncryptDecryptHandler {
-    /**
-     * Either output or streamUri is given. One of them is null
-     *
-     */
-    oneway void onSuccessEncrypt(in byte[] outputBytes, in String outputUri);
-
-    oneway void onSuccessDecrypt(in byte[] outputBytes, in String outputUri, in boolean signature,
-            in long signatureKeyId, in String signatureUserId, in boolean signatureSuccess,
-            in boolean signatureUnknown);
-    
-    
-    oneway void onException(in int exceptionNumber, in String message);
-}
\ No newline at end of file
diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgHelperHandler.aidl b/org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgHelperHandler.aidl
deleted file mode 100644
index bb405329a..000000000
--- a/org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgHelperHandler.aidl
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.thialfihar.android.apg.service;
-
-interface IApgHelperHandler {
-
-    oneway void onSuccessGetDecryptionKey(in long secretKeyId, in boolean symmetric);
-    
-    
-    oneway void onException(in int exceptionNumber, in String message);
-}
\ No newline at end of file
diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgService.aidl b/org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgService.aidl
deleted file mode 100644
index 71c6a9e42..000000000
--- a/org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgService.aidl
+++ /dev/null
@@ -1,130 +0,0 @@
-package org.thialfihar.android.apg.service;
-
-import org.thialfihar.android.apg.service.IApgEncryptDecryptHandler;
-import org.thialfihar.android.apg.service.IApgSignVerifyHandler;
-import org.thialfihar.android.apg.service.IApgHelperHandler;
-
-/**
- * All methods are oneway, which means they are asynchronous and non-blocking.
- * Results are returned into given Handler, which has to be implemented on client side.
- */
-interface IApgService {
-       
-    /**
-     * Encrypt
-     *
-     * Either inputBytes or inputUri is given, the other should be null.
-     * 
-     * @param inputBytes
-     *            Byte array you want to encrypt
-     * @param inputUri
-     *            Blob in ContentProvider you want to encrypt
-     * @param useAsciiArmor 
-     *            Convert bytes to ascii armored text to guard against encoding problems
-     * @param compression
-     *            Compression: 0x21070001: none, 1: Zip, 2: Zlib, 3: BZip2
-     * @param encryptionKeyIds
-     *            Ids of public keys used for encryption
-     * @param symmetricEncryptionAlgorithm
-     *            7: AES-128, 8: AES-192, 9: AES-256, 4: Blowfish, 10: Twofish, 3: CAST5,
-     *            6: DES, 2: Triple DES, 1: IDEA
-     * @param handler
-     *            Results are returned to this IApgEncryptDecryptHandler Handler
-     *            to onSuccessEncrypt(in byte[] output), after successful encryption
-     */
-    oneway void encryptAsymmetric(in byte[] inputBytes, in String inputUri, in boolean useAsciiArmor,
-            in int compression, in long[] encryptionKeyIds, in int symmetricEncryptionAlgorithm,
-            in IApgEncryptDecryptHandler handler);
-    
-    /**
-     * Same as encryptAsymmetric but using a passphrase for symmetric encryption
-     *
-     * @param encryptionPassphrase
-     *            Passphrase for direct symmetric encryption using symmetricEncryptionAlgorithm
-     */
-    oneway void encryptSymmetric(in byte[] inputBytes, in String inputUri, in boolean useAsciiArmor,
-            in int compression, in String encryptionPassphrase, in int symmetricEncryptionAlgorithm,
-            in IApgEncryptDecryptHandler handler);
-    
-    /**
-     * Encrypt and sign
-     *
-     * Either inputBytes or inputUri is given, the other should be null.
-     * 
-     * @param inputBytes
-     *            Byte array you want to encrypt
-     * @param inputUri
-     *            Blob in ContentProvider you want to encrypt
-     * @param useAsciiArmor 
-     *            Convert bytes to ascii armored text to guard against encoding problems
-     * @param compression
-     *            Compression: 0x21070001: none, 1: Zip, 2: Zlib, 3: BZip2
-     * @param encryptionKeyIds
-     *            Ids of public keys used for encryption
-     * @param symmetricEncryptionAlgorithm
-     *            7: AES-128, 8: AES-192, 9: AES-256, 4: Blowfish, 10: Twofish, 3: CAST5,
-     *            6: DES, 2: Triple DES, 1: IDEA
-     * @param signatureKeyId
-     *            Key id of key to sign with
-     * @param signatureHashAlgorithm
-     *            1: MD5, 3: RIPEMD-160, 2: SHA-1, 11: SHA-224, 8: SHA-256, 9: SHA-384,
-     *            10: SHA-512
-     * @param signatureForceV3
-     *            Force V3 signatures
-     * @param signaturePassphrase
-     *            Passphrase to unlock signature key
-     * @param handler
-     *            Results are returned to this IApgEncryptDecryptHandler Handler
-     *            to onSuccessEncrypt(in byte[] output), after successful encryption and signing
-     */
-    oneway void encryptAndSignAsymmetric(in byte[] inputBytes, in String inputUri,
-            in boolean useAsciiArmor, in int compression, in long[] encryptionKeyIds,
-            in int symmetricEncryptionAlgorithm, in long signatureKeyId, in int signatureHashAlgorithm,
-            in boolean signatureForceV3, in String signaturePassphrase,
-            in IApgEncryptDecryptHandler handler);
-    
-    /**
-     * Same as encryptAndSignAsymmetric but using a passphrase for symmetric encryption
-     *
-     * @param encryptionPassphrase
-     *            Passphrase for direct symmetric encryption using symmetricEncryptionAlgorithm
-     */
-    oneway void encryptAndSignSymmetric(in byte[] inputBytes, in String inputUri,
-            in boolean useAsciiArmor, in int compression, in String encryptionPassphrase,
-            in int symmetricEncryptionAlgorithm, in long signatureKeyId, in int signatureHashAlgorithm,
-            in boolean signatureForceV3, in String signaturePassphrase,
-            in IApgEncryptDecryptHandler handler);
-    
-    /**
-     * Decrypts and verifies given input bytes. If no signature is present this method
-     * will only decrypt.
-     * 
-     * @param inputBytes
-     *            Byte array you want to decrypt and verify
-     * @param inputUri
-     *            Blob in ContentProvider you want to decrypt and verify
-     * @param keyPassphrase
-     *            Passphrase to unlock secret key for decryption.
-     * @param handler
-     *            Handler where to return results to after successful encryption
-     */
-    oneway void decryptAndVerifyAsymmetric(in byte[] inputBytes, in String inputUri,
-            in String keyPassphrase, in IApgEncryptDecryptHandler handler);
-    
-    /**
-     * Same as decryptAndVerifyAsymmetric but for symmetric decryption.
-     *
-     * @param encryptionPassphrase
-     *            Passphrase to decrypt
-     */
-    oneway void decryptAndVerifySymmetric(in byte[] inputBytes, in String inputUri,
-            in String encryptionPassphrase, in IApgEncryptDecryptHandler handler);
-    
-    /**
-     *
-     */
-    oneway void getDecryptionKey(in byte[] inputBytes, in String inputUri,
-            in IApgHelperHandler handler);
-    
-    
-}
\ No newline at end of file
diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgSignVerifyHandler.aidl b/org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgSignVerifyHandler.aidl
deleted file mode 100644
index 1375d1548..000000000
--- a/org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgSignVerifyHandler.aidl
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.thialfihar.android.apg.service;
-
-interface IApgSignVerifyHandler {
-    oneway void onSuccessSign(in byte[] outputBytes, in String outputUri);
-    
-    oneway void onSuccessVerify(in boolean signature, in long signatureKeyId,
-            in String signatureUserId, in boolean signatureSuccess, in boolean signatureUnknown);
-    
-    
-    oneway void onException(in int exceptionNumber, in String message);
-}
\ No newline at end of file