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

Convert SignalService, Database, Group, Payment, and other remaining protos to wire.

Browse Source
This commit is contained in:
Cody Henthorne
2023-09-18 15:32:43 -04:00
committed by Alex Hart
parent a6b7d0bcc5
commit efbd5cab85
267 changed files with 7100 additions and 7214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/src/main/java/org/thoughtcrime/securesms/mms/MessageGroupContext.java
View File

@@ -17,8 +17,8 @@ import org.thoughtcrime.securesms.util.Base64;
import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupUtil;
import org.whispersystems.signalservice.api.push.ServiceId;
import org.whispersystems.signalservice.api.push.ServiceId.ACI;
import org.whispersystems.signalservice.internal.push.SignalServiceProtos.GroupContext;
import org.whispersystems.signalservice.internal.push.SignalServiceProtos.GroupContextV2;
import org.whispersystems.signalservice.internal.push.GroupContext;
import org.whispersystems.signalservice.internal.push.GroupContextV2;
import java.io.IOException;
import java.util.ArrayList;
@@ -40,24 +40,24 @@ public final class MessageGroupContext {
this.encodedGroupContext = encodedGroupContext;
if (v2) {
this.groupV1 = null;
this.groupV2 = new GroupV2Properties(DecryptedGroupV2Context.parseFrom(Base64.decode(encodedGroupContext)));
this.groupV2 = new GroupV2Properties(DecryptedGroupV2Context.ADAPTER.decode(Base64.decode(encodedGroupContext)));
this.group = groupV2;
} else {
this.groupV1 = new GroupV1Properties(GroupContext.parseFrom(Base64.decode(encodedGroupContext)));
this.groupV1 = new GroupV1Properties(GroupContext.ADAPTER.decode(Base64.decode(encodedGroupContext)));
this.groupV2 = null;
this.group = groupV1;
}
}
public MessageGroupContext(@NonNull GroupContext group) {
this.encodedGroupContext = Base64.encodeBytes(group.toByteArray());
this.encodedGroupContext = Base64.encodeBytes(group.encode());
this.groupV1 = new GroupV1Properties(group);
this.groupV2 = null;
this.group = groupV1;
}
public MessageGroupContext(@NonNull DecryptedGroupV2Context group) {
this.encodedGroupContext = Base64.encodeBytes(group.toByteArray());
this.encodedGroupContext = Base64.encodeBytes(group.encode());
this.groupV1 = null;
this.groupV2 = new GroupV2Properties(group);
this.group = groupV2;
@@ -111,24 +111,24 @@ public final class MessageGroupContext {
}
public boolean isQuit() {
return groupContext.getType().getNumber() == GroupContext.Type.QUIT_VALUE;
return groupContext.type == GroupContext.Type.QUIT;
}
public boolean isUpdate() {
return groupContext.getType().getNumber() == GroupContext.Type.UPDATE_VALUE;
return groupContext.type == GroupContext.Type.UPDATE;
}
@Override
public @NonNull String getName() {
return groupContext.getName();
return groupContext.name;
}
@Override
public @NonNull List<RecipientId> getMembersListExcludingSelf() {
RecipientId selfId = Recipient.self().getId();
return Stream.of(groupContext.getMembersList())
.map(GroupContext.Member::getE164)
return Stream.of(groupContext.members)
.map(m -> m.e164)
.withoutNulls()
.map(RecipientId::fromE164)
.filterNot(selfId::equals)
@@ -144,9 +144,9 @@ public final class MessageGroupContext {
private GroupV2Properties(DecryptedGroupV2Context decryptedGroupV2Context) {
this.decryptedGroupV2Context = decryptedGroupV2Context;
this.groupContext = decryptedGroupV2Context.getContext();
this.groupContext = decryptedGroupV2Context.context;
try {
groupMasterKey = new GroupMasterKey(groupContext.getMasterKey().toByteArray());
groupMasterKey = new GroupMasterKey(groupContext.masterKey.toByteArray());
} catch (InvalidInputException e) {
throw new AssertionError(e);
}
@@ -161,15 +161,15 @@ public final class MessageGroupContext {
}
public @NonNull DecryptedGroupChange getChange() {
return decryptedGroupV2Context.getChange();
return decryptedGroupV2Context.change;
}
public @NonNull List<? extends ServiceId> getAllActivePendingAndRemovedMembers() {
DecryptedGroup groupState = decryptedGroupV2Context.getGroupState();
DecryptedGroupChange groupChange = decryptedGroupV2Context.getChange();
DecryptedGroup groupState = decryptedGroupV2Context.groupState;
DecryptedGroupChange groupChange = decryptedGroupV2Context.change;
return Stream.of(DecryptedGroupUtil.toAciList(groupState.getMembersList()),
DecryptedGroupUtil.pendingToServiceIdList(groupState.getPendingMembersList()),
return Stream.of(DecryptedGroupUtil.toAciList(groupState.members),
DecryptedGroupUtil.pendingToServiceIdList(groupState.pendingMembers),
DecryptedGroupUtil.removedMembersServiceIdList(groupChange),
DecryptedGroupUtil.removedPendingMembersServiceIdList(groupChange),
DecryptedGroupUtil.removedRequestingMembersServiceIdList(groupChange))
@@ -180,15 +180,15 @@ public final class MessageGroupContext {
@Override
public @NonNull String getName() {
return decryptedGroupV2Context.getGroupState().getTitle();
return decryptedGroupV2Context.groupState.title;
}
@Override
public @NonNull List<RecipientId> getMembersListExcludingSelf() {
List<RecipientId> members = new ArrayList<>(decryptedGroupV2Context.getGroupState().getMembersCount());
List<RecipientId> members = new ArrayList<>(decryptedGroupV2Context.groupState.members.size());
for (DecryptedMember member : decryptedGroupV2Context.getGroupState().getMembersList()) {
RecipientId recipient = RecipientId.from(ACI.parseOrThrow(member.getAciBytes()));
for (DecryptedMember member : decryptedGroupV2Context.groupState.members) {
RecipientId recipient = RecipientId.from(ACI.parseOrThrow(member.aciBytes));
if (!Recipient.self().getId().equals(recipient)) {
members.add(recipient);
}

6
app/src/main/java/org/thoughtcrime/securesms/mms/QuoteModel.kt
View File

@@ -5,7 +5,7 @@ import org.thoughtcrime.securesms.database.model.Mention
import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
import org.thoughtcrime.securesms.recipients.RecipientId
import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage
import org.whispersystems.signalservice.internal.push.SignalServiceProtos
import org.whispersystems.signalservice.internal.push.DataMessage
class QuoteModel(
val id: Long,
@@ -49,8 +49,8 @@ class QuoteModel(
return NORMAL
}
fun fromProto(type: SignalServiceProtos.DataMessage.Quote.Type): Type {
return if (type == SignalServiceProtos.DataMessage.Quote.Type.GIFT_BADGE) {
fun fromProto(type: DataMessage.Quote.Type?): Type {
return if (type == DataMessage.Quote.Type.GIFT_BADGE) {
GIFT_BADGE
} else {
NORMAL