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

4 files changed, 19 insertions, 19 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java
index 123ed526f..87d60e657 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java
@@ -90,7 +90,7 @@ public class AccountSettingsActivity extends ActionBarActivity {
     }
 
     private void loadData(Uri accountUri) {
-        AccountSettings settings = ProviderHelper.getApiAccountSettings(this, accountUri);
+        AccountSettings settings = new ProviderHelper(this).getApiAccountSettings(accountUri);
         mAccountSettingsFragment.setAccSettings(settings);
     }
 
@@ -102,7 +102,7 @@ public class AccountSettingsActivity extends ActionBarActivity {
     }
 
     private void save() {
-        ProviderHelper.updateApiAccount(this, mAccountSettingsFragment.getAccSettings(), mAccountUri);
+        new ProviderHelper(this).updateApiAccount(mAccountSettingsFragment.getAccSettings(), mAccountUri);
         finish();
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java
index a13c7a953..4aefc38da 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java
@@ -180,8 +180,8 @@ public class AccountSettingsFragment extends Fragment implements
                 if (resultCode == Activity.RESULT_OK) {
                     // select newly created key
                     try {
-                        long masterKeyId = ProviderHelper.extractOrGetMasterKeyId(
-                                getActivity(), data.getData());
+                        long masterKeyId = new ProviderHelper(getActivity())
+                                .extractOrGetMasterKeyId(data.getData());
                         mSelectKeyFragment.selectKey(masterKeyId);
                     } catch (ProviderHelper.NotFoundException e) {
                         Log.e(Constants.TAG, "key not found!", e);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java
index 818c296c1..66f9411ff 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java
@@ -85,7 +85,7 @@ public class AppSettingsActivity extends ActionBarActivity {
     }
 
     private void loadData(Bundle savedInstanceState, Uri appUri) {
-        AppSettings settings = ProviderHelper.getApiAppSettings(this, appUri);
+        AppSettings settings = new ProviderHelper(this).getApiAppSettings(appUri);
         mSettingsFragment.setAppSettings(settings);
 
         String appName;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
index ab95f2691..dddd92979 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
@@ -103,7 +103,7 @@ public class RemoteServiceActivity extends ActionBarActivity {
                         public void onClick(View v) {
                             // Allow
 
-                            ProviderHelper.insertApiApp(RemoteServiceActivity.this,
+                            new ProviderHelper(RemoteServiceActivity.this).insertApiApp(
                                     mAppSettingsFragment.getAppSettings());
 
                             // give data through for new service call
@@ -146,7 +146,7 @@ public class RemoteServiceActivity extends ActionBarActivity {
                                 mAccSettingsFragment.setErrorOnSelectKeyFragment(
                                         getString(R.string.api_register_error_select_key));
                             } else {
-                                ProviderHelper.insertApiAccount(RemoteServiceActivity.this,
+                                new ProviderHelper(RemoteServiceActivity.this).insertApiAccount(
                                         KeychainContract.ApiAccounts.buildBaseUri(packageName),
                                         mAccSettingsFragment.getAccSettings());
 
@@ -179,19 +179,19 @@ public class RemoteServiceActivity extends ActionBarActivity {
             final Intent resultData = extras.getParcelable(EXTRA_DATA);
 
             PassphraseDialogFragment.show(this, secretKeyId,
-                new Handler() {
-                    @Override
-                    public void handleMessage(Message message) {
-                        if (message.what == PassphraseDialogFragment.MESSAGE_OKAY) {
-                            // return given params again, for calling the service method again
-                            RemoteServiceActivity.this.setResult(RESULT_OK, resultData);
-                        } else {
-                            RemoteServiceActivity.this.setResult(RESULT_CANCELED);
-                        }
+                    new Handler() {
+                        @Override
+                        public void handleMessage(Message message) {
+                            if (message.what == PassphraseDialogFragment.MESSAGE_OKAY) {
+                                // return given params again, for calling the service method again
+                                RemoteServiceActivity.this.setResult(RESULT_OK, resultData);
+                            } else {
+                                RemoteServiceActivity.this.setResult(RESULT_CANCELED);
+                            }
 
-                        RemoteServiceActivity.this.finish();
-                    }
-                });
+                            RemoteServiceActivity.this.finish();
+                        }
+                    });
 
         } else if (ACTION_SELECT_PUB_KEYS.equals(action)) {
             long[] selectedMasterKeyIds = intent.getLongArrayExtra(EXTRA_SELECTED_MASTER_KEY_IDS);