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

Add report spam in message request state.

Browse Source
This commit is contained in:
Cody Henthorne
2021-05-17 09:43:37 -04:00
committed by Alex Hart
parent c47dcd5720
commit ef5b68eb35
31 changed files with 393 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/sms/IncomingJoinedMessage.java
View File

@@ -6,7 +6,7 @@ import org.whispersystems.libsignal.util.guava.Optional;
public class IncomingJoinedMessage extends IncomingTextMessage {
public IncomingJoinedMessage(RecipientId sender) {
super(sender, 1, System.currentTimeMillis(), -1, null, Optional.absent(), 0, false);
super(sender, 1, System.currentTimeMillis(), -1, null, Optional.absent(), 0, false, null);
}
@Override

15
app/src/main/java/org/thoughtcrime/securesms/sms/IncomingTextMessage.java
View File

@@ -44,6 +44,7 @@ public class IncomingTextMessage implements Parcelable {
private final int subscriptionId;
private final long expiresInMillis;
private final boolean unidentified;
@Nullable private final String serverGuid;
public IncomingTextMessage(@NonNull RecipientId sender, @NonNull SmsMessage message, int subscriptionId) {
this.message = message.getDisplayMessageBody();
@@ -60,6 +61,7 @@ public class IncomingTextMessage implements Parcelable {
this.groupId = null;
this.push = false;
this.unidentified = false;
this.serverGuid = null;
}
public IncomingTextMessage(@NonNull RecipientId sender,
@@ -69,7 +71,8 @@ public class IncomingTextMessage implements Parcelable {
String encodedBody,
Optional<GroupId> groupId,
long expiresInMillis,
boolean unidentified)
boolean unidentified,
String serverGuid)
{
this.message = encodedBody;
this.sender = sender;
@@ -85,6 +88,7 @@ public class IncomingTextMessage implements Parcelable {
this.expiresInMillis = expiresInMillis;
this.unidentified = unidentified;
this.groupId = groupId.orNull();
this.serverGuid = serverGuid;
}
public IncomingTextMessage(Parcel in) {
@@ -102,6 +106,7 @@ public class IncomingTextMessage implements Parcelable {
this.subscriptionId = in.readInt();
this.expiresInMillis = in.readLong();
this.unidentified = in.readInt() == 1;
this.serverGuid = in.readString();
}
public IncomingTextMessage(IncomingTextMessage base, String newBody) {
@@ -119,6 +124,7 @@ public class IncomingTextMessage implements Parcelable {
this.subscriptionId = base.getSubscriptionId();
this.expiresInMillis = base.getExpiresIn();
this.unidentified = base.isUnidentified();
this.serverGuid = base.getServerGuid();
}
public IncomingTextMessage(List<IncomingTextMessage> fragments) {
@@ -142,6 +148,7 @@ public class IncomingTextMessage implements Parcelable {
this.subscriptionId = fragments.get(0).getSubscriptionId();
this.expiresInMillis = fragments.get(0).getExpiresIn();
this.unidentified = fragments.get(0).isUnidentified();
this.serverGuid = fragments.get(0).getServerGuid();
}
protected IncomingTextMessage(@NonNull RecipientId sender, @Nullable GroupId groupId)
@@ -160,6 +167,7 @@ public class IncomingTextMessage implements Parcelable {
this.subscriptionId = -1;
this.expiresInMillis = 0;
this.unidentified = false;
this.serverGuid = null;
}
public int getSubscriptionId() {
@@ -265,6 +273,10 @@ public class IncomingTextMessage implements Parcelable {
return unidentified;
}
public @Nullable String getServerGuid() {
return serverGuid;
}
@Override
public int describeContents() {
return 0;
@@ -285,5 +297,6 @@ public class IncomingTextMessage implements Parcelable {
out.writeInt(subscriptionId);
out.writeLong(expiresInMillis);
out.writeInt(unidentified ? 1 : 0);
out.writeString(serverGuid);
}
}