aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-09-16 17:47:16 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-09-16 17:47:16 +0200
commit97c55ee4bb519236027edc973851e7bbc52c97f3 (patch)
tree1390349b9e784881fe7b5ae38d61e7c5954b4d61 /OpenKeychain/src/main/java/org/sufficientlysecure
parentce105d955fff57d8e7b90acbf823d66567e89290 (diff)
downloadopen-keychain-97c55ee4bb519236027edc973851e7bbc52c97f3.tar.gz
open-keychain-97c55ee4bb519236027edc973851e7bbc52c97f3.tar.bz2
open-keychain-97c55ee4bb519236027edc973851e7bbc52c97f3.zip
multidecrypt: context menu per card, not per file
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java9
1 files changed, 6 insertions, 3 deletions
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;
}