Merge remote-tracking branch 'origin/master'

esraiak · Jan 29, 2016 · a00ea66 · a00ea66
2 parents 61214fb + 693a9de
commit a00ea66
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/src/main/java/org/kontalk/ui/ComposeMessageFragment.java b/app/src/main/java/org/kontalk/ui/ComposeMessageFragment.java
@@ -3018,8 +3018,10 @@ protected synchronized void onQueryComplete(int token, Object cookie, Cursor cur
                     }
                     else {
                         // first query - use last id of this new cursor
-                        cursor.moveToFirst();
-                        mLastId = Conversation.getMessageId(cursor);
+                        if (cursor.getCount() > 0) {
+                            cursor.moveToFirst();
+                            mLastId = Conversation.getMessageId(cursor);
+                        }
 
                         // see if we have to scroll to a specific message
                         int newSelectionPos = -1;