mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix re-pin out of order bug. 

Fixes #11927
fork-5.53.8
Cody Henthorne 2022-02-01 16:47:00 -05:00
rodzic 7a241e5fb5
commit 5e31eb5565
1 zmienionych plików z 26 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

31
app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
Wyświetl plik

@ -78,6 +78,9 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
import kotlin.Unit;
import kotlin.collections.CollectionsKt;
public class ThreadDatabase extends Database {
private static final String TAG = Log.tag(ThreadDatabase.class);
@ -874,14 +877,32 @@ public class ThreadDatabase extends Database {
}
public void unpinConversations(@NonNull Collection<Long> threadIds) {
SQLiteDatabase db = databaseHelper.getSignalWritableDatabase();
ContentValues contentValues = new ContentValues(1);
String placeholders = StringUtil.join(Stream.of(threadIds).map(unused -> "?").toList(), ",");
String selection = ID + " IN (" + placeholders + ")";
SQLiteDatabase db = databaseHelper.getSignalWritableDatabase();
ContentValues contentValues = new ContentValues(1);
String placeholders = StringUtil.join(Stream.of(threadIds).map(unused -> "?").toList(), ",");
String selection = ID + " IN (" + placeholders + ")";
List<Long> remainingPinnedThreads = getPinnedThreadIds();
remainingPinnedThreads.removeAll(threadIds);
contentValues.put(PINNED, 0);
db.update(TABLE_NAME, contentValues, selection, SqlUtil.buildArgs(Stream.of(threadIds).toArray()));
db.beginTransaction();
try {
db.update(TABLE_NAME, contentValues, selection, SqlUtil.buildArgs(Stream.of(threadIds).toArray()));
CollectionsKt.forEachIndexed(remainingPinnedThreads, (index, threadId) -> {
ContentValues values = new ContentValues(1);
values.put(PINNED, index + 1);
db.update(TABLE_NAME, values, ID_WHERE, SqlUtil.buildArgs(threadId));
return Unit.INSTANCE;
});
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
notifyConversationListListeners();
SignalDatabase.recipients().markNeedsSync(Recipient.self().getId());