From c435c3ec22a555ebf16b0635918ec52f86b71c6c Mon Sep 17 00:00:00 2001 From: Christian Hagau Date: Wed, 25 Oct 2017 00:00:00 +0000 Subject: [PATCH] Fix NPE upon dialog dismissal --- .../keychain/remote/ui/dialog/RemoteDeduplicatePresenter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/RemoteDeduplicatePresenter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/RemoteDeduplicatePresenter.java index 5697dc9b3..abd08792e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/RemoteDeduplicatePresenter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/RemoteDeduplicatePresenter.java @@ -101,7 +101,9 @@ class RemoteDeduplicatePresenter implements LoaderCallbacks> { @Override public void onLoaderReset(Loader loader) { - view.setKeyListData(null); + if (view != null) { + view.setKeyListData(null); + } } void onClickSelect() {