TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-25 15:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add new VIEWED item in RecieptMessage enumeration.

Browse Source 
Also includes necessary Database changes for supporting this as well as View-Once receipt support.
This commit is contained in:
Alex Hart
2020-11-20 09:16:37 -04:00
parent 7bb1262571
commit ce44e3949c
26 changed files with 432 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
View File

@@ -534,6 +534,7 @@ public class SignalServiceMessageSender {
if (message.isDeliveryReceipt()) builder.setType(ReceiptMessage.Type.DELIVERY);
else if (message.isReadReceipt()) builder.setType(ReceiptMessage.Type.READ);
else if (message.isViewedReceipt()) builder.setType(ReceiptMessage.Type.VIEWED);
return container.setReceiptMessage(builder).build().toByteArray();
}

1
libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java
View File

@@ -632,6 +632,7 @@ public final class SignalServiceContent {
if (content.getType() == SignalServiceProtos.ReceiptMessage.Type.DELIVERY) type = SignalServiceReceiptMessage.Type.DELIVERY;
else if (content.getType() == SignalServiceProtos.ReceiptMessage.Type.READ) type = SignalServiceReceiptMessage.Type.READ;
else if (content.getType() == SignalServiceProtos.ReceiptMessage.Type.VIEWED) type = SignalServiceReceiptMessage.Type.VIEWED;
else type = SignalServiceReceiptMessage.Type.UNKNOWN;
return new SignalServiceReceiptMessage(type, content.getTimestampList(), metadata.getTimestamp());

6
libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceReceiptMessage.java
View File

@@ -6,7 +6,7 @@ import java.util.List;
public class SignalServiceReceiptMessage {
public enum Type {
UNKNOWN, DELIVERY, READ
UNKNOWN, DELIVERY, READ, VIEWED
}
private final Type type;
@@ -38,4 +38,8 @@ public class SignalServiceReceiptMessage {
public boolean isReadReceipt() {
return type == Type.READ;
}
public boolean isViewedReceipt() {
return type == Type.VIEWED;
}
}

1
libsignal/service/src/main/proto/SignalService.proto
View File

@@ -279,6 +279,7 @@ message ReceiptMessage {
enum Type {
DELIVERY = 0;
READ = 1;
VIEWED = 2;
}
optional Type type = 1;