Fix didnt work, new fix and tests

2 files changed, 3 insertions, 3 deletions

diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ContentProviderHelper.java b/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgContentProviderHelper.java
index 7b725fe06..2c2531b02 100644
--- a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ContentProviderHelper.java
+++ b/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgContentProviderHelper.java
@@ -24,7 +24,7 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.widget.Toast;
 
-public class ContentProviderHelper {
+public class ApgContentProviderHelper {
     public static final String AUTHORITY = Constants.APG_PACKAGE_NAME;
 
     public static final Uri CONTENT_URI_PUBLIC_KEY_RING_BY_KEY_ID = Uri.parse("content://"
@@ -39,7 +39,7 @@ public class ContentProviderHelper {
 
     private Context activity;
 
-    public ContentProviderHelper(Activity activity) {
+    public ApgContentProviderHelper(Activity activity) {
         this.activity = activity;
     }
 
diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java b/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java
index f1b4c2bd1..09a544f26 100644
--- a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java
+++ b/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java
@@ -293,7 +293,7 @@ public class ApgIntentHelper {
         long[] initialKeyIds = null;
         if (apgData == null || !apgData.hasEncryptionKeys()) {
 
-            ContentProviderHelper cPHelper = new ContentProviderHelper(activity);
+            ApgContentProviderHelper cPHelper = new ApgContentProviderHelper(activity);
 
             initialKeyIds = cPHelper.getPublicKeyIdsFromEmail(emails);