Merge pull request #2197 from hagau/fix_npe_dedup

Fix NPE upon dialog dismissal in RemoteDeduplicatePresenter
2017-10-26 12:02:11 +02:00
parent 0bb32fad2a c435c3ec22
commit 07243bcefe
1 changed files with 3 additions and 1 deletions
--- 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,8 +101,10 @@ class RemoteDeduplicatePresenter implements LoaderCallbacks<List<KeyInfo>> {

    @Override
    public void onLoaderReset(Loader loader) {
+        if (view != null) {
            view.setKeyListData(null);
        }
+    }

    void onClickSelect() {
        if (keyInfoData == null) {