From 97c55ee4bb519236027edc973851e7bbc52c97f3 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Wed, 16 Sep 2015 17:47:16 +0200 Subject: multidecrypt: context menu per card, not per file --- .../org/sufficientlysecure/keychain/ui/DecryptListFragment.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java index cc7e0253c..5f6089fd9 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java @@ -325,6 +325,7 @@ public class DecryptListFragment Drawable icon = null; if (ClipDescription.compareMimeTypes(type, "text/plain")) { + // noinspection deprecation, this should be called from Context, but not available in minSdk icon = getResources().getDrawable(R.drawable.ic_chat_black_24dp); } else if (ClipDescription.compareMimeTypes(type, "image/*")) { int px = FormattingUtils.dpToPx(context, 48); @@ -478,6 +479,10 @@ public class DecryptListFragment intent.putExtra(LogDisplayFragment.EXTRA_RESULT, model.mResult); activity.startActivity(intent); return true; + case R.id.decrypt_delete: + deleteFile(activity, model.mInputUri); + return true; + /* case R.id.decrypt_share: displayWithViewIntent(model.mResult, 0, true); return true; @@ -490,9 +495,7 @@ public class DecryptListFragment FileHelper.saveDocument(this, metadata.getFilename(), model.mInputUri, metadata.getMimeType(), R.string.title_decrypt_to_file, R.string.specify_file_to_decrypt_to, REQUEST_CODE_OUTPUT); return true; - case R.id.decrypt_delete: - deleteFile(activity, model.mInputUri); - return true; + */ } return false; } -- cgit v1.2.3