aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Torlaschi <runnerway@gmail.com>2016-03-04 09:16:09 +0100
committerAndrea Torlaschi <runnerway@gmail.com>2016-03-04 09:16:09 +0100
commit73bbfc54d9a250e93d57dc55793633d6c1a74b44 (patch)
tree12cd62a93ad0469ad288a0a61c9053b3733e0460
parent1cbecb1b3ba581c3ede9f37d2dd5f86c60fde986 (diff)
downloadopen-keychain-73bbfc54d9a250e93d57dc55793633d6c1a74b44.tar.gz
open-keychain-73bbfc54d9a250e93d57dc55793633d6c1a74b44.tar.bz2
open-keychain-73bbfc54d9a250e93d57dc55793633d6c1a74b44.zip
Remove uri from pending even when already added
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
index be08f6a53..22202a35f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
@@ -247,10 +247,10 @@ public class EncryptFilesFragment
try {
mFilesAdapter.add(inputUri);
} catch (IOException e) {
+ String fileName = FileHelper.getFilename(getActivity(), inputUri);
Notify.create(getActivity(),
- getActivity().getString(R.string.error_file_added_already, FileHelper.getFilename(getActivity(), inputUri)),
+ getActivity().getString(R.string.error_file_added_already, fileName),
Notify.Style.ERROR).show(this);
- return;
}
// remove from pending input uris