mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-23 02:10:44 +01:00
Migrate most of MmsSmsTable.
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user