cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

multidecrypt: don't pass context to adapter

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-09-16 01:20:16 +02:00
parent 13509a0b90
commit 96865ccbaa
2 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
View File

@@ -131,7 +131,7 @@ public class DecryptListFragment
vFilesList.setLayoutManager(new LinearLayoutManager(getActivity())); vFilesList.setLayoutManager(new LinearLayoutManager(getActivity()));
vFilesList.setItemAnimator(new DefaultItemAnimator()); vFilesList.setItemAnimator(new DefaultItemAnimator());
mAdapter = new DecryptFilesAdapter(getActivity(), this); mAdapter = new DecryptFilesAdapter(this);
vFilesList.setAdapter(mAdapter); vFilesList.setAdapter(mAdapter);
return view; return view;
@@ -526,13 +526,11 @@ public class DecryptListFragment
} }
public class DecryptFilesAdapter extends RecyclerView.Adapter<ViewHolder> { public class DecryptFilesAdapter extends RecyclerView.Adapter<ViewHolder> {
private Context mContext;
private ArrayList<ViewModel> mDataset; private ArrayList<ViewModel> mDataset;
private OnMenuItemClickListener mMenuItemClickListener; private OnMenuItemClickListener mMenuItemClickListener;
private ViewModel mMenuClickedModel; private ViewModel mMenuClickedModel;
public class ViewModel { public class ViewModel {
Context mContext;
Uri mInputUri; Uri mInputUri;
InputDataResult mResult; InputDataResult mResult;
Drawable mIcon; Drawable mIcon;
@@ -541,8 +539,7 @@ public class DecryptListFragment
String mProgressMsg; String mProgressMsg;
OnClickListener mCancelled; OnClickListener mCancelled;
ViewModel(Context context, Uri uri) { ViewModel(Uri uri) {
mContext = context;
mInputUri = uri; mInputUri = uri;
mProgress = 0; mProgress = 0;
mMax = 100; mMax = 100;
@@ -600,8 +597,7 @@ public class DecryptListFragment
} }
// Provide a suitable constructor (depends on the kind of dataset) // Provide a suitable constructor (depends on the kind of dataset)
public DecryptFilesAdapter(Context context, OnMenuItemClickListener menuItemClickListener) { public DecryptFilesAdapter(OnMenuItemClickListener menuItemClickListener) {
mContext = context;
mMenuItemClickListener = menuItemClickListener; mMenuItemClickListener = menuItemClickListener;
mDataset = new ArrayList<>(); mDataset = new ArrayList<>();
} }
@@ -665,15 +661,15 @@ public class DecryptListFragment
holder.vAnimator.setDisplayedChild(1); holder.vAnimator.setDisplayedChild(1);
} }
KeyFormattingUtils.setStatus(mContext, holder, model.mResult.mDecryptVerifyResult); KeyFormattingUtils.setStatus(getResources(), holder, model.mResult.mDecryptVerifyResult);
final OpenPgpMetadata metadata = model.mResult.mDecryptVerifyResult.getDecryptionMetadata(); final OpenPgpMetadata metadata = model.mResult.mDecryptVerifyResult.getDecryptionMetadata();
String filename; String filename;
if (metadata == null) { if (metadata == null) {
filename = mContext.getString(R.string.filename_unknown); filename = getString(R.string.filename_unknown);
} else if (TextUtils.isEmpty(metadata.getFilename())) { } else if (TextUtils.isEmpty(metadata.getFilename())) {
filename = mContext.getString("text/plain".equals(metadata.getMimeType()) filename = getString("text/plain".equals(metadata.getMimeType())
? R.string.filename_unknown_text : R.string.filename_unknown); ? R.string.filename_unknown_text : R.string.filename_unknown);
} else { } else {
filename = metadata.getFilename(); filename = metadata.getFilename();
@@ -709,9 +705,13 @@ public class DecryptListFragment
holder.vSignatureLayout.setOnClickListener(new OnClickListener() { holder.vSignatureLayout.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
Intent intent = new Intent(mContext, ViewKeyActivity.class); Activity activity = getActivity();
if (activity == null) {
return;
}
Intent intent = new Intent(activity, ViewKeyActivity.class);
intent.setData(KeyRings.buildUnifiedKeyRingUri(keyId)); intent.setData(KeyRings.buildUnifiedKeyRingUri(keyId));
mContext.startActivity(intent); activity.startActivity(intent);
} }
}); });
} }
@@ -721,8 +721,12 @@ public class DecryptListFragment
holder.vContextMenu.setOnClickListener(new OnClickListener() { holder.vContextMenu.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
Activity activity = getActivity();
if (activity == null) {
return;
}
mMenuClickedModel = model; mMenuClickedModel = model;
PopupMenu menu = new PopupMenu(mContext, view); PopupMenu menu = new PopupMenu(activity, view);
menu.inflate(R.menu.decrypt_item_context_menu); menu.inflate(R.menu.decrypt_item_context_menu);
menu.setOnMenuItemClickListener(mMenuItemClickListener); menu.setOnMenuItemClickListener(mMenuItemClickListener);
menu.setOnDismissListener(new OnDismissListener() { menu.setOnDismissListener(new OnDismissListener() {
@@ -746,9 +750,13 @@ public class DecryptListFragment
holder.vErrorViewLog.setOnClickListener(new OnClickListener() { holder.vErrorViewLog.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Intent intent = new Intent(mContext, LogDisplayActivity.class); Activity activity = getActivity();
if (activity == null) {
return;
}
Intent intent = new Intent(activity, LogDisplayActivity.class);
intent.putExtra(LogDisplayFragment.EXTRA_RESULT, model.mResult); intent.putExtra(LogDisplayFragment.EXTRA_RESULT, model.mResult);
mContext.startActivity(intent); activity.startActivity(intent);
} }
}); });
@@ -761,7 +769,7 @@ public class DecryptListFragment
} }
public InputDataResult getItemResult(Uri uri) { public InputDataResult getItemResult(Uri uri) {
ViewModel model = new ViewModel(mContext, uri); ViewModel model = new ViewModel(uri);
int pos = mDataset.indexOf(model); int pos = mDataset.indexOf(model);
if (pos == -1) { if (pos == -1) {
return null; return null;
@@ -772,20 +780,20 @@ public class DecryptListFragment
} }
public void add(Uri uri) { public void add(Uri uri) {
ViewModel newModel = new ViewModel(mContext, uri); ViewModel newModel = new ViewModel(uri);
mDataset.add(newModel); mDataset.add(newModel);
notifyItemInserted(mDataset.size()); notifyItemInserted(mDataset.size());
} }
public void setProgress(Uri uri, int progress, int max, String msg) { public void setProgress(Uri uri, int progress, int max, String msg) {
ViewModel newModel = new ViewModel(mContext, uri); ViewModel newModel = new ViewModel(uri);
int pos = mDataset.indexOf(newModel); int pos = mDataset.indexOf(newModel);
mDataset.get(pos).setProgress(progress, max, msg); mDataset.get(pos).setProgress(progress, max, msg);
notifyItemChanged(pos); notifyItemChanged(pos);
} }
public void setCancelled(Uri uri, OnClickListener retryListener) { public void setCancelled(Uri uri, OnClickListener retryListener) {
ViewModel newModel = new ViewModel(mContext, uri); ViewModel newModel = new ViewModel(uri);
int pos = mDataset.indexOf(newModel); int pos = mDataset.indexOf(newModel);
mDataset.get(pos).setCancelled(retryListener); mDataset.get(pos).setCancelled(retryListener);
notifyItemChanged(pos); notifyItemChanged(pos);
@@ -793,7 +801,7 @@ public class DecryptListFragment
public void addResult(Uri uri, InputDataResult result, Drawable icon) { public void addResult(Uri uri, InputDataResult result, Drawable icon) {
ViewModel model = new ViewModel(mContext, uri); ViewModel model = new ViewModel(uri);
int pos = mDataset.indexOf(model); int pos = mDataset.indexOf(model);
model = mDataset.get(pos); model = mDataset.get(pos);

11
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java
View File

@@ -19,6 +19,7 @@
package org.sufficientlysecure.keychain.ui.util; package org.sufficientlysecure.keychain.ui.util;
import android.content.Context; import android.content.Context;
import android.content.res.Resources;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.PorterDuff; import android.graphics.PorterDuff;
import android.text.Spannable; import android.text.Spannable;
@@ -446,7 +447,7 @@ public class KeyFormattingUtils {
} }
@SuppressWarnings("deprecation") // context.getDrawable is api lvl 21, need to use deprecated @SuppressWarnings("deprecation") // context.getDrawable is api lvl 21, need to use deprecated
public static void setStatus(Context context, StatusHolder holder, DecryptVerifyResult result) { public static void setStatus(Resources resources, StatusHolder holder, DecryptVerifyResult result) {
if (holder.hasEncrypt()) { if (holder.hasEncrypt()) {
OpenPgpDecryptionResult decryptionResult = result.getDecryptionResult(); OpenPgpDecryptionResult decryptionResult = result.getDecryptionResult();
@@ -477,9 +478,9 @@ public class KeyFormattingUtils {
} }
} }
int encColorRes = context.getResources().getColor(encColor); int encColorRes = resources.getColor(encColor);
holder.getEncryptionStatusIcon().setColorFilter(encColorRes, PorterDuff.Mode.SRC_IN); holder.getEncryptionStatusIcon().setColorFilter(encColorRes, PorterDuff.Mode.SRC_IN);
holder.getEncryptionStatusIcon().setImageDrawable(context.getResources().getDrawable(encIcon)); holder.getEncryptionStatusIcon().setImageDrawable(resources.getDrawable(encIcon));
holder.getEncryptionStatusText().setText(encText); holder.getEncryptionStatusText().setText(encText);
holder.getEncryptionStatusText().setTextColor(encColorRes); holder.getEncryptionStatusText().setTextColor(encColorRes);
} }
@@ -577,9 +578,9 @@ public class KeyFormattingUtils {
} }
int sigColorRes = context.getResources().getColor(sigColor); int sigColorRes = resources.getColor(sigColor);
holder.getSignatureStatusIcon().setColorFilter(sigColorRes, PorterDuff.Mode.SRC_IN); holder.getSignatureStatusIcon().setColorFilter(sigColorRes, PorterDuff.Mode.SRC_IN);
holder.getSignatureStatusIcon().setImageDrawable(context.getResources().getDrawable(sigIcon)); holder.getSignatureStatusIcon().setImageDrawable(resources.getDrawable(sigIcon));
holder.getSignatureStatusText().setText(sigText); holder.getSignatureStatusText().setText(sigText);
holder.getSignatureStatusText().setTextColor(sigColorRes); holder.getSignatureStatusText().setTextColor(sigColorRes);