From 71dfbc8bcbb2be76aeb880e1b37fa0d1b42f6d06 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Mon, 13 Jan 2025 12:42:13 -0500 Subject: [PATCH] Use recommended style for group title search. --- .../java/org/thoughtcrime/securesms/database/GroupTable.kt | 2 +- .../org/thoughtcrime/securesms/database/RecipientTable.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/GroupTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/GroupTable.kt index be5596e1fe..9742bbc012 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/GroupTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/GroupTable.kt @@ -1395,7 +1395,7 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT "" } else { val glob = buildCaseInsensitiveGlobPattern(titleSearchQuery) - ", ($TITLE GLOB \"$glob\") as $TITLE_SEARCH_RANK" + ", ($TITLE GLOB '$glob') as $TITLE_SEARCH_RANK" } return """ diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt index 3078b7fce4..2a8f271f47 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt @@ -3234,7 +3234,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da fun getSystemContacts(): List { val results: MutableList = LinkedList() - readableDatabase.query(TABLE_NAME, ID_PROJECTION, "$SYSTEM_JOINED_NAME IS NOT NULL AND $SYSTEM_JOINED_NAME != \"\"", null, null, null, null).use { cursor -> + readableDatabase.query(TABLE_NAME, ID_PROJECTION, "$SYSTEM_JOINED_NAME IS NOT NULL AND $SYSTEM_JOINED_NAME != \'\'", null, null, null, null).use { cursor -> while (cursor != null && cursor.moveToNext()) { results.add(RecipientId.from(cursor.getLong(cursor.getColumnIndexOrThrow(ID)))) } @@ -3276,7 +3276,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da db.beginTransaction() try { - db.query(TABLE_NAME, arrayOf(ID, "color", CHAT_COLORS, CUSTOM_CHAT_COLORS_ID, SYSTEM_JOINED_NAME), "$SYSTEM_JOINED_NAME IS NOT NULL AND $SYSTEM_JOINED_NAME != \"\"", null, null, null, null).use { cursor -> + db.query(TABLE_NAME, arrayOf(ID, "color", CHAT_COLORS, CUSTOM_CHAT_COLORS_ID, SYSTEM_JOINED_NAME), "$SYSTEM_JOINED_NAME IS NOT NULL AND $SYSTEM_JOINED_NAME != \'\'", null, null, null, null).use { cursor -> while (cursor != null && cursor.moveToNext()) { val id = cursor.requireLong(ID) val serializedColor = cursor.requireString("color")