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

Clear snippet when the last message in a pinned thread is deleted.

fork-5.53.8
Alex Hart 2022-06-20 16:15:24 -03:00 zatwierdzone przez GitHub
rodzic 8f5fc83529
commit c0735c8119
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 9 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -764,7 +764,8 @@ public class ThreadDatabase extends Database {
public Cursor getUnarchivedConversationList(boolean pinned, long offset, long limit) {
SQLiteDatabase db = databaseHelper.getSignalReadableDatabase();
String pinnedWhere = PINNED + (pinned ? " != 0" : " = 0");
String where = ARCHIVED + " = 0 AND " + MEANINGFUL_MESSAGES + " != 0 AND " + pinnedWhere;
String meaningful = pinned ? "" : MEANINGFUL_MESSAGES + " != 0 AND ";
String where = ARCHIVED + " = 0 AND " + meaningful + pinnedWhere;
final String query;
@ -805,7 +806,7 @@ public class ThreadDatabase extends Database {
public int getPinnedConversationListCount() {
SQLiteDatabase db = databaseHelper.getSignalReadableDatabase();
String[] columns = new String[] { "COUNT(*)" };
String query = ARCHIVED + " = 0 AND " + PINNED + " != 0 AND " + MEANINGFUL_MESSAGES + " != 0";
String query = ARCHIVED + " = 0 AND " + PINNED + " != 0";
try (Cursor cursor = db.query(TABLE_NAME, columns, query, null, null, null, null)) {
if (cursor != null && cursor.moveToFirst()) {
@ -819,7 +820,7 @@ public class ThreadDatabase extends Database {
public int getUnarchivedConversationListCount() {
SQLiteDatabase db = databaseHelper.getSignalReadableDatabase();
String[] columns = new String[] { "COUNT(*)" };
String query = ARCHIVED + " = 0 AND " + MEANINGFUL_MESSAGES + " != 0";
String query = ARCHIVED + " = 0 AND (" + MEANINGFUL_MESSAGES + " != 0 OR " + PINNED + " != 0)";
try (Cursor cursor = db.query(TABLE_NAME, columns, query, null, null, null, null)) {
if (cursor != null && cursor.moveToFirst()) {
@ -1344,6 +1345,11 @@ public class ThreadDatabase extends Database {
if (shouldDelete) {
deleteConversation(threadId);
}
if (isPinned) {
updateThread(threadId, meaningfulMessages, null, null, null, null, 0, 0, 0, 0, unarchive, 0, 0);
}
return true;
}

1
app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java
Wyświetl plik

@ -392,7 +392,6 @@ public final class ThreadRecord {
public ThreadRecord build() {
if (distributionType == ThreadDatabase.DistributionTypes.CONVERSATION) {
Preconditions.checkArgument(threadId > 0);
Preconditions.checkArgument(date > 0);
Preconditions.checkNotNull(body);
Preconditions.checkNotNull(recipient);
}