Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 16:49:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when deleting threads directly after backup restore.

Browse Source
This commit is contained in:
Cody Henthorne
2021-07-15 10:10:14 -04:00
committed by Greyson Parrelli
parent 0a7a7cf5a9
commit 51a521594f
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
View File

@@ -905,7 +905,8 @@ public class ThreadDatabase extends Database {
}
public void deleteConversation(long threadId) {
SQLiteDatabase db = databaseHelper.getWritableDatabase();
SQLiteDatabase db = databaseHelper.getWritableDatabase();
RecipientId recipientIdForThreadId = getRecipientIdForThreadId(threadId);
db.beginTransaction();
try {
@@ -922,11 +923,12 @@ public class ThreadDatabase extends Database {
notifyConversationListListeners();
notifyConversationListeners(threadId);
ConversationUtil.clearShortcuts(context, Collections.singleton(threadId));
ConversationUtil.clearShortcuts(context, Collections.singleton(recipientIdForThreadId));
}
public void deleteConversations(Set<Long> selectedConversations) {
SQLiteDatabase db = databaseHelper.getWritableDatabase();
SQLiteDatabase db = databaseHelper.getWritableDatabase();
List<RecipientId> recipientIdsForThreadIds = getRecipientIdsForThreadIds(selectedConversations);
db.beginTransaction();
try {
@@ -952,7 +954,7 @@ public class ThreadDatabase extends Database {
notifyConversationListListeners();
notifyConversationListeners(selectedConversations);
ConversationUtil.clearShortcuts(context, selectedConversations);
ConversationUtil.clearShortcuts(context, recipientIdsForThreadIds);
}
public void deleteAllConversations() {