Migrate most of MmsSmsTable.

This commit is contained in:
Greyson Parrelli
2022-12-30 18:17:39 -05:00
parent f149c0adb9
commit 6cd6073bc7
33 changed files with 884 additions and 1069 deletions

View File

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.jobmanager.migrations;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.database.MessageTable;
import org.thoughtcrime.securesms.database.MmsSmsTable;
import org.thoughtcrime.securesms.jobmanager.Data;
import org.thoughtcrime.securesms.jobmanager.JobMigration;
@@ -11,22 +12,22 @@ import java.util.TreeSet;
public class SendReadReceiptsJobMigration extends JobMigration {
private final MmsSmsTable mmsSmsDatabase;
private final MessageTable messageTable;
public SendReadReceiptsJobMigration(@NonNull MmsSmsTable mmsSmsDatabase) {
public SendReadReceiptsJobMigration(@NonNull MessageTable messageTable) {
super(5);
this.mmsSmsDatabase = mmsSmsDatabase;
this.messageTable = messageTable;
}
@Override
protected @NonNull JobData migrate(@NonNull JobData jobData) {
if ("SendReadReceiptJob".equals(jobData.getFactoryKey())) {
return migrateSendReadReceiptJob(mmsSmsDatabase, jobData);
return migrateSendReadReceiptJob(messageTable, jobData);
}
return jobData;
}
private static @NonNull JobData migrateSendReadReceiptJob(@NonNull MmsSmsTable mmsSmsDatabase, @NonNull JobData jobData) {
private static @NonNull JobData migrateSendReadReceiptJob(@NonNull MessageTable messageTable, @NonNull JobData jobData) {
Data data = jobData.getData();
if (!data.hasLong("thread")) {
@@ -34,7 +35,7 @@ public class SendReadReceiptsJobMigration extends JobMigration {
SortedSet<Long> threadIds = new TreeSet<>();
for (long id : messageIds) {
long threadForMessageId = mmsSmsDatabase.getThreadForMessageId(id);
long threadForMessageId = messageTable.getThreadIdForMessage(id);
if (id != -1) {
threadIds.add(threadForMessageId);
}