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

Have DatabaseFactory.getSmsDatabase() return MessageDatabase.

Browse Source 
Slowly moving towards a single interface.
This commit is contained in:
Greyson Parrelli
2020-08-20 16:50:14 -04:00
committed by Alex Hart
parent 2cf9eb69eb
commit 190ca9eddd
50 changed files with 560 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsLoader.java
View File

@@ -15,6 +15,8 @@ import com.annimon.stream.Stream;
import org.thoughtcrime.securesms.components.emoji.EmojiUtil;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.MmsDatabase;
import org.thoughtcrime.securesms.database.SmsDatabase;
import org.thoughtcrime.securesms.database.model.MessageRecord;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.util.AbstractCursorLoader;
@@ -49,8 +51,8 @@ public class ReactionsLoader implements ReactionsViewModel.Repository, LoaderMan
SignalExecutors.BOUNDED.execute(() -> {
data.moveToPosition(-1);
MessageRecord record = isMms ? DatabaseFactory.getMmsDatabase(appContext).readerFor(data).getNext()
: DatabaseFactory.getSmsDatabase(appContext).readerFor(data).getNext();
MessageRecord record = isMms ? MmsDatabase.readerFor(data).getNext()
: SmsDatabase.readerFor(data).getNext();
if (record == null) {
internalLiveData.postValue(Collections.emptyList());
@@ -86,7 +88,7 @@ public class ReactionsLoader implements ReactionsViewModel.Repository, LoaderMan
@Override
public Cursor getCursor() {
return DatabaseFactory.getMmsDatabase(context).getMessage(messageId);
return DatabaseFactory.getMmsDatabase(context).getMessageCursor(messageId);
}
}

5
app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiRepository.java
View File

@@ -9,11 +9,10 @@ import androidx.annotation.StringRes;
import com.annimon.stream.Stream;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.components.emoji.EmojiPageModel;
import org.thoughtcrime.securesms.components.emoji.EmojiUtil;
import org.thoughtcrime.securesms.components.emoji.RecentEmojiPageModel;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.MessagingDatabase;
import org.thoughtcrime.securesms.database.MessageDatabase;
import org.thoughtcrime.securesms.database.NoSuchMessageException;
import org.thoughtcrime.securesms.database.model.MessageRecord;
import org.thoughtcrime.securesms.database.model.ReactionRecord;
@@ -72,7 +71,7 @@ final class ReactWithAnyEmojiRepository {
void addEmojiToMessage(@NonNull String emoji, long messageId, boolean isMms) {
SignalExecutors.BOUNDED.execute(() -> {
try {
MessagingDatabase db = isMms ? DatabaseFactory.getMmsDatabase(context) : DatabaseFactory.getSmsDatabase(context);
MessageDatabase db = isMms ? DatabaseFactory.getMmsDatabase(context) : DatabaseFactory.getSmsDatabase(context);
MessageRecord messageRecord = db.getMessageRecord(messageId);
ReactionRecord oldRecord = Stream.of(messageRecord.getReactions())
.filter(record -> record.getAuthor().equals(Recipient.self().getId()))