Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename SignalDatabase.sms/mms to SignalDatabase.messages

Browse Source
This commit is contained in:
Greyson Parrelli
2022-12-14 20:08:23 -05:00
parent a7e3bdc892
commit 60ae883df6
109 changed files with 391 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/notifications/DeleteNotificationReceiver.java
View File

@@ -43,9 +43,9 @@ public class DeleteNotificationReceiver extends BroadcastReceiver {
SignalExecutors.BOUNDED.execute(() -> {
for (int i = 0; i < ids.length; i++) {
if (!mms[i]) {
SignalDatabase.sms().markAsNotified(ids[i]);
SignalDatabase.messages().markAsNotified(ids[i]);
} else {
SignalDatabase.mms().markAsNotified(ids[i]);
SignalDatabase.messages().markAsNotified(ids[i]);
}
}
finisher.finish();

4
app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
View File

@@ -113,11 +113,11 @@ public class MarkReadReceiver extends BroadcastReceiver {
@NonNull List<ExpirationInfo> mmsExpirationInfo)
{
if (smsExpirationInfo.size() > 0) {
SignalDatabase.sms().markExpireStarted(Stream.of(smsExpirationInfo).map(ExpirationInfo::getId).toList(), System.currentTimeMillis());
SignalDatabase.messages().markExpireStarted(Stream.of(smsExpirationInfo).map(ExpirationInfo::getId).toList(), System.currentTimeMillis());
}
if (mmsExpirationInfo.size() > 0) {
SignalDatabase.mms().markExpireStarted(Stream.of(mmsExpirationInfo).map(ExpirationInfo::getId).toList(), System.currentTimeMillis());
SignalDatabase.messages().markExpireStarted(Stream.of(mmsExpirationInfo).map(ExpirationInfo::getId).toList(), System.currentTimeMillis());
}
if (smsExpirationInfo.size() + mmsExpirationInfo.size() > 0) {

13
app/src/main/java/org/thoughtcrime/securesms/notifications/v2/DefaultMessageNotifier.kt
View File

@@ -14,7 +14,6 @@ import me.leolin.shortcutbadger.ShortcutBadger
import org.signal.core.util.PendingIntentFlags
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.database.MessageTable
import org.thoughtcrime.securesms.database.SignalDatabase
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -141,16 +140,14 @@ class DefaultMessageNotifier(context: Application) : MessageNotifier {
if (state.muteFilteredMessages.isNotEmpty()) {
Log.i(TAG, "Marking ${state.muteFilteredMessages.size} muted messages as notified to skip notification")
state.muteFilteredMessages.forEach { item ->
val messageTable: MessageTable = if (item.isMms) SignalDatabase.mms else SignalDatabase.sms
messageTable.markAsNotified(item.id)
SignalDatabase.messages.markAsNotified(item.id)
}
}
if (state.profileFilteredMessages.isNotEmpty()) {
Log.i(TAG, "Marking ${state.profileFilteredMessages.size} profile filtered messages as notified to skip notification")
state.profileFilteredMessages.forEach { item ->
val messageTable: MessageTable = if (item.isMms) SignalDatabase.mms else SignalDatabase.sms
messageTable.markAsNotified(item.id)
SignalDatabase.messages.markAsNotified(item.id)
}
}
@@ -158,8 +155,7 @@ class DefaultMessageNotifier(context: Application) : MessageNotifier {
Log.i(TAG, "Marking ${state.conversations.size} conversations as notified to skip notification")
state.conversations.forEach { conversation ->
conversation.notificationItems.forEach { item ->
val messageTable: MessageTable = if (item.isMms) SignalDatabase.mms else SignalDatabase.sms
messageTable.markAsNotified(item.id)
SignalDatabase.messages.markAsNotified(item.id)
}
}
return
@@ -172,8 +168,7 @@ class DefaultMessageNotifier(context: Application) : MessageNotifier {
.forEach { conversation ->
cleanedUpThreads += conversation.thread
conversation.notificationItems.forEach { item ->
val messageTable: MessageTable = if (item.isMms) SignalDatabase.mms else SignalDatabase.sms
messageTable.markAsNotified(item.id)
SignalDatabase.messages.markAsNotified(item.id)
}
}
if (cleanedUpThreads.isNotEmpty()) {

4
app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationStateProvider.kt
View File

@@ -41,14 +41,14 @@ object NotificationStateProvider {
val parentRecord = conversationId.groupStoryId?.let {
try {
SignalDatabase.mms.getMessageRecord(it)
SignalDatabase.messages.getMessageRecord(it)
} catch (e: NoSuchMessageException) {
null
}
}
val hasSelfRepliedToGroupStory = conversationId.groupStoryId?.let {
SignalDatabase.mms.hasGroupReplyOrReactionInStory(it)
SignalDatabase.messages.hasGroupReplyOrReactionInStory(it)
}
messages += NotificationMessage(