From bcab081b8e39eb0d419e82c17d9e014c3250d2e2 Mon Sep 17 00:00:00 2001 From: Maxime Biais Date: Tue, 29 Jul 2014 14:13:20 +0200 Subject: [PATCH 1/2] fix #1681: null check --- .../wordpress/android/ui/comments/CommentsListFragment.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListFragment.java index 6adc08963c3e..4fa4bcff605e 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListFragment.java @@ -497,8 +497,9 @@ protected void onPostExecute(CommentList comments) { } mPullToRefreshHelper.setRefreshing(false); - if (isCancelled()) + if (isCancelled()) { return; + } mCanLoadMoreComments = (comments != null && comments.size() > 0); @@ -513,7 +514,7 @@ protected void onPostExecute(CommentList comments) { return; } } - if (comments.size() > 0) { + if (comments != null && comments.size() > 0) { getCommentAdapter().loadComments(); } } From 355020fc1e8b883b1f06eb5e04fb86591380a198 Mon Sep 17 00:00:00 2001 From: Maxime Biais Date: Tue, 29 Jul 2014 20:52:35 +0200 Subject: [PATCH 2/2] don't load comments adapter if the activity is finishing --- .../org/wordpress/android/ui/comments/CommentsListFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListFragment.java index 4fa4bcff605e..2f482b46aa6e 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListFragment.java @@ -514,7 +514,7 @@ protected void onPostExecute(CommentList comments) { return; } } - if (comments != null && comments.size() > 0) { + if (!getActivity().isFinishing() && comments != null && comments.size() > 0) { getCommentAdapter().loadComments(); } }