diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-03-06 00:56:04 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-03-06 00:56:04 +0100 |
| commit | 6a3832659ebd25a22d772c5efd048864547701d3 (patch) | |
| tree | 4b433664d8a6fdb0868be74fb19a3a692a964e43 /OpenKeychain | |
| parent | 201c38ec02b37b9b389085e412d8ea01764b6276 (diff) | |
| parent | 73bbfc54d9a250e93d57dc55793633d6c1a74b44 (diff) | |
| download | open-keychain-6a3832659ebd25a22d772c5efd048864547701d3.tar.gz open-keychain-6a3832659ebd25a22d772c5efd048864547701d3.tar.bz2 open-keychain-6a3832659ebd25a22d772c5efd048864547701d3.zip | |
Merge pull request #1747 from runnerway/fix-alreadyadded
Fix duplicate file insertion while encrypting
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java | 4 |
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 |