2 files changed, 6 insertions, 5 deletions
diff --git a/org_apg/src/org/thialfihar/android/apg/passphrase/AskForPassphrase.java b/org_apg/src/org/thialfihar/android/apg/passphrase/AskForPassphrase.java
index 5711a16a8..4e7bdd70f 100644
--- a/org_apg/src/org/thialfihar/android/apg/passphrase/AskForPassphrase.java
+++ b/org_apg/src/org/thialfihar/android/apg/passphrase/AskForPassphrase.java
@@ -23,6 +23,7 @@ import org.spongycastle.openpgp.PGPSecretKey;
 import org.thialfihar.android.apg.Id;
 import org.thialfihar.android.apg.R;
 import org.thialfihar.android.apg.helper.PGPHelper;
+import org.thialfihar.android.apg.helper.PGPMain;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -55,7 +56,7 @@ public class AskForPassphrase {
             secretKey = null;
             alert.setMessage(context.getString(R.string.passPhraseForSymmetricEncryption));
         } else {
-            secretKey = PGPHelper.getMasterKey(PGPHelper.getSecretKeyRing(secretKeyId));
+            secretKey = PGPHelper.getMasterKey(PGPMain.getSecretKeyRing(secretKeyId));
             if (secretKey == null) {
                 alert.setTitle(R.string.title_keyNotFound);
                 alert.setMessage(context.getString(R.string.keyNotFound, secretKeyId));
@@ -111,7 +112,7 @@ public class AskForPassphrase {
                 }
                 
                 // cache again
-                PGPHelper.setCachedPassPhrase(keyId, passPhrase);
+                PGPMain.setCachedPassPhrase(keyId, passPhrase);
                 // return by callback
                 cb.passPhraseCallback(keyId, passPhrase);
             }
@@ -133,7 +134,7 @@ public class AskForPassphrase {
                     Log.d("APG", "Key has no passphrase!");
 
                     // cache null
-                    PGPHelper.setCachedPassPhrase(secretKey.getKeyID(), null);
+                    PGPMain.setCachedPassPhrase(secretKey.getKeyID(), null);
                     // return by callback
                     cb.passPhraseCallback(secretKey.getKeyID(), null);
 
diff --git a/org_apg/src/org/thialfihar/android/apg/passphrase/PassphraseCacheService.java b/org_apg/src/org/thialfihar/android/apg/passphrase/PassphraseCacheService.java
index 9325268fa..c7758cb4f 100644
--- a/org_apg/src/org/thialfihar/android/apg/passphrase/PassphraseCacheService.java
+++ b/org_apg/src/org/thialfihar/android/apg/passphrase/PassphraseCacheService.java
@@ -14,7 +14,7 @@
 
 package org.thialfihar.android.apg.passphrase;
 
-import org.thialfihar.android.apg.helper.PGPHelper;
+import org.thialfihar.android.apg.helper.PGPMain;
 import org.thialfihar.android.apg.helper.Preferences;
 
 import android.app.Service;
@@ -47,7 +47,7 @@ public class PassphraseCacheService extends Service {
                 delay = 60000;
             }
 
-            delay = PGPHelper.cleanUpCache(mPassPhraseCacheTtl, delay);
+            delay = PGPMain.cleanUpCache(mPassPhraseCacheTtl, delay);
             // don't check too often, even if we were close
             if (delay < 5000) {
                 delay = 5000;