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

Renamed database classes to table classes.

Browse Source 
Because they're not databases. They're tables.
This commit is contained in:
Greyson Parrelli
2022-11-29 10:47:12 -05:00
committed by Cody Henthorne
parent b190f9495a
commit 7949996c5c
382 changed files with 3420 additions and 3464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/migrations/ApplyUnknownFieldsToSelfMigrationJob.java
View File

@@ -5,7 +5,7 @@ import androidx.annotation.NonNull;
import com.google.protobuf.InvalidProtocolBufferException;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.database.RecipientDatabase;
import org.thoughtcrime.securesms.database.RecipientTable;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.database.model.RecipientRecord;
import org.thoughtcrime.securesms.jobmanager.Data;
@@ -57,7 +57,7 @@ public class ApplyUnknownFieldsToSelfMigrationJob extends MigrationJob {
try {
self = Recipient.self();
settings = SignalDatabase.recipients().getRecordForSync(self.getId());
} catch (RecipientDatabase.MissingRecipientException e) {
} catch (RecipientTable.MissingRecipientException e) {
Log.w(TAG, "Unable to find self");
return;
}

24
app/src/main/java/org/thoughtcrime/securesms/migrations/LegacyMigrationJob.java
View File

@@ -8,11 +8,11 @@ import androidx.preference.PreferenceManager;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.database.AttachmentDatabase;
import org.thoughtcrime.securesms.database.MessageDatabase;
import org.thoughtcrime.securesms.database.MmsDatabase;
import org.thoughtcrime.securesms.database.MmsDatabase.Reader;
import org.thoughtcrime.securesms.database.PushDatabase;
import org.thoughtcrime.securesms.database.AttachmentTable;
import org.thoughtcrime.securesms.database.MessageTable;
import org.thoughtcrime.securesms.database.MmsTable;
import org.thoughtcrime.securesms.database.MmsTable.Reader;
import org.thoughtcrime.securesms.database.PushTable;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.database.model.MessageRecord;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
@@ -245,18 +245,18 @@ public class LegacyMigrationJob extends MigrationJob {
}
private void schedulePendingIncomingParts(Context context) {
final AttachmentDatabase attachmentDb = SignalDatabase.attachments();
final MessageDatabase mmsDb = SignalDatabase.mms();
final AttachmentTable attachmentDb = SignalDatabase.attachments();
final MessageTable mmsDb = SignalDatabase.mms();
final List<DatabaseAttachment> pendingAttachments = SignalDatabase.attachments().getPendingAttachments();
Log.i(TAG, pendingAttachments.size() + " pending parts.");
for (DatabaseAttachment attachment : pendingAttachments) {
final Reader reader = MmsDatabase.readerFor(mmsDb.getMessageCursor(attachment.getMmsId()));
final Reader reader = MmsTable.readerFor(mmsDb.getMessageCursor(attachment.getMmsId()));
final MessageRecord record = reader.getNext();
if (attachment.hasData()) {
Log.i(TAG, "corrected a pending media part " + attachment.getAttachmentId() + "that already had data.");
attachmentDb.setTransferState(attachment.getMmsId(), attachment.getAttachmentId(), AttachmentDatabase.TRANSFER_PROGRESS_DONE);
attachmentDb.setTransferState(attachment.getMmsId(), attachment.getAttachmentId(), AttachmentTable.TRANSFER_PROGRESS_DONE);
} else if (record != null && !record.isOutgoing() && record.isPush()) {
Log.i(TAG, "queuing new attachment download job for incoming push part " + attachment.getAttachmentId() + ".");
ApplicationDependencies.getJobManager().add(new AttachmentDownloadJob(attachment.getMmsId(), attachment.getAttachmentId(), false));
@@ -266,10 +266,10 @@ public class LegacyMigrationJob extends MigrationJob {
}
private static void scheduleMessagesInPushDatabase(@NonNull Context context) {
PushDatabase pushDatabase = SignalDatabase.push();
JobManager jobManager = ApplicationDependencies.getJobManager();
PushTable pushDatabase = SignalDatabase.push();
JobManager jobManager = ApplicationDependencies.getJobManager();
try (PushDatabase.Reader pushReader = pushDatabase.readerFor(pushDatabase.getPending())) {
try (PushTable.Reader pushReader = pushDatabase.readerFor(pushDatabase.getPending())) {
SignalServiceEnvelope envelope;
while ((envelope = pushReader.getNext()) != null) {
jobManager.add(new PushDecryptMessageJob(context, envelope));

6
app/src/main/java/org/thoughtcrime/securesms/migrations/StickerLaunchMigrationJob.java
View File

@@ -5,7 +5,7 @@ import android.content.Context;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.database.StickerDatabase;
import org.thoughtcrime.securesms.database.StickerTable;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobmanager.Data;
import org.thoughtcrime.securesms.jobmanager.Job;
@@ -49,8 +49,8 @@ public class StickerLaunchMigrationJob extends MigrationJob {
}
private static void installPack(@NonNull Context context, @NonNull BlessedPacks.Pack pack) {
JobManager jobManager = ApplicationDependencies.getJobManager();
StickerDatabase stickerDatabase = SignalDatabase.stickers();
JobManager jobManager = ApplicationDependencies.getJobManager();
StickerTable stickerDatabase = SignalDatabase.stickers();
if (stickerDatabase.isPackAvailableAsReference(pack.getPackId())) {
stickerDatabase.markPackAsInstalled(pack.getPackId(), false);

10
app/src/main/java/org/thoughtcrime/securesms/migrations/UserNotificationMigrationJob.java
View File

@@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.NewConversationActivity;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.conversationlist.model.ConversationFilter;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.database.ThreadDatabase;
import org.thoughtcrime.securesms.database.ThreadTable;
import org.thoughtcrime.securesms.jobmanager.Data;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -75,10 +75,10 @@ public class UserNotificationMigrationJob extends MigrationJob {
return;
}
ThreadDatabase threadDatabase = SignalDatabase.threads();
ThreadTable threadTable = SignalDatabase.threads();
int threadCount = threadDatabase.getUnarchivedConversationListCount(ConversationFilter.OFF) +
threadDatabase.getArchivedConversationListCount(ConversationFilter.OFF);
int threadCount = threadTable.getUnarchivedConversationListCount(ConversationFilter.OFF) +
threadTable.getArchivedConversationListCount(ConversationFilter.OFF);
if (threadCount >= 3) {
Log.w(TAG, "Already have 3 or more threads. Skipping.");
@@ -88,7 +88,7 @@ public class UserNotificationMigrationJob extends MigrationJob {
List<RecipientId> registered = SignalDatabase.recipients().getRegistered();
List<RecipientId> systemContacts = SignalDatabase.recipients().getSystemContacts();
Set<RecipientId> registeredSystemContacts = SetUtil.intersection(registered, systemContacts);
Set<RecipientId> threadRecipients = threadDatabase.getAllThreadRecipients();
Set<RecipientId> threadRecipients = threadTable.getAllThreadRecipients();
if (threadRecipients.containsAll(registeredSystemContacts)) {
Log.w(TAG, "Threads already exist for all relevant contacts. Skipping.");