Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 09:09:32 +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

8
app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageManager.java
View File

@@ -11,8 +11,8 @@ import androidx.annotation.Nullable;
import androidx.annotation.WorkerThread;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.database.AttachmentDatabase;
import org.thoughtcrime.securesms.database.MessageDatabase;
import org.thoughtcrime.securesms.database.AttachmentTable;
import org.thoughtcrime.securesms.database.MessageTable;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.service.TimedEventManager;
@@ -24,8 +24,8 @@ public class ViewOnceMessageManager extends TimedEventManager<ViewOnceExpiration
private static final String TAG = Log.tag(ViewOnceMessageManager.class);
private final MessageDatabase mmsDatabase;
private final AttachmentDatabase attachmentDatabase;
private final MessageTable mmsDatabase;
private final AttachmentTable attachmentDatabase;
public ViewOnceMessageManager(@NonNull Application application) {
super(application, "RevealableMessageManager");

6
app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageRepository.java
View File

@@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
import org.signal.core.util.concurrent.SignalExecutors;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.database.MessageDatabase;
import org.thoughtcrime.securesms.database.MessageTable;
import org.thoughtcrime.securesms.database.NoSuchMessageException;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
@@ -21,7 +21,7 @@ class ViewOnceMessageRepository {
private static final String TAG = Log.tag(ViewOnceMessageRepository.class);
private final MessageDatabase mmsDatabase;
private final MessageTable mmsDatabase;
ViewOnceMessageRepository(@NonNull Context context) {
this.mmsDatabase = SignalDatabase.mms();
@@ -32,7 +32,7 @@ class ViewOnceMessageRepository {
try {
MmsMessageRecord record = (MmsMessageRecord) mmsDatabase.getMessageRecord(messageId);
MessageDatabase.MarkedMessageInfo info = mmsDatabase.setIncomingMessageViewed(record.getId());
MessageTable.MarkedMessageInfo info = mmsDatabase.setIncomingMessageViewed(record.getId());
if (info != null) {
ApplicationDependencies.getJobManager().add(new SendViewedReceiptJob(record.getThreadId(),
info.getSyncMessageId().getRecipientId(),

8
app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageView.java
View File

@@ -21,7 +21,7 @@ import org.greenrobot.eventbus.ThreadMode;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.attachments.Attachment;
import org.thoughtcrime.securesms.database.AttachmentDatabase;
import org.thoughtcrime.securesms.database.AttachmentTable;
import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
import org.thoughtcrime.securesms.events.PartProgressEvent;
import org.thoughtcrime.securesms.mms.Slide;
@@ -94,8 +94,8 @@ public class ViewOnceMessageView extends LinearLayout {
}
Attachment attachment = messageRecord.getSlideDeck().getThumbnailSlide().asAttachment();
return attachment.getTransferState() == AttachmentDatabase.TRANSFER_PROGRESS_FAILED ||
attachment.getTransferState() == AttachmentDatabase.TRANSFER_PROGRESS_PENDING;
return attachment.getTransferState() == AttachmentTable.TRANSFER_PROGRESS_FAILED ||
attachment.getTransferState() == AttachmentTable.TRANSFER_PROGRESS_PENDING;
}
public void setMessage(@NonNull MmsMessageRecord message, boolean hasWallpaper) {
@@ -168,7 +168,7 @@ public class ViewOnceMessageView extends LinearLayout {
if (messageRecord.getSlideDeck().getThumbnailSlide() == null) return false;
Attachment attachment = messageRecord.getSlideDeck().getThumbnailSlide().asAttachment();
return attachment.getTransferState() == AttachmentDatabase.TRANSFER_PROGRESS_STARTED;
return attachment.getTransferState() == AttachmentTable.TRANSFER_PROGRESS_STARTED;
}
private @NonNull String formatFileSize(@NonNull MmsMessageRecord messageRecord) {

6
app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceUtil.java
View File

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.revealable;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.database.AttachmentDatabase;
import org.thoughtcrime.securesms.database.AttachmentTable;
import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
import java.util.concurrent.TimeUnit;
@@ -28,7 +28,7 @@ public class ViewOnceUtil {
return false;
}
if (message.getSlideDeck().getThumbnailSlide().getTransferState() != AttachmentDatabase.TRANSFER_PROGRESS_DONE) {
if (message.getSlideDeck().getThumbnailSlide().getTransferState() != AttachmentTable.TRANSFER_PROGRESS_DONE) {
return false;
}
@@ -48,7 +48,7 @@ public class ViewOnceUtil {
return true;
}
if (message.getSlideDeck().getThumbnailSlide() != null && message.getSlideDeck().getThumbnailSlide().getTransferState() != AttachmentDatabase.TRANSFER_PROGRESS_DONE) {
if (message.getSlideDeck().getThumbnailSlide() != null && message.getSlideDeck().getThumbnailSlide().getTransferState() != AttachmentTable.TRANSFER_PROGRESS_DONE) {
return false;
}