Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix null storageIds in chat folder crash.

Browse Source
This commit is contained in:
Michelle Tang
2025-04-04 16:42:57 -04:00
parent 8317e2e055
commit 5929021166
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/database/ChatFolderTables.kt
View File

@@ -192,7 +192,7 @@ class ChatFolderTables(context: Context?, databaseHelper: SignalDatabase?) : Dat
includedChats = includedChats[id] ?: emptyList(),
excludedChats = excludedChats[id] ?: emptyList(),
chatFolderId = ChatFolderId.from(cursor.requireNonNullString(ChatFolderTable.CHAT_FOLDER_ID)),
storageServiceId = StorageId.forChatFolder(Base64.decodeNullableOrThrow(cursor.requireString(ChatFolderTable.STORAGE_SERVICE_ID))),
storageServiceId = cursor.requireString(ChatFolderTable.STORAGE_SERVICE_ID)?.let { StorageId.forChatFolder(Base64.decodeNullableOrThrow(it)) },
storageServiceProto = Base64.decodeOrNull(cursor.requireString(ChatFolderTable.STORAGE_SERVICE_PROTO)),
deletedTimestampMs = cursor.requireLong(ChatFolderTable.DELETED_TIMESTAMP_MS)
)
@@ -228,7 +228,7 @@ class ChatFolderTables(context: Context?, databaseHelper: SignalDatabase?) : Dat
includedChats = includedChats[id] ?: emptyList(),
excludedChats = excludedChats[id] ?: emptyList(),
chatFolderId = ChatFolderId.from(cursor.requireNonNullString((ChatFolderTable.CHAT_FOLDER_ID))),
storageServiceId = StorageId.forChatFolder(Base64.decodeNullableOrThrow(cursor.requireString(RecipientTable.STORAGE_SERVICE_ID))),
storageServiceId = cursor.requireString(ChatFolderTable.STORAGE_SERVICE_ID)?.let { StorageId.forChatFolder(Base64.decodeNullableOrThrow(it)) },
storageServiceProto = Base64.decodeOrNull(cursor.requireString(ChatFolderTable.STORAGE_SERVICE_PROTO))
)
}
@@ -470,6 +470,7 @@ class ChatFolderTables(context: Context?, databaseHelper: SignalDatabase?) : Dat
return readableDatabase
.select(ChatFolderTable.CHAT_FOLDER_ID, ChatFolderTable.STORAGE_SERVICE_ID)
.from(ChatFolderTable.TABLE_NAME)
.where("${ChatFolderTable.STORAGE_SERVICE_ID} IS NOT NULL")
.run()
.readToMap { cursor ->
val id = ChatFolderId.from(cursor.requireNonNullString(ChatFolderTable.CHAT_FOLDER_ID))
@@ -486,6 +487,7 @@ class ChatFolderTables(context: Context?, databaseHelper: SignalDatabase?) : Dat
return readableDatabase
.select(ChatFolderTable.STORAGE_SERVICE_ID)
.from(ChatFolderTable.TABLE_NAME)
.where("${ChatFolderTable.STORAGE_SERVICE_ID} IS NOT NULL")
.run()
.readToList { cursor ->
val encodedKey = cursor.requireNonNullString(ChatFolderTable.STORAGE_SERVICE_ID)