From 256bc64d314d403dc6b40549f687872963726f05 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Wed, 8 Feb 2017 21:39:33 +0100
Subject: Stop Conversations force closing over sqlite errors due to long
 messages

---
 src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java')

diff --git a/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java b/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java
index b40452f1a..50519a2a7 100644
--- a/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java
+++ b/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java
@@ -597,8 +597,10 @@ public class DatabaseBackend extends SQLiteOpenHelper {
             cursor.moveToLast();
             do {
                 Message message = Message.fromCursor(cursor);
-                message.setConversation(conversation);
-                list.add(message);
+                if (message != null) {
+                    message.setConversation(conversation);
+                    list.add(message);
+                }
             } while (cursor.moveToPrevious());
         }
         cursor.close();
-- 
cgit v1.2.3