1 files changed, 9 insertions, 5 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
index 854f065ec..80d476e68 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
@@ -57,10 +57,13 @@ public class PgpImportExport {
 
     private KeychainServiceListener mKeychainServiceListener;
 
+    private ProviderHelper mProviderHelper;
+
     public PgpImportExport(Context context, ProgressDialogUpdater progress) {
         super();
         this.mContext = context;
         this.mProgress = progress;
+        this.mProviderHelper = new ProviderHelper(context);
     }
 
     public PgpImportExport(Context context,
@@ -68,6 +71,7 @@ public class PgpImportExport {
         super();
         this.mContext = context;
         this.mProgress = progress;
+        this.mProviderHelper = new ProviderHelper(context);
         this.mKeychainServiceListener = keychainListener;
     }
 
@@ -196,7 +200,7 @@ public class PgpImportExport {
             updateProgress(progress * 100 / masterKeyIdsSize, 100);
 
             try {
-                PGPPublicKeyRing publicKeyRing = ProviderHelper.getPGPPublicKeyRing(mContext, pubKeyMasterId);
+                PGPPublicKeyRing publicKeyRing = mProviderHelper.getPGPPublicKeyRing(pubKeyMasterId);
 
                 publicKeyRing.encode(arOutStream);
             } catch (ProviderHelper.NotFoundException e) {
@@ -222,7 +226,7 @@ public class PgpImportExport {
             updateProgress(progress * 100 / masterKeyIdsSize, 100);
 
             try {
-                PGPSecretKeyRing secretKeyRing = ProviderHelper.getPGPSecretKeyRing(mContext, secretKeyMasterId);
+                PGPSecretKeyRing secretKeyRing = mProviderHelper.getPGPSecretKeyRing(secretKeyMasterId);
                 secretKeyRing.encode(arOutStream);
             } catch (ProviderHelper.NotFoundException e) {
                 Log.e(Constants.TAG, "key not found!", e);
@@ -279,15 +283,15 @@ public class PgpImportExport {
                         newPubRing = PGPPublicKeyRing.insertPublicKey(newPubRing, key);
                     }
                     if (newPubRing != null) {
-                        ProviderHelper.saveKeyRing(mContext, newPubRing);
+                        mProviderHelper.saveKeyRing(newPubRing);
                     }
-                    ProviderHelper.saveKeyRing(mContext, secretKeyRing);
+                    mProviderHelper.saveKeyRing(secretKeyRing);
                     // TODO: remove status returns, use exceptions!
                     status = Id.return_value.ok;
                 }
             } else if (keyring instanceof PGPPublicKeyRing) {
                 PGPPublicKeyRing publicKeyRing = (PGPPublicKeyRing) keyring;
-                ProviderHelper.saveKeyRing(mContext, publicKeyRing);
+                mProviderHelper.saveKeyRing(publicKeyRing);
                 // TODO: remove status returns, use exceptions!
                 status = Id.return_value.ok;
             }