Fix didnt work, new fix and tests

3 files changed, 95 insertions, 1 deletions

diff --git a/APG-API-Demo/src/org/thialfihar/android/apg/demo/AidlDemoActivity.java b/APG-API-Demo/src/org/thialfihar/android/apg/demo/AidlDemoActivity.java
index f066e0957..7c08c0e06 100644
--- a/APG-API-Demo/src/org/thialfihar/android/apg/demo/AidlDemoActivity.java
+++ b/APG-API-Demo/src/org/thialfihar/android/apg/demo/AidlDemoActivity.java
@@ -1,3 +1,19 @@
+/*
+ * 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.demo;
 
 import org.thialfihar.android.apg.integration.ApgData;
@@ -17,7 +33,6 @@ import android.os.IBinder;
 import android.os.RemoteException;
 import android.view.View;
 import android.widget.TextView;
-import android.widget.Toast;
 
 public class AidlDemoActivity extends Activity {
     Activity mActivity;
diff --git a/APG-API-Demo/src/org/thialfihar/android/apg/demo/BaseActivity.java b/APG-API-Demo/src/org/thialfihar/android/apg/demo/BaseActivity.java
index 3f46b2e4d..66c3a9a0e 100644
--- a/APG-API-Demo/src/org/thialfihar/android/apg/demo/BaseActivity.java
+++ b/APG-API-Demo/src/org/thialfihar/android/apg/demo/BaseActivity.java
@@ -30,6 +30,7 @@ public class BaseActivity extends PreferenceActivity {
 
     private Preference mIntentDemo;
     private Preference mAidlDemo;
+    private Preference mContentProviderDemo;
 
     /**
      * Called when the activity is first created.
@@ -46,6 +47,7 @@ public class BaseActivity extends PreferenceActivity {
         // find preferences
         mIntentDemo = (Preference) findPreference("intent_demo");
         mAidlDemo = (Preference) findPreference("aidl_demo");
+        mContentProviderDemo = (Preference) findPreference("content_provider_demo");
 
         mIntentDemo.setOnPreferenceClickListener(new OnPreferenceClickListener() {
             @Override
@@ -64,6 +66,15 @@ public class BaseActivity extends PreferenceActivity {
                 return false;
             }
         });
+
+        mContentProviderDemo.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                startActivity(new Intent(mActivity, ContentProviderDemoActivity.class));
+
+                return false;
+            }
+        });
     }
 
 }
diff --git a/APG-API-Demo/src/org/thialfihar/android/apg/demo/ContentProviderDemoActivity.java b/APG-API-Demo/src/org/thialfihar/android/apg/demo/ContentProviderDemoActivity.java
new file mode 100644
index 000000000..6d7696a32
--- /dev/null
+++ b/APG-API-Demo/src/org/thialfihar/android/apg/demo/ContentProviderDemoActivity.java
@@ -0,0 +1,68 @@
+/*
+ * 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.demo;
+
+import java.util.Arrays;
+
+import org.thialfihar.android.apg.demo.R;
+import org.thialfihar.android.apg.integration.ApgContentProviderHelper;
+
+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;
+
+    ApgContentProviderHelper mApgContentProviderHelper;
+
+    /**
+     * 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);
+
+        mApgContentProviderHelper = new ApgContentProviderHelper(mActivity);
+    }
+
+    public void test1OnClick(View view) {
+        long[] test = mApgContentProviderHelper.getPublicKeyIdsFromEmail("user@example.com");
+        mOutputTextView.setText(Arrays.toString(test));
+    }
+
+    public void test2OnClick(View view) {
+        boolean test = mApgContentProviderHelper.hasPublicKeyForEmail("user@example.com");
+        if (test) {
+            mOutputTextView.setText("true");
+        } else {
+            mOutputTextView.setText("false");
+        }
+    }
+
+}