aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-12-21 20:31:23 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-12-21 20:31:23 +0100
commite7c9be955630a763a4d67a00fd8dbc195b2675b9 (patch)
tree2d6b017042a8dc5302aa1bd413b7151d187a5a29 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
parent5344307e2278e948d21356486dd020334f7c4519 (diff)
downloadopen-keychain-e7c9be955630a763a4d67a00fd8dbc195b2675b9.tar.gz
open-keychain-e7c9be955630a763a4d67a00fd8dbc195b2675b9.tar.bz2
open-keychain-e7c9be955630a763a4d67a00fd8dbc195b2675b9.zip
Make ContactHelper less static
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index ea87aa113..35e00ff21 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -243,7 +243,7 @@ public class ViewKeyActivity extends BaseNfcActivity implements
return;
}
if (mDataUri.getHost().equals(ContactsContract.AUTHORITY)) {
- mDataUri = ContactHelper.dataUriFromContactUri(this, mDataUri);
+ mDataUri = new ContactHelper(this).dataUriFromContactUri(mDataUri);
if (mDataUri == null) {
Log.e(Constants.TAG, "Contact Data missing. Should be uri of key!");
Toast.makeText(this, R.string.error_contacts_key_id_missing, Toast.LENGTH_LONG).show();
@@ -855,8 +855,8 @@ public class ViewKeyActivity extends BaseNfcActivity implements
AsyncTask<Long, Void, Bitmap> photoTask =
new AsyncTask<Long, Void, Bitmap>() {
protected Bitmap doInBackground(Long... mMasterKeyId) {
- return ContactHelper.loadPhotoByMasterKeyId(ViewKeyActivity.this,
- getContentResolver(), mMasterKeyId[0], true);
+ return new ContactHelper(ViewKeyActivity.this)
+ .loadPhotoByMasterKeyId(mMasterKeyId[0], true);
}
protected void onPostExecute(Bitmap photo) {