Refactor ProviderHelper to be non-static using a constructor based on context (first commit to get context out of pgp classes)

1 files changed, 2 insertions, 2 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
index 91d9b5584..8fdc7b146 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
@@ -172,7 +172,7 @@ public class PassphraseCacheService extends Service {
         long masterKeyId = keyId;
         if (masterKeyId != Id.key.symmetric) {
             try {
-                masterKeyId = ProviderHelper.getMasterKeyId(this,
+                masterKeyId = new ProviderHelper(this).getMasterKeyId(
                         KeychainContract.KeyRings.buildUnifiedKeyRingsFindBySubkeyUri(Long.toString(keyId)));
             } catch (ProviderHelper.NotFoundException e) {
                 return null;
@@ -234,7 +234,7 @@ public class PassphraseCacheService extends Service {
     public static boolean hasPassphrase(Context context, long secretKeyId) {
         // check if the key has no passphrase
         try {
-            PGPSecretKeyRing secRing = ProviderHelper.getPGPSecretKeyRing(context, secretKeyId);
+            PGPSecretKeyRing secRing = new ProviderHelper(context).getPGPSecretKeyRing(secretKeyId);
             return hasPassphrase(secRing);
         } catch (ProviderHelper.NotFoundException e) {
             Log.e(Constants.TAG, "key not found!", e);