From 094fb698deca4aa269a754e89acacde2f339a97f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Fri, 11 Apr 2014 17:45:52 +0200 Subject: Refactor ProviderHelper to be non-static using a constructor based on context (first commit to get context out of pgp classes) --- .../keychain/ui/dialog/DeleteKeyDialogFragment.java | 2 +- .../keychain/ui/dialog/PassphraseDialogFragment.java | 6 +++--- .../keychain/ui/dialog/ShareQrCodeDialogFragment.java | 10 ++++++---- 3 files changed, 10 insertions(+), 8 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java index 72ea4c013..c717f80ec 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java @@ -102,7 +102,7 @@ public class DeleteKeyDialogFragment extends DialogFragment { long masterKeyId = masterKeyIds[0]; - HashMap data = ProviderHelper.getUnifiedData(activity, masterKeyId, new String[]{ + HashMap data = new ProviderHelper(activity).getUnifiedData(masterKeyId, new String[]{ KeyRings.USER_ID, KeyRings.HAS_SECRET }, new int[] { ProviderHelper.FIELD_TYPE_STRING, ProviderHelper.FIELD_TYPE_INTEGER }); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java index 74bc73952..eaf4ddf6d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java @@ -140,7 +140,7 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor alert.setMessage(R.string.passphrase_for_symmetric_encryption); } else { try { - secretKey = ProviderHelper.getPGPSecretKeyRing(activity, secretKeyId).getSecretKey(); + secretKey = new ProviderHelper(activity).getPGPSecretKeyRing(secretKeyId).getSecretKey(); } catch (ProviderHelper.NotFoundException e) { alert.setTitle(R.string.title_key_not_found); alert.setMessage(getString(R.string.key_not_found, secretKeyId)); @@ -196,8 +196,8 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor return; } else { try { - clickSecretKey = PgpKeyHelper.getKeyNum(ProviderHelper - .getPGPSecretKeyRingWithKeyId(activity, secretKeyId), + clickSecretKey = PgpKeyHelper.getKeyNum(new ProviderHelper(activity) + .getPGPSecretKeyRingWithKeyId(secretKeyId), curKeyIndex); } catch (ProviderHelper.NotFoundException e) { Log.e(Constants.TAG, "key not found!", e); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java index 7e9a3d800..fa6317d1d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java @@ -41,6 +41,7 @@ import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.QrCodeUtils; import java.io.IOException; +import java.security.Provider; import java.util.ArrayList; public class ShareQrCodeDialogFragment extends DialogFragment { @@ -91,14 +92,15 @@ public class ShareQrCodeDialogFragment extends DialogFragment { mImage = (ImageView) view.findViewById(R.id.share_qr_code_dialog_image); mText = (TextView) view.findViewById(R.id.share_qr_code_dialog_text); + ProviderHelper providerHelper = new ProviderHelper(getActivity()); String content = null; if (mFingerprintOnly) { alert.setPositiveButton(R.string.btn_okay, null); - byte[] blob = (byte[]) ProviderHelper.getGenericData( - getActivity(), KeyRings.buildUnifiedKeyRingUri(dataUri), + byte[] blob = (byte[]) providerHelper.getGenericData( + KeyRings.buildUnifiedKeyRingUri(dataUri), KeyRings.FINGERPRINT, ProviderHelper.FIELD_TYPE_BLOB); - if(blob == null) { + if (blob == null) { Log.e(Constants.TAG, "key not found!"); AppMsg.makeText(getActivity(), R.string.error_key_not_found, AppMsg.STYLE_ALERT).show(); return null; @@ -113,7 +115,7 @@ public class ShareQrCodeDialogFragment extends DialogFragment { try { Uri uri = KeychainContract.KeyRingData.buildPublicKeyRingUri(dataUri); - content = ProviderHelper.getKeyRingAsArmoredString(getActivity(), uri); + content = providerHelper.getKeyRingAsArmoredString(uri); } catch (IOException e) { Log.e(Constants.TAG, "error processing key!", e); AppMsg.makeText(getActivity(), R.string.error_invalid_data, AppMsg.STYLE_ALERT).show(); -- cgit v1.2.3