From 819f0f68f65cba1b16bc5b7e8793e16a4f4a152c Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 26 Jun 2020 10:46:44 -0400 Subject: [PATCH] Fix issue with some search results returning empty. --- .../org/thoughtcrime/securesms/database/ThreadDatabase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java index 525bd13faa..d4c303e305 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java @@ -950,7 +950,7 @@ public class ThreadDatabase extends Database { .setRecipient(recipient) .setType(cursor.getInt(cursor.getColumnIndexOrThrow(ThreadDatabase.SNIPPET_TYPE))) .setDistributionType(cursor.getInt(cursor.getColumnIndexOrThrow(ThreadDatabase.TYPE))) - .setBody(cursor.getString(cursor.getColumnIndexOrThrow(ThreadDatabase.SNIPPET))) + .setBody(Util.emptyIfNull(cursor.getString(cursor.getColumnIndexOrThrow(ThreadDatabase.SNIPPET)))) .setDate(cursor.getLong(cursor.getColumnIndexOrThrow(ThreadDatabase.DATE))) .setArchived(cursor.getInt(cursor.getColumnIndex(ThreadDatabase.ARCHIVED)) != 0) .setDeliveryStatus(cursor.getInt(cursor.getColumnIndexOrThrow(ThreadDatabase.STATUS)))