Remove old API demos

10 files changed, 209 insertions, 709 deletions

diff --git a/OpenPGP-Keychain-API-Demo/res/layout/aidl_demo.xml b/OpenPGP-Keychain-API-Demo/res/layout/aidl_demo.xml
deleted file mode 100644
index 59977869d..000000000
--- a/OpenPGP-Keychain-API-Demo/res/layout/aidl_demo.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content" >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical" >
-
-        <Button
-            android:id="@+id/aidl_demo_create_new_key"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:onClick="createNewKeyOnClick"
-            android:text="Create new key" />
-
-        <Button
-            android:id="@+id/aidl_demo_select_secret_key"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:onClick="selectSecretKeyOnClick"
-            android:text="Select secret key" />
-
-        <Button
-            android:id="@+id/aidl_demo_select_encryption_key"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:onClick="selectEncryptionKeysOnClick"
-            android:text="Select encryption key(s)" />
-
-        <EditText
-            android:id="@+id/aidl_demo_message"
-            android:layout_width="match_parent"
-            android:layout_height="150dip"
-            android:text="message"
-            android:textAppearance="@android:style/TextAppearance.Small" />
-
-        <EditText
-            android:id="@+id/aidl_demo_ciphertext"
-            android:layout_width="match_parent"
-            android:layout_height="150dip"
-            android:text="ciphertext"
-            android:textAppearance="@android:style/TextAppearance.Small" />
-
-        <Button
-            android:id="@+id/aidl_demo_encrypt"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:onClick="encryptOnClick"
-            android:text="Encrypt" />
-
-        <Button
-            android:id="@+id/aidl_demo_decrypt"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:onClick="decryptOnClick"
-            android:text="Decrypt" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:text="APG Data:" />
-
-        <TextView
-            android:id="@+id/aidl_demo_data"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:minLines="10" />
-    </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/OpenPGP-Keychain-API-Demo/res/layout/content_provider_demo.xml b/OpenPGP-Keychain-API-Demo/res/layout/content_provider_demo.xml
deleted file mode 100644
index 279324cda..000000000
--- a/OpenPGP-Keychain-API-Demo/res/layout/content_provider_demo.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content" >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" >
-
-        <Button
-            android:id="@+id/content_provider_test1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:onClick="test1OnClick"
-            android:text="Test 1" />
-
-        <Button
-            android:id="@+id/content_provider_test2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:onClick="test2OnClick"
-            android:text="Test 2" />
-
-        <EditText
-            android:id="@+id/content_provider_output"
-            android:layout_width="match_parent"
-            android:layout_height="150dip"
-            android:text="output"
-            android:textAppearance="@android:style/TextAppearance.Small" />
-    </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/OpenPGP-Keychain-API-Demo/res/xml/base_preference.xml b/OpenPGP-Keychain-API-Demo/res/xml/base_preference.xml
index 7e312ddf3..f2645b509 100644
--- a/OpenPGP-Keychain-API-Demo/res/xml/base_preference.xml
+++ b/OpenPGP-Keychain-API-Demo/res/xml/base_preference.xml
@@ -6,19 +6,11 @@
             android:key="intent_demo"
             android:title="Intent Demo" />
     </PreferenceCategory>
-    <PreferenceCategory android:title="Content Provider" >
-        <Preference
-            android:key="content_provider_demo"
-            android:title="Content Provider Demo" />
-    </PreferenceCategory>
-    <PreferenceCategory android:title="AIDL" >
-        <Preference
-            android:key="aidl_demo"
-            android:title="AIDL Demo (ACCESS_API permission)" />
-        <Preference
-            android:key="aidl_demo2"
-            android:title="AIDL Demo (ACCESS_KEYS permission)" />
-    </PreferenceCategory>
+    <!-- <PreferenceCategory android:title="AIDL" > -->
+    <!-- <Preference -->
+    <!-- android:key="aidl_demo2" -->
+    <!-- android:title="AIDL Demo (ACCESS_KEYS permission)" /> -->
+    <!-- </PreferenceCategory> -->
     <PreferenceCategory android:title="Crypto Provider" >
         <Preference
             android:key="crypto_provider_demo"
diff --git a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/AidlDemoActivity.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/AidlDemoActivity.java
deleted file mode 100644
index 1d6ddff6b..000000000
--- a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/AidlDemoActivity.java
+++ /dev/null
@@ -1,216 +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.sufficientlysecure.keychain.demo;
-
-import org.sufficientlysecure.keychain.demo.R;
-import org.sufficientlysecure.keychain.integration.KeychainData;
-import org.sufficientlysecure.keychain.integration.KeychainIntentHelper;
-import org.sufficientlysecure.keychain.service.IKeychainApiService;
-import org.sufficientlysecure.keychain.service.IKeychainKeyService;
-import org.sufficientlysecure.keychain.service.handler.IKeychainDecryptHandler;
-import org.sufficientlysecure.keychain.service.handler.IKeychainEncryptHandler;
-import org.sufficientlysecure.keychain.service.handler.IKeychainGetDecryptionKeyIdHandler;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.view.View;
-import android.widget.TextView;
-
-public class AidlDemoActivity extends Activity {
-    Activity mActivity;
-
-    TextView mMessageTextView;
-    TextView mCiphertextTextView;
-    TextView mDataTextView;
-
-    KeychainIntentHelper mKeychainIntentHelper;
-    KeychainData mKeychainData;
-
-    private IKeychainApiService service = null;
-    private ServiceConnection svcConn = new ServiceConnection() {
-        public void onServiceConnected(ComponentName className, IBinder binder) {
-            service = IKeychainApiService.Stub.asInterface(binder);
-        }
-
-        public void onServiceDisconnected(ComponentName className) {
-            service = null;
-        }
-    };
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.aidl_demo);
-
-        mActivity = this;
-
-        mMessageTextView = (TextView) findViewById(R.id.aidl_demo_message);
-        mCiphertextTextView = (TextView) findViewById(R.id.aidl_demo_ciphertext);
-        mDataTextView = (TextView) findViewById(R.id.aidl_demo_data);
-
-        mKeychainIntentHelper = new KeychainIntentHelper(mActivity);
-        mKeychainData = new KeychainData();
-
-        bindService(new Intent(IKeychainApiService.class.getName()), svcConn,
-                Context.BIND_AUTO_CREATE);
-    }
-
-    public void encryptOnClick(View view) {
-        byte[] inputBytes = mMessageTextView.getText().toString().getBytes();
-
-        try {
-            service.encryptAsymmetric(inputBytes, null, true, 0, mKeychainData.getPublicKeys(), 7,
-                    encryptHandler);
-        } catch (RemoteException e) {
-            exceptionImplementation(-1, e.toString());
-        }
-    }
-
-    public void decryptOnClick(View view) {
-        byte[] inputBytes = mCiphertextTextView.getText().toString().getBytes();
-
-        try {
-            service.decryptAndVerifyAsymmetric(inputBytes, null, null, decryptHandler);
-        } catch (RemoteException e) {
-            exceptionImplementation(-1, e.toString());
-        }
-    }
-
-    private void updateView() {
-        if (mKeychainData.getDecryptedData() != null) {
-            mMessageTextView.setText(mKeychainData.getDecryptedData());
-        }
-        if (mKeychainData.getEncryptedData() != null) {
-            mCiphertextTextView.setText(mKeychainData.getEncryptedData());
-        }
-        mDataTextView.setText(mKeychainData.toString());
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-
-        unbindService(svcConn);
-    }
-
-    private void exceptionImplementation(int exceptionId, String error) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle("Exception!").setMessage(error).setPositiveButton("OK", null).show();
-    }
-
-    private final IKeychainEncryptHandler.Stub encryptHandler = new IKeychainEncryptHandler.Stub() {
-
-        @Override
-        public void onException(final int exceptionId, final String message) throws RemoteException {
-            runOnUiThread(new Runnable() {
-                public void run() {
-                    exceptionImplementation(exceptionId, message);
-                }
-            });
-        }
-
-        @Override
-        public void onSuccess(final byte[] outputBytes, String outputUri) throws RemoteException {
-            runOnUiThread(new Runnable() {
-                public void run() {
-                    mKeychainData.setEncryptedData(new String(outputBytes));
-                    updateView();
-                }
-            });
-        }
-
-    };
-
-    private final IKeychainDecryptHandler.Stub decryptHandler = new IKeychainDecryptHandler.Stub() {
-
-        @Override
-        public void onException(final int exceptionId, final String message) throws RemoteException {
-            runOnUiThread(new Runnable() {
-                public void run() {
-                    exceptionImplementation(exceptionId, message);
-                }
-            });
-        }
-
-        @Override
-        public void onSuccess(final byte[] outputBytes, String outputUri, boolean signature,
-                long signatureKeyId, String signatureUserId, boolean signatureSuccess,
-                boolean signatureUnknown) throws RemoteException {
-            runOnUiThread(new Runnable() {
-                public void run() {
-                    mKeychainData.setDecryptedData(new String(outputBytes));
-                    updateView();
-                }
-            });
-
-        }
-
-    };
-
-    private final IKeychainGetDecryptionKeyIdHandler.Stub helperHandler = new IKeychainGetDecryptionKeyIdHandler.Stub() {
-
-        @Override
-        public void onException(final int exceptionId, final String message) throws RemoteException {
-            runOnUiThread(new Runnable() {
-                public void run() {
-                    exceptionImplementation(exceptionId, message);
-                }
-            });
-        }
-
-        @Override
-        public void onSuccess(long arg0, boolean arg1) throws RemoteException {
-            // TODO Auto-generated method stub
-
-        }
-
-    };
-
-    /**
-     * Selection is done with Intents, not AIDL!
-     * 
-     * @param view
-     */
-    public void selectSecretKeyOnClick(View view) {
-        mKeychainIntentHelper.selectSecretKey();
-    }
-
-    public void selectEncryptionKeysOnClick(View view) {
-        mKeychainIntentHelper.selectPublicKeys("user@example.com");
-
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        // this updates the mKeychainData object to the result of the methods
-        boolean result = mKeychainIntentHelper.onActivityResult(requestCode, resultCode, data,
-                mKeychainData);
-        if (result) {
-            updateView();
-        }
-
-        // continue with other activity results
-        super.onActivityResult(requestCode, resultCode, data);
-    }
-}
diff --git a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/AidlDemoActivity2.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/AidlDemoActivity2.java
index 53ee24288..b6e211955 100644
--- a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/AidlDemoActivity2.java
+++ b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/AidlDemoActivity2.java
@@ -1,168 +1,168 @@
-/*
- * 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.sufficientlysecure.keychain.demo;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.sufficientlysecure.keychain.demo.R;
-import org.sufficientlysecure.keychain.integration.KeychainData;
-import org.sufficientlysecure.keychain.integration.KeychainIntentHelper;
-import org.sufficientlysecure.keychain.service.IKeychainKeyService;
-import org.sufficientlysecure.keychain.service.handler.IKeychainGetKeyringsHandler;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.util.Base64;
-import android.view.View;
-import android.widget.TextView;
-
-public class AidlDemoActivity2 extends Activity {
-    Activity mActivity;
-
-    TextView mKeyringsTextView;
-
-    KeychainIntentHelper mKeychainIntentHelper;
-    KeychainData mKeychainData;
-
-    byte[] keysBytes;
-    ArrayList<String> keysStrings;
-
-    private IKeychainKeyService service = null;
-    private ServiceConnection svcConn = new ServiceConnection() {
-        public void onServiceConnected(ComponentName className, IBinder binder) {
-            service = IKeychainKeyService.Stub.asInterface(binder);
-        }
-
-        public void onServiceDisconnected(ComponentName className) {
-            service = null;
-        }
-    };
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.aidl_demo2);
-
-        mActivity = this;
-
-        mKeyringsTextView = (TextView) findViewById(R.id.aidl_demo_keyrings);
-
-        mKeychainIntentHelper = new KeychainIntentHelper(mActivity);
-        mKeychainData = new KeychainData();
-
-        bindService(new Intent(IKeychainKeyService.class.getName()), svcConn,
-                Context.BIND_AUTO_CREATE);
-    }
-
-    public void getKeyringsStringsOnClick(View view) {
-        try {
-            service.getPublicKeyRings(mKeychainData.getPublicKeys(), true, getKeyringsHandler);
-        } catch (RemoteException e) {
-            exceptionImplementation(-1, e.toString());
-        }
-    }
-
-    public void getKeyringsBytesOnClick(View view) {
-        try {
-            service.getPublicKeyRings(mKeychainData.getPublicKeys(), false, getKeyringsHandler);
-        } catch (RemoteException e) {
-            exceptionImplementation(-1, e.toString());
-        }
-    }
-
-    @SuppressLint("NewApi")
-    private void updateView() {
-        if (keysBytes != null) {
-            mKeyringsTextView.setText(Base64.encodeToString(keysBytes, Base64.DEFAULT));
-        } else if (keysStrings != null) {
-            mKeyringsTextView.setText("");
-            for (String output : keysStrings) {
-                mKeyringsTextView.append(output);
-            }
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-
-        unbindService(svcConn);
-    }
-
-    private void exceptionImplementation(int exceptionId, String error) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle("Exception!").setMessage(error).setPositiveButton("OK", null).show();
-    }
-
-    private final IKeychainGetKeyringsHandler.Stub getKeyringsHandler = new IKeychainGetKeyringsHandler.Stub() {
-
-        @Override
-        public void onException(final int exceptionId, final String message) throws RemoteException {
-            runOnUiThread(new Runnable() {
-                public void run() {
-                    exceptionImplementation(exceptionId, message);
-                }
-            });
-        }
-
-        @Override
-        public void onSuccess(final byte[] outputBytes, final List<String> outputStrings)
-                throws RemoteException {
-            runOnUiThread(new Runnable() {
-                public void run() {
-                    if (outputBytes != null) {
-                        keysBytes = outputBytes;
-                        keysStrings = null;
-                    } else if (outputStrings != null) {
-                        keysBytes = null;
-                        keysStrings = (ArrayList<String>) outputStrings;
-                    }
-                    updateView();
-                }
-            });
-
-        }
-
-    };
-
-    public void selectEncryptionKeysOnClick(View view) {
-        mKeychainIntentHelper.selectPublicKeys("user@example.com");
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        // this updates the mKeychainData object to the result of the methods
-        boolean result = mKeychainIntentHelper.onActivityResult(requestCode, resultCode, data,
-                mKeychainData);
-        if (result) {
-            updateView();
-        }
-
-        // continue with other activity results
-        super.onActivityResult(requestCode, resultCode, data);
-    }
-
-}
+///*
+// * 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.sufficientlysecure.keychain.demo;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//
+//import org.sufficientlysecure.keychain.demo.R;
+//import org.sufficientlysecure.keychain.integration.KeychainData;
+//import org.sufficientlysecure.keychain.integration.KeychainIntentHelper;
+//import org.sufficientlysecure.keychain.service.IKeychainKeyService;
+//import org.sufficientlysecure.keychain.service.handler.IKeychainGetKeyringsHandler;
+//
+//import android.annotation.SuppressLint;
+//import android.app.Activity;
+//import android.app.AlertDialog;
+//import android.content.ComponentName;
+//import android.content.Context;
+//import android.content.Intent;
+//import android.content.ServiceConnection;
+//import android.os.Bundle;
+//import android.os.IBinder;
+//import android.os.RemoteException;
+//import android.util.Base64;
+//import android.view.View;
+//import android.widget.TextView;
+//
+//public class AidlDemoActivity2 extends Activity {
+//    Activity mActivity;
+//
+//    TextView mKeyringsTextView;
+//
+//    KeychainIntentHelper mKeychainIntentHelper;
+//    KeychainData mKeychainData;
+//
+//    byte[] keysBytes;
+//    ArrayList<String> keysStrings;
+//
+//    private IKeychainKeyService service = null;
+//    private ServiceConnection svcConn = new ServiceConnection() {
+//        public void onServiceConnected(ComponentName className, IBinder binder) {
+//            service = IKeychainKeyService.Stub.asInterface(binder);
+//        }
+//
+//        public void onServiceDisconnected(ComponentName className) {
+//            service = null;
+//        }
+//    };
+//
+//    @Override
+//    public void onCreate(Bundle icicle) {
+//        super.onCreate(icicle);
+//        setContentView(R.layout.aidl_demo2);
+//
+//        mActivity = this;
+//
+//        mKeyringsTextView = (TextView) findViewById(R.id.aidl_demo_keyrings);
+//
+//        mKeychainIntentHelper = new KeychainIntentHelper(mActivity);
+//        mKeychainData = new KeychainData();
+//
+//        bindService(new Intent(IKeychainKeyService.class.getName()), svcConn,
+//                Context.BIND_AUTO_CREATE);
+//    }
+//
+//    public void getKeyringsStringsOnClick(View view) {
+//        try {
+//            service.getPublicKeyRings(mKeychainData.getPublicKeys(), true, getKeyringsHandler);
+//        } catch (RemoteException e) {
+//            exceptionImplementation(-1, e.toString());
+//        }
+//    }
+//
+//    public void getKeyringsBytesOnClick(View view) {
+//        try {
+//            service.getPublicKeyRings(mKeychainData.getPublicKeys(), false, getKeyringsHandler);
+//        } catch (RemoteException e) {
+//            exceptionImplementation(-1, e.toString());
+//        }
+//    }
+//
+//    @SuppressLint("NewApi")
+//    private void updateView() {
+//        if (keysBytes != null) {
+//            mKeyringsTextView.setText(Base64.encodeToString(keysBytes, Base64.DEFAULT));
+//        } else if (keysStrings != null) {
+//            mKeyringsTextView.setText("");
+//            for (String output : keysStrings) {
+//                mKeyringsTextView.append(output);
+//            }
+//        }
+//    }
+//
+//    @Override
+//    public void onDestroy() {
+//        super.onDestroy();
+//
+//        unbindService(svcConn);
+//    }
+//
+//    private void exceptionImplementation(int exceptionId, String error) {
+//        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+//        builder.setTitle("Exception!").setMessage(error).setPositiveButton("OK", null).show();
+//    }
+//
+//    private final IKeychainGetKeyringsHandler.Stub getKeyringsHandler = new IKeychainGetKeyringsHandler.Stub() {
+//
+//        @Override
+//        public void onException(final int exceptionId, final String message) throws RemoteException {
+//            runOnUiThread(new Runnable() {
+//                public void run() {
+//                    exceptionImplementation(exceptionId, message);
+//                }
+//            });
+//        }
+//
+//        @Override
+//        public void onSuccess(final byte[] outputBytes, final List<String> outputStrings)
+//                throws RemoteException {
+//            runOnUiThread(new Runnable() {
+//                public void run() {
+//                    if (outputBytes != null) {
+//                        keysBytes = outputBytes;
+//                        keysStrings = null;
+//                    } else if (outputStrings != null) {
+//                        keysBytes = null;
+//                        keysStrings = (ArrayList<String>) outputStrings;
+//                    }
+//                    updateView();
+//                }
+//            });
+//
+//        }
+//
+//    };
+//
+//    public void selectEncryptionKeysOnClick(View view) {
+//        mKeychainIntentHelper.selectPublicKeys("user@example.com");
+//    }
+//
+//    @Override
+//    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+//        // this updates the mKeychainData object to the result of the methods
+//        boolean result = mKeychainIntentHelper.onActivityResult(requestCode, resultCode, data,
+//                mKeychainData);
+//        if (result) {
+//            updateView();
+//        }
+//
+//        // continue with other activity results
+//        super.onActivityResult(requestCode, resultCode, data);
+//    }
+//
+//}
diff --git a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/BaseActivity.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/BaseActivity.java
index aa34fdebe..06483727c 100644
--- a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/BaseActivity.java
+++ b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/BaseActivity.java
@@ -24,6 +24,7 @@ import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceActivity;
+import android.widget.Toast;
 
 public class BaseActivity extends PreferenceActivity {
     private Activity mActivity;
@@ -56,21 +57,13 @@ public class BaseActivity extends PreferenceActivity {
         mIntentDemo.setOnPreferenceClickListener(new OnPreferenceClickListener() {
             @Override
             public boolean onPreferenceClick(Preference preference) {
-                startActivity(new Intent(mActivity, IntentDemoActivity.class));
+                // startActivity(new Intent(mActivity, IntentDemoActivity.class));
+                Toast.makeText(BaseActivity.this, "Not implemented!", Toast.LENGTH_LONG).show();
 
                 return false;
             }
         });
 
-        mContentProviderDemo.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-            @Override
-            public boolean onPreferenceClick(Preference preference) {
-                startActivity(new Intent(mActivity, ContentProviderDemoActivity.class));
-
-                return false;
-            }
-        });
-        
         mCryptoProvider.setOnPreferenceClickListener(new OnPreferenceClickListener() {
             @Override
             public boolean onPreferenceClick(Preference preference) {
@@ -80,23 +73,14 @@ public class BaseActivity extends PreferenceActivity {
             }
         });
 
-        mAidlDemo.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-            @Override
-            public boolean onPreferenceClick(Preference preference) {
-                startActivity(new Intent(mActivity, AidlDemoActivity.class));
-
-                return false;
-            }
-        });
-
-        mAidlDemo2.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-            @Override
-            public boolean onPreferenceClick(Preference preference) {
-                startActivity(new Intent(mActivity, AidlDemoActivity2.class));
-
-                return false;
-            }
-        });
+        // mAidlDemo2.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+        // @Override
+        // public boolean onPreferenceClick(Preference preference) {
+        // startActivity(new Intent(mActivity, AidlDemoActivity2.class));
+        //
+        // return false;
+        // }
+        // });
 
     }
 
diff --git a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/Constants.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/Constants.java
new file mode 100644
index 000000000..dc54fc9e7
--- /dev/null
+++ b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/Constants.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2013 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.sufficientlysecure.keychain.demo;
+
+public final class Constants {
+
+    public static final boolean DEBUG = BuildConfig.DEBUG;
+
+    public static final String TAG = "Keychain API";
+
+}
diff --git a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/ContentProviderDemoActivity.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/ContentProviderDemoActivity.java
deleted file mode 100644
index c69f839d1..000000000
--- a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/ContentProviderDemoActivity.java
+++ /dev/null
@@ -1,68 +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.sufficientlysecure.keychain.demo;
-
-import java.util.Arrays;
-
-import org.sufficientlysecure.keychain.demo.R;
-import org.sufficientlysecure.keychain.integration.KeychainContentProviderHelper;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.TextView;
-
-public class ContentProviderDemoActivity extends Activity {
-    Activity mActivity;
-
-    TextView mOutputTextView;
-    TextView mCiphertextTextView;
-    TextView mDataTextView;
-
-    KeychainContentProviderHelper mKeychainContentProviderHelper;
-
-    /**
-     * Instantiate View for this Activity
-     */
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.content_provider_demo);
-
-        mActivity = this;
-
-        mOutputTextView = (TextView) findViewById(R.id.content_provider_output);
-
-        mKeychainContentProviderHelper = new KeychainContentProviderHelper(mActivity);
-    }
-
-    public void test1OnClick(View view) {
-        long[] test = mKeychainContentProviderHelper.getPublicKeyringIdsByEmail("user@example.com");
-        mOutputTextView.setText(Arrays.toString(test));
-    }
-
-    public void test2OnClick(View view) {
-        boolean test = mKeychainContentProviderHelper.hasPublicKeyringByEmail("user@example.com");
-        if (test) {
-            mOutputTextView.setText("true");
-        } else {
-            mOutputTextView.setText("false");
-        }
-    }
-
-}
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 f60db04b2..1189d2cf4 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
@@ -24,7 +24,6 @@ import org.openintents.crypto.CryptoServiceConnection;
 import org.openintents.crypto.CryptoSignatureResult;
 import org.openintents.crypto.ICryptoCallback;
 import org.openintents.crypto.ICryptoService;
-import org.sufficientlysecure.keychain.integration.Constants;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/IntentDemoActivity.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/IntentDemoActivity.java
deleted file mode 100644
index 0fe3821b6..000000000
--- a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/IntentDemoActivity.java
+++ /dev/null
@@ -1,111 +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.sufficientlysecure.keychain.demo;
-
-import org.sufficientlysecure.keychain.demo.R;
-import org.sufficientlysecure.keychain.integration.KeychainData;
-import org.sufficientlysecure.keychain.integration.KeychainIntentHelper;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.TextView;
-
-public class IntentDemoActivity extends Activity {
-    Activity mActivity;
-
-    TextView mMessageTextView;
-    TextView mCiphertextTextView;
-    TextView mDataTextView;
-
-    KeychainIntentHelper mKeychainIntentHelper;
-    KeychainData mKeychainData;
-
-    /**
-     * Instantiate View for this Activity
-     */
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.intent_demo);
-
-        mActivity = this;
-
-        mMessageTextView = (TextView) findViewById(R.id.intent_demo_message);
-        mCiphertextTextView = (TextView) findViewById(R.id.intent_demo_ciphertext);
-        mDataTextView = (TextView) findViewById(R.id.intent_demo_data);
-
-        mKeychainIntentHelper = new KeychainIntentHelper(mActivity);
-        mKeychainData = new KeychainData();
-    }
-
-    public void createNewKeyOnClick(View view) {
-        // mKeychainIntentHelper.createNewKey();
-        mKeychainIntentHelper.createNewKey("test <user@example.com>", true, true);
-    }
-
-    public void selectSecretKeyOnClick(View view) {
-        mKeychainIntentHelper.selectSecretKey();
-    }
-
-    public void selectEncryptionKeysOnClick(View view) {
-        mKeychainIntentHelper.selectPublicKeys("user@example.com");
-    }
-
-    public void encryptOnClick(View view) {
-        mKeychainIntentHelper.encrypt(mMessageTextView.getText().toString(),
-                mKeychainData.getPublicKeys(), mKeychainData.getSecretKeyId(), false);
-    }
-
-    public void encryptAndReturnOnClick(View view) {
-        mKeychainIntentHelper.encrypt(mMessageTextView.getText().toString(),
-                mKeychainData.getPublicKeys(), mKeychainData.getSecretKeyId(), true);
-    }
-
-    public void decryptOnClick(View view) {
-        mKeychainIntentHelper.decrypt(mCiphertextTextView.getText().toString(), false);
-    }
-
-    public void decryptAndReturnOnClick(View view) {
-        mKeychainIntentHelper.decrypt(mCiphertextTextView.getText().toString(), true);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        // this updates the mKeychainData object to the result of the methods
-        boolean result = mKeychainIntentHelper.onActivityResult(requestCode, resultCode, data,
-                mKeychainData);
-        if (result) {
-            updateView();
-        }
-
-        // continue with other activity results
-        super.onActivityResult(requestCode, resultCode, data);
-    }
-
-    private void updateView() {
-        if (mKeychainData.getDecryptedData() != null) {
-            mMessageTextView.setText(mKeychainData.getDecryptedData());
-        }
-        if (mKeychainData.getEncryptedData() != null) {
-            mCiphertextTextView.setText(mKeychainData.getEncryptedData());
-        }
-        mDataTextView.setText(mKeychainData.toString());
-    }
-}