diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-23 00:00:19 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-23 00:09:18 +0200 |
commit | 558cc6befca479d33c20ca58f426bda486b5ee8f (patch) | |
tree | 11b1add5d551547d06a7b00c08b43fdb93f218df /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java | |
parent | 4826e0a8c89e43401a3188d7a4d51cdbfd64c37a (diff) | |
download | open-keychain-558cc6befca479d33c20ca58f426bda486b5ee8f.tar.gz open-keychain-558cc6befca479d33c20ca58f426bda486b5ee8f.tar.bz2 open-keychain-558cc6befca479d33c20ca58f426bda486b5ee8f.zip |
instrument: adapt to new decrypt file dialog, and some minor fixes
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java index 29ccb0907..c8ae867b2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java @@ -19,6 +19,7 @@ package org.sufficientlysecure.keychain.ui; import java.util.ArrayList; +import android.app.Activity; import android.content.Intent; import android.database.Cursor; import android.net.Uri; @@ -152,7 +153,10 @@ public abstract class DecryptFragment extends Fragment implements LoaderManager. final ImportKeyResult result = returnData.getParcelable(OperationResult.EXTRA_RESULT); - result.createNotify(getActivity()).show(); + Activity activity = getActivity(); + if (result != null && activity != null) { + result.createNotify(activity).show(); + } getLoaderManager().restartLoader(LOADER_ID_UNIFIED, null, DecryptFragment.this); } |