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

multidecrypt: inline setOnClickListener

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-09-16 01:14:40 +02:00
parent 99fd1f4c22
commit 13509a0b90
1 changed files with 26 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -262,7 +262,7 @@ public class DecryptListFragment
final Uri uri = mCurrentInputUri; final Uri uri = mCurrentInputUri;
mCurrentInputUri = null; mCurrentInputUri = null;
mAdapter.addResult(uri, result, null, null, null); mAdapter.addResult(uri, result, null);
cryptoOperation(); cryptoOperation();
} }
@@ -349,38 +349,7 @@ public class DecryptListFragment
private void processResult(final Uri uri, Drawable icon) { private void processResult(final Uri uri, Drawable icon) {
InputDataResult result = mInputDataResults.get(uri); InputDataResult result = mInputDataResults.get(uri);
mAdapter.addResult(uri, result, icon);
OnClickListener onFileClick = null, onKeyClick = null;
OpenPgpSignatureResult sigResult = result.mDecryptVerifyResult.getSignatureResult();
if (sigResult != null) {
final long keyId = sigResult.getKeyId();
if (sigResult.getResult() != OpenPgpSignatureResult.RESULT_KEY_MISSING) {
onKeyClick = new OnClickListener() {
@Override
public void onClick(View view) {
Activity activity = getActivity();
if (activity == null) {
return;
}
Intent intent = new Intent(activity, ViewKeyActivity.class);
intent.setData(KeyRings.buildUnifiedKeyRingUri(keyId));
activity.startActivity(intent);
}
};
}
}
if (result.success() && result.mDecryptVerifyResult.getDecryptionMetadata() != null) {
onFileClick = new OnClickListener() {
@Override
public void onClick(View view) {
displayWithViewIntent(uri, false);
}
};
}
mAdapter.addResult(uri, result, icon, onFileClick, onKeyClick);
} }
@@ -568,9 +537,6 @@ public class DecryptListFragment
InputDataResult mResult; InputDataResult mResult;
Drawable mIcon; Drawable mIcon;
OnClickListener mOnFileClickListener;
OnClickListener mOnKeyClickListener;
int mProgress, mMax; int mProgress, mMax;
String mProgressMsg; String mProgressMsg;
OnClickListener mCancelled; OnClickListener mCancelled;
@@ -591,11 +557,6 @@ public class DecryptListFragment
mIcon = icon; mIcon = icon;
} }
void setOnClickListeners(OnClickListener onFileClick, OnClickListener onKeyClick) {
mOnFileClickListener = onFileClick;
mOnKeyClickListener = onKeyClick;
}
boolean hasResult() { boolean hasResult() {
return mResult != null; return mResult != null;
} }
@@ -732,8 +693,29 @@ public class DecryptListFragment
holder.vThumbnail.setImageResource(R.drawable.ic_doc_generic_am); holder.vThumbnail.setImageResource(R.drawable.ic_doc_generic_am);
} }
holder.vFile.setOnClickListener(model.mOnFileClickListener); holder.vFile.setOnClickListener(new OnClickListener() {
holder.vSignatureLayout.setOnClickListener(model.mOnKeyClickListener); @Override
public void onClick(View view) {
if (model.mResult.success() && model.mResult.mDecryptVerifyResult.getDecryptionMetadata() != null) {
displayWithViewIntent(model.mInputUri, false);
}
}
});
OpenPgpSignatureResult sigResult = model.mResult.mDecryptVerifyResult.getSignatureResult();
if (sigResult != null) {
final long keyId = sigResult.getKeyId();
if (sigResult.getResult() != OpenPgpSignatureResult.RESULT_KEY_MISSING) {
holder.vSignatureLayout.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
Intent intent = new Intent(mContext, ViewKeyActivity.class);
intent.setData(KeyRings.buildUnifiedKeyRingUri(keyId));
mContext.startActivity(intent);
}
});
}
}
holder.vContextMenu.setTag(model); holder.vContextMenu.setTag(model);
holder.vContextMenu.setOnClickListener(new OnClickListener() { holder.vContextMenu.setOnClickListener(new OnClickListener() {
@@ -809,8 +791,7 @@ public class DecryptListFragment
notifyItemChanged(pos); notifyItemChanged(pos);
} }
public void addResult(Uri uri, InputDataResult result, Drawable icon, public void addResult(Uri uri, InputDataResult result, Drawable icon) {
OnClickListener onFileClick, OnClickListener onKeyClick) {
ViewModel model = new ViewModel(mContext, uri); ViewModel model = new ViewModel(mContext, uri);
int pos = mDataset.indexOf(model); int pos = mDataset.indexOf(model);
@@ -820,7 +801,6 @@ public class DecryptListFragment
if (icon != null) { if (icon != null) {
model.addIcon(icon); model.addIcon(icon);
} }
model.setOnClickListeners(onFileClick, onKeyClick);
notifyItemChanged(pos); notifyItemChanged(pos);
} }