3 files changed, 5 insertions, 6 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 65bd3caf5..2174b6e09 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
@@ -19,6 +19,7 @@ package org.thialfihar.android.apg.demo;
 import org.thialfihar.android.apg.integration.ApgData;
 import org.thialfihar.android.apg.integration.ApgIntentHelper;
 import org.thialfihar.android.apg.service.IApgApiService;
+import org.thialfihar.android.apg.service.IApgKeyService;
 import org.thialfihar.android.apg.service.handler.IApgDecryptHandler;
 import org.thialfihar.android.apg.service.handler.IApgEncryptHandler;
 import org.thialfihar.android.apg.service.handler.IApgGetDecryptionKeyIdHandler;
@@ -70,8 +71,7 @@ public class AidlDemoActivity extends Activity {
         mApgIntentHelper = new ApgIntentHelper(mActivity);
         mApgData = new ApgData();
 
-        bindService(new Intent("org.thialfihar.android.apg.service.IApgApiService"), svcConn,
-                Context.BIND_AUTO_CREATE);
+        bindService(new Intent(IApgApiService.class.getName()), svcConn, Context.BIND_AUTO_CREATE);
     }
 
     public void encryptOnClick(View view) {
diff --git a/APG-API-Demo/src/org/thialfihar/android/apg/demo/AidlDemoActivity2.java b/APG-API-Demo/src/org/thialfihar/android/apg/demo/AidlDemoActivity2.java
index 51054f58a..4a862e8ae 100644
--- a/APG-API-Demo/src/org/thialfihar/android/apg/demo/AidlDemoActivity2.java
+++ b/APG-API-Demo/src/org/thialfihar/android/apg/demo/AidlDemoActivity2.java
@@ -72,8 +72,7 @@ public class AidlDemoActivity2 extends Activity {
         mApgIntentHelper = new ApgIntentHelper(mActivity);
         mApgData = new ApgData();
 
-        bindService(new Intent("org.thialfihar.android.apg.service.IApgKeyService"), svcConn,
-                Context.BIND_AUTO_CREATE);
+        bindService(new Intent(IApgKeyService.class.getName()), svcConn, Context.BIND_AUTO_CREATE);
     }
 
     public void getKeyringsStringsOnClick(View view) {
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
index 6d7696a32..892b41429 100644
--- a/APG-API-Demo/src/org/thialfihar/android/apg/demo/ContentProviderDemoActivity.java
+++ b/APG-API-Demo/src/org/thialfihar/android/apg/demo/ContentProviderDemoActivity.java
@@ -52,12 +52,12 @@ public class ContentProviderDemoActivity extends Activity {
     }
 
     public void test1OnClick(View view) {
-        long[] test = mApgContentProviderHelper.getPublicKeyIdsFromEmail("user@example.com");
+        long[] test = mApgContentProviderHelper.getPublicKeyringIdsByEmail("user@example.com");
         mOutputTextView.setText(Arrays.toString(test));
     }
 
     public void test2OnClick(View view) {
-        boolean test = mApgContentProviderHelper.hasPublicKeyForEmail("user@example.com");
+        boolean test = mApgContentProviderHelper.hasPublicKeyringByEmail("user@example.com");
         if (test) {
             mOutputTextView.setText("true");
         } else {