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

Treat unregistered user during send as general failure.

Browse Source
This commit is contained in:
Cody Henthorne
2024-04-04 16:50:25 -04:00
committed by Greyson Parrelli
parent 2ce6ea9a2a
commit ea081e981f
12 changed files with 9 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
View File

@@ -1915,12 +1915,6 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
}
}
fun markAsPendingInsecureSmsFallback(messageId: Long) {
val threadId = getThreadIdForMessage(messageId)
updateMailboxBitmask(messageId, MessageTypes.BASE_TYPE_MASK, MessageTypes.BASE_PENDING_INSECURE_SMS_FALLBACK, Optional.of(threadId))
ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(MessageId(messageId))
}
fun markAsSending(messageId: Long) {
val threadId = getThreadIdForMessage(messageId)
updateMailboxBitmask(messageId, MessageTypes.BASE_TYPE_MASK, MessageTypes.BASE_SENDING_TYPE, Optional.of(threadId))

5
app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java
View File

@@ -75,6 +75,7 @@ public abstract class DisplayRecord {
return
MessageTypes.isFailedMessageType(type) ||
MessageTypes.isPendingSecureSmsFallbackType(type) ||
MessageTypes.isPendingInsecureSmsFallbackType(type) ||
deliveryStatus >= MessageTable.Status.STATUS_FAILED;
}
@@ -224,10 +225,6 @@ public abstract class DisplayRecord {
return hasReadReceipt;
}
public boolean isPendingInsecureSmsFallback() {
return MessageTypes.isPendingInsecureSmsFallbackType(type);
}
public boolean isPaymentNotification() {
return MessageTypes.isPaymentsNotification(type);
}

1
app/src/main/java/org/thoughtcrime/securesms/database/model/StatusUtil.java
View File

@@ -20,6 +20,7 @@ final class StatusUtil {
static boolean isFailed(long type, long deliveryStatus) {
return MessageTypes.isFailedMessageType(type) ||
MessageTypes.isPendingSecureSmsFallbackType(type) ||
MessageTypes.isPendingInsecureSmsFallbackType(type) ||
deliveryStatus >= MessageTable.Status.STATUS_FAILED;
}

4
app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java
View File

@@ -180,10 +180,6 @@ public final class ThreadRecord {
return hasReadReceipt;
}
public boolean isPendingInsecureSmsFallback() {
return MessageTypes.isPendingInsecureSmsFallbackType(type);
}
public boolean isDelivered() {
return StatusUtil.isDelivered(deliveryStatus, hasDeliveryReceipt);
}