Added an isAdded() check to queryNotes().

Automattic · Jan 27, 2015 · 535f539 · 535f539
1 parent f1af8d6
commit 535f539
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Simplenote/src/main/java/com/automattic/simplenote/NoteListFragment.java b/Simplenote/src/main/java/com/automattic/simplenote/NoteListFragment.java
@@ -431,6 +431,8 @@ public void refreshListFromNavSelect() {
     }
 
     public ObjectCursor<Note> queryNotes() {
+        if (!isAdded()) return null;
+
         NotesActivity notesActivity = (NotesActivity)getActivity();
         Query<Note> query = notesActivity.getSelectedTag().query();
 
@@ -688,7 +690,7 @@ protected ObjectCursor<Note> doInBackground(Boolean ... args) {
 
         @Override
         protected void onPostExecute(ObjectCursor<Note> cursor) {
-            if (getActivity() == null || getActivity().isFinishing())
+            if (cursor == null || getActivity() == null || getActivity().isFinishing())
                 return;
 
             // While using a Query.FullTextMatch it's easy to enter an invalid term so catch the error and clear the cursor