diff options
author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-24 01:15:11 +0530 |
---|---|---|
committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-27 01:20:23 +0530 |
commit | 6e425e95f55c16cbc61dd60a4f84aca60af71215 (patch) | |
tree | c5399edbfaa80d2eba634a31192d01741f1ab273 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java | |
parent | af6a37f02b0fd51bc895e1b9aa5fea2fc0c209be (diff) | |
download | open-keychain-6e425e95f55c16cbc61dd60a4f84aca60af71215.tar.gz open-keychain-6e425e95f55c16cbc61dd60a4f84aca60af71215.tar.bz2 open-keychain-6e425e95f55c16cbc61dd60a4f84aca60af71215.zip |
migrated delete op to KeychainNewService
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java index 43106820f..a9002cf4a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java @@ -208,6 +208,11 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu mUseFragment ? mFragment.getFragmentManager() : mActivity.getSupportFragmentManager(); + if (fragmentManager == null) { // the fragment holding us has died + // fragmentManager was null when used with DialogFragments. (they close on click?) + return; + } + ProgressDialogFragment progressDialogFragment = (ProgressDialogFragment) fragmentManager.findFragmentByTag( ServiceProgressHandler.TAG_PROGRESS_DIALOG); @@ -283,7 +288,7 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu } public void onHandleResult(OperationResult result) { - Log.d("PHILIP", "Handling result in OperationHelper"); + Log.d("PHILIP", "Handling result in OperationHelper " + result); if (result instanceof InputPendingResult) { Log.d("PHILIP", "is pending result"); |