aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-07-08 03:12:24 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-07-08 03:12:24 +0200
commit4837d4cc5c86a5f5f18cb86300f165cf1b37f4d2 (patch)
treefeeaaa654f24df80453e69a43cff84770c95fd27 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
parent15cee8e7e995afe1c435004c3abba521439e4e0b (diff)
parentaf546ae10190ac076cd7b091cd064fb8a5c03519 (diff)
downloadopen-keychain-4837d4cc5c86a5f5f18cb86300f165cf1b37f4d2.tar.gz
open-keychain-4837d4cc5c86a5f5f18cb86300f165cf1b37f4d2.tar.bz2
open-keychain-4837d4cc5c86a5f5f18cb86300f165cf1b37f4d2.zip
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java7
1 files changed, 2 insertions, 5 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 b382e31d0..7b2796c69 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
@@ -387,13 +387,10 @@ public class EncryptFilesFragment
}
@Override
- public void onCryptoOperationSuccess(final SignEncryptResult result) {
+ public void onQueuedOperationSuccess(final SignEncryptResult result) {
+ // protected by Queueing*Fragment
FragmentActivity activity = getActivity();
- if (activity == null) {
- // it's gone, there's nothing we can do here
- return;
- }
if (mDeleteAfterEncrypt) {
// TODO make behavior coherent here