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

Use null when submitting empty reporting tokens.

Browse Source 
Cleaned up a few things too, just spacing and stuff.
This commit is contained in:
Greyson Parrelli
2023-02-22 10:44:29 -05:00
parent 3ebafca297
commit 263fb9fc04
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.java
View File

@@ -3798,9 +3798,10 @@ public class MessageTable extends DatabaseTable implements MessageTypes, Recipie
List<ReportSpamData> data = new ArrayList<>();
try (Cursor cursor = db.query(TABLE_NAME, new String[] { RECIPIENT_ID, SERVER_GUID, DATE_RECEIVED }, query, args, null, null, DATE_RECEIVED + " DESC", "3")) {
while (cursor.moveToNext()) {
RecipientId id = RecipientId.from(CursorUtil.requireLong(cursor, RECIPIENT_ID));
String serverGuid = CursorUtil.requireString(cursor, SERVER_GUID);
RecipientId id = RecipientId.from(CursorUtil.requireLong(cursor, RECIPIENT_ID));
String serverGuid = CursorUtil.requireString(cursor, SERVER_GUID);
long dateReceived = CursorUtil.requireLong(cursor, DATE_RECEIVED);
if (!Util.isEmpty(serverGuid)) {
data.add(new ReportSpamData(id, serverGuid, dateReceived));
}
@@ -4164,9 +4165,7 @@ public class MessageTable extends DatabaseTable implements MessageTypes, Recipie
}
public @NonNull List<MessageTable.ReportSpamData> getReportSpamMessageServerData(long threadId, long timestamp, int limit) {
return SignalDatabase
.messages()
.getReportSpamMessageServerGuids(threadId, timestamp)
return getReportSpamMessageServerGuids(threadId, timestamp)
.stream()
.sorted((l, r) -> -Long.compare(l.getDateReceived(), r.getDateReceived()))
.limit(limit)