TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-23 18:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Brice-W 2021-06-21 14:03:08 +10:00
parent 35d5def515
commit a71273e813
5 changed files with 121 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt
View File

@ -34,7 +34,7 @@ class ClosedGroupControlMessage() : ControlMessage() {
is Kind.New -> { is Kind.New -> {
!kind.publicKey.isEmpty && kind.name.isNotEmpty() && kind.encryptionKeyPair?.publicKey != null !kind.publicKey.isEmpty && kind.name.isNotEmpty() && kind.encryptionKeyPair?.publicKey != null
&& kind.encryptionKeyPair?.privateKey != null && kind.members.isNotEmpty() && kind.admins.isNotEmpty() && kind.encryptionKeyPair?.privateKey != null && kind.members.isNotEmpty() && kind.admins.isNotEmpty()
&& kind.expireTimer >= 0 && kind.expirationTimer >= 0
} }
is Kind.EncryptionKeyPair -> true is Kind.EncryptionKeyPair -> true
is Kind.NameChange -> kind.name.isNotEmpty() is Kind.NameChange -> kind.name.isNotEmpty()
@ -45,7 +45,7 @@ class ClosedGroupControlMessage() : ControlMessage() {
} }
sealed class Kind { sealed class Kind {
class New(var publicKey: ByteString, var name: String, var encryptionKeyPair: ECKeyPair?, var members: List<ByteString>, var admins: List<ByteString>, var expireTimer: Int) : Kind() { class New(var publicKey: ByteString, var name: String, var encryptionKeyPair: ECKeyPair?, var members: List<ByteString>, var admins: List<ByteString>, var expirationTimer: Int) : Kind() {
internal constructor() : this(ByteString.EMPTY, "", null, listOf(), listOf(), 0) internal constructor() : this(ByteString.EMPTY, "", null, listOf(), listOf(), 0)
} }
/** An encryption key pair encrypted for each member individually. /** An encryption key pair encrypted for each member individually.
@ -89,11 +89,11 @@ class ClosedGroupControlMessage() : ControlMessage() {
val publicKey = closedGroupControlMessageProto.publicKey ?: return null val publicKey = closedGroupControlMessageProto.publicKey ?: return null
val name = closedGroupControlMessageProto.name ?: return null val name = closedGroupControlMessageProto.name ?: return null
val encryptionKeyPairAsProto = closedGroupControlMessageProto.encryptionKeyPair ?: return null val encryptionKeyPairAsProto = closedGroupControlMessageProto.encryptionKeyPair ?: return null
val expireTimer = closedGroupControlMessageProto.expireTimer val expirationTimer = closedGroupControlMessageProto.expirationTimer
try { try {
val encryptionKeyPair = ECKeyPair(DjbECPublicKey(encryptionKeyPairAsProto.publicKey.toByteArray()), val encryptionKeyPair = ECKeyPair(DjbECPublicKey(encryptionKeyPairAsProto.publicKey.toByteArray()),
DjbECPrivateKey(encryptionKeyPairAsProto.privateKey.toByteArray())) DjbECPrivateKey(encryptionKeyPairAsProto.privateKey.toByteArray()))
kind = Kind.New(publicKey, name, encryptionKeyPair, closedGroupControlMessageProto.membersList, closedGroupControlMessageProto.adminsList, expireTimer) kind = Kind.New(publicKey, name, encryptionKeyPair, closedGroupControlMessageProto.membersList, closedGroupControlMessageProto.adminsList, expirationTimer)
} catch (e: Exception) { } catch (e: Exception) {
Log.w(TAG, "Couldn't parse key pair from proto: $encryptionKeyPairAsProto.") Log.w(TAG, "Couldn't parse key pair from proto: $encryptionKeyPairAsProto.")
return null return null
@ -145,7 +145,7 @@ class ClosedGroupControlMessage() : ControlMessage() {
closedGroupControlMessage.encryptionKeyPair = encryptionKeyPair.build() closedGroupControlMessage.encryptionKeyPair = encryptionKeyPair.build()
closedGroupControlMessage.addAllMembers(kind.members) closedGroupControlMessage.addAllMembers(kind.members)
closedGroupControlMessage.addAllAdmins(kind.admins) closedGroupControlMessage.addAllAdmins(kind.admins)
closedGroupControlMessage.expireTimer = kind.expireTimer closedGroupControlMessage.expirationTimer = kind.expirationTimer
} }
is Kind.EncryptionKeyPair -> { is Kind.EncryptionKeyPair -> {
closedGroupControlMessage.type = DataMessage.ClosedGroupControlMessage.Type.ENCRYPTION_KEY_PAIR closedGroupControlMessage.type = DataMessage.ClosedGroupControlMessage.Type.ENCRYPTION_KEY_PAIR

8
libsession/src/main/java/org/session/libsession/messaging/messages/control/ConfigurationMessage.kt
View File

@ -20,7 +20,7 @@ class ConfigurationMessage(var closedGroups: List<ClosedGroup>, var openGroups:
override val isSelfSendValid: Boolean = true override val isSelfSendValid: Boolean = true
class ClosedGroup(var publicKey: String, var name: String, var encryptionKeyPair: ECKeyPair?, var members: List<String>, var admins: List<String>, var expireTimer: Int) { class ClosedGroup(var publicKey: String, var name: String, var encryptionKeyPair: ECKeyPair?, var members: List<String>, var admins: List<String>, var expirationTimer: Int) {
val isValid: Boolean get() = members.isNotEmpty() && admins.isNotEmpty() val isValid: Boolean get() = members.isNotEmpty() && admins.isNotEmpty()
internal constructor() : this("", "", null, listOf(), listOf(), 0) internal constructor() : this("", "", null, listOf(), listOf(), 0)
@ -40,8 +40,8 @@ class ConfigurationMessage(var closedGroups: List<ClosedGroup>, var openGroups:
DjbECPrivateKey(encryptionKeyPairAsProto.privateKey.toByteArray())) DjbECPrivateKey(encryptionKeyPairAsProto.privateKey.toByteArray()))
val members = proto.membersList.map { it.toByteArray().toHexString() } val members = proto.membersList.map { it.toByteArray().toHexString() }
val admins = proto.adminsList.map { it.toByteArray().toHexString() } val admins = proto.adminsList.map { it.toByteArray().toHexString() }
val expireTimer = proto.expireTimer val expirationTimer = proto.expirationTimer
return ClosedGroup(publicKey, name, encryptionKeyPair, members, admins, expireTimer) return ClosedGroup(publicKey, name, encryptionKeyPair, members, admins, expirationTimer)
} }
} }
@ -55,7 +55,7 @@ class ConfigurationMessage(var closedGroups: List<ClosedGroup>, var openGroups:
result.encryptionKeyPair = encryptionKeyPairAsProto.build() result.encryptionKeyPair = encryptionKeyPairAsProto.build()
result.addAllMembers(members.map { ByteString.copyFrom(Hex.fromStringCondensed(it)) }) result.addAllMembers(members.map { ByteString.copyFrom(Hex.fromStringCondensed(it)) })
result.addAllAdmins(admins.map { ByteString.copyFrom(Hex.fromStringCondensed(it)) }) result.addAllAdmins(admins.map { ByteString.copyFrom(Hex.fromStringCondensed(it)) })
result.expireTimer = expireTimer result.expirationTimer = expirationTimer
return result.build() return result.build()
} }
} }

4
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
View File

@ -121,7 +121,7 @@ private fun handleConfigurationMessage(message: ConfigurationMessage) {
for (closedGroup in message.closedGroups) { for (closedGroup in message.closedGroups) {
if (allClosedGroupPublicKeys.contains(closedGroup.publicKey)) continue if (allClosedGroupPublicKeys.contains(closedGroup.publicKey)) continue
handleNewClosedGroup(message.sender!!, message.sentTimestamp!!, closedGroup.publicKey, closedGroup.name, handleNewClosedGroup(message.sender!!, message.sentTimestamp!!, closedGroup.publicKey, closedGroup.name,
closedGroup.encryptionKeyPair!!, closedGroup.members, closedGroup.admins, message.sentTimestamp!!, closedGroup.expireTimer) closedGroup.encryptionKeyPair!!, closedGroup.members, closedGroup.admins, message.sentTimestamp!!, closedGroup.expirationTimer)
} }
val allV2OpenGroups = storage.getAllV2OpenGroups().map { it.value.joinURL } val allV2OpenGroups = storage.getAllV2OpenGroups().map { it.value.joinURL }
for (openGroup in message.openGroups) { for (openGroup in message.openGroups) {
@ -256,7 +256,7 @@ private fun MessageReceiver.handleNewClosedGroup(message: ClosedGroupControlMess
val groupPublicKey = kind.publicKey.toByteArray().toHexString() val groupPublicKey = kind.publicKey.toByteArray().toHexString()
val members = kind.members.map { it.toByteArray().toHexString() } val members = kind.members.map { it.toByteArray().toHexString() }
val admins = kind.admins.map { it.toByteArray().toHexString() } val admins = kind.admins.map { it.toByteArray().toHexString() }
val expireTimer = kind.expireTimer val expireTimer = kind.expirationTimer
handleNewClosedGroup(message.sender!!, message.sentTimestamp!!, groupPublicKey, kind.name, kind.encryptionKeyPair!!, members, admins, message.sentTimestamp!!, expireTimer) handleNewClosedGroup(message.sender!!, message.sentTimestamp!!, groupPublicKey, kind.name, kind.encryptionKeyPair!!, members, admins, message.sentTimestamp!!, expireTimer)
} }

4
libsignal/protobuf/SignalService.proto
View File

@ -135,7 +135,7 @@ message DataMessage {
repeated bytes members = 5; repeated bytes members = 5;
repeated bytes admins = 6; repeated bytes admins = 6;
repeated KeyPairWrapper wrappers = 7; repeated KeyPairWrapper wrappers = 7;
optional uint32 expireTimer = 8; optional uint32 expirationTimer = 8;
} }
optional string body = 1; optional string body = 1;
@ -161,7 +161,7 @@ message ConfigurationMessage {
optional KeyPair encryptionKeyPair = 3; optional KeyPair encryptionKeyPair = 3;
repeated bytes members = 4; repeated bytes members = 4;
repeated bytes admins = 5; repeated bytes admins = 5;
optional uint32 expireTimer = 6; optional uint32 expirationTimer = 6;
} }
message Contact { message Contact {

216
libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java
View File

@ -9222,15 +9222,15 @@ public final class SignalServiceProtos {
org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder getWrappersOrBuilder( org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder getWrappersOrBuilder(
int index); int index);
// optional uint32 expireTimer = 8; // optional uint32 expirationTimer = 8;
/** /**
* <code>optional uint32 expireTimer = 8;</code> * <code>optional uint32 expirationTimer = 8;</code>
*/ */
boolean hasExpireTimer(); boolean hasExpirationTimer();
/** /**
* <code>optional uint32 expireTimer = 8;</code> * <code>optional uint32 expirationTimer = 8;</code>
*/ */
int getExpireTimer(); int getExpirationTimer();
} }
/** /**
* Protobuf type {@code signalservice.DataMessage.ClosedGroupControlMessage} * Protobuf type {@code signalservice.DataMessage.ClosedGroupControlMessage}
@ -9343,7 +9343,7 @@ public final class SignalServiceProtos {
} }
case 64: { case 64: {
bitField0_ |= 0x00000010; bitField0_ |= 0x00000010;
expireTimer_ = input.readUInt32(); expirationTimer_ = input.readUInt32();
break; break;
} }
} }
@ -10303,20 +10303,20 @@ public final class SignalServiceProtos {
return wrappers_.get(index); return wrappers_.get(index);
} }
// optional uint32 expireTimer = 8; // optional uint32 expirationTimer = 8;
public static final int EXPIRETIMER_FIELD_NUMBER = 8; public static final int EXPIRATIONTIMER_FIELD_NUMBER = 8;
private int expireTimer_; private int expirationTimer_;
/** /**
* <code>optional uint32 expireTimer = 8;</code> * <code>optional uint32 expirationTimer = 8;</code>
*/ */
public boolean hasExpireTimer() { public boolean hasExpirationTimer() {
return ((bitField0_ & 0x00000010) == 0x00000010); return ((bitField0_ & 0x00000010) == 0x00000010);
} }
/** /**
* <code>optional uint32 expireTimer = 8;</code> * <code>optional uint32 expirationTimer = 8;</code>
*/ */
public int getExpireTimer() { public int getExpirationTimer() {
return expireTimer_; return expirationTimer_;
} }
private void initFields() { private void initFields() {
@ -10327,7 +10327,7 @@ public final class SignalServiceProtos {
members_ = java.util.Collections.emptyList(); members_ = java.util.Collections.emptyList();
admins_ = java.util.Collections.emptyList(); admins_ = java.util.Collections.emptyList();
wrappers_ = java.util.Collections.emptyList(); wrappers_ = java.util.Collections.emptyList();
expireTimer_ = 0; expirationTimer_ = 0;
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
@ -10379,7 +10379,7 @@ public final class SignalServiceProtos {
output.writeMessage(7, wrappers_.get(i)); output.writeMessage(7, wrappers_.get(i));
} }
if (((bitField0_ & 0x00000010) == 0x00000010)) { if (((bitField0_ & 0x00000010) == 0x00000010)) {
output.writeUInt32(8, expireTimer_); output.writeUInt32(8, expirationTimer_);
} }
getUnknownFields().writeTo(output); getUnknownFields().writeTo(output);
} }
@ -10430,7 +10430,7 @@ public final class SignalServiceProtos {
} }
if (((bitField0_ & 0x00000010) == 0x00000010)) { if (((bitField0_ & 0x00000010) == 0x00000010)) {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(8, expireTimer_); .computeUInt32Size(8, expirationTimer_);
} }
size += getUnknownFields().getSerializedSize(); size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@ -10572,7 +10572,7 @@ public final class SignalServiceProtos {
} else { } else {
wrappersBuilder_.clear(); wrappersBuilder_.clear();
} }
expireTimer_ = 0; expirationTimer_ = 0;
bitField0_ = (bitField0_ & ~0x00000080); bitField0_ = (bitField0_ & ~0x00000080);
return this; return this;
} }
@ -10644,7 +10644,7 @@ public final class SignalServiceProtos {
if (((from_bitField0_ & 0x00000080) == 0x00000080)) { if (((from_bitField0_ & 0x00000080) == 0x00000080)) {
to_bitField0_ |= 0x00000010; to_bitField0_ |= 0x00000010;
} }
result.expireTimer_ = expireTimer_; result.expirationTimer_ = expirationTimer_;
result.bitField0_ = to_bitField0_; result.bitField0_ = to_bitField0_;
onBuilt(); onBuilt();
return result; return result;
@ -10721,8 +10721,8 @@ public final class SignalServiceProtos {
} }
} }
} }
if (other.hasExpireTimer()) { if (other.hasExpirationTimer()) {
setExpireTimer(other.getExpireTimer()); setExpirationTimer(other.getExpirationTimer());
} }
this.mergeUnknownFields(other.getUnknownFields()); this.mergeUnknownFields(other.getUnknownFields());
return this; return this;
@ -11430,35 +11430,35 @@ public final class SignalServiceProtos {
return wrappersBuilder_; return wrappersBuilder_;
} }
// optional uint32 expireTimer = 8; // optional uint32 expirationTimer = 8;
private int expireTimer_ ; private int expirationTimer_ ;
/** /**
* <code>optional uint32 expireTimer = 8;</code> * <code>optional uint32 expirationTimer = 8;</code>
*/ */
public boolean hasExpireTimer() { public boolean hasExpirationTimer() {
return ((bitField0_ & 0x00000080) == 0x00000080); return ((bitField0_ & 0x00000080) == 0x00000080);
} }
/** /**
* <code>optional uint32 expireTimer = 8;</code> * <code>optional uint32 expirationTimer = 8;</code>
*/ */
public int getExpireTimer() { public int getExpirationTimer() {
return expireTimer_; return expirationTimer_;
} }
/** /**
* <code>optional uint32 expireTimer = 8;</code> * <code>optional uint32 expirationTimer = 8;</code>
*/ */
public Builder setExpireTimer(int value) { public Builder setExpirationTimer(int value) {
bitField0_ |= 0x00000080; bitField0_ |= 0x00000080;
expireTimer_ = value; expirationTimer_ = value;
onChanged(); onChanged();
return this; return this;
} }
/** /**
* <code>optional uint32 expireTimer = 8;</code> * <code>optional uint32 expirationTimer = 8;</code>
*/ */
public Builder clearExpireTimer() { public Builder clearExpirationTimer() {
bitField0_ = (bitField0_ & ~0x00000080); bitField0_ = (bitField0_ & ~0x00000080);
expireTimer_ = 0; expirationTimer_ = 0;
onChanged(); onChanged();
return this; return this;
} }
@ -14105,15 +14105,15 @@ public final class SignalServiceProtos {
*/ */
com.google.protobuf.ByteString getAdmins(int index); com.google.protobuf.ByteString getAdmins(int index);
// optional uint32 expireTimer = 6; // optional uint32 expirationTimer = 6;
/** /**
* <code>optional uint32 expireTimer = 6;</code> * <code>optional uint32 expirationTimer = 6;</code>
*/ */
boolean hasExpireTimer(); boolean hasExpirationTimer();
/** /**
* <code>optional uint32 expireTimer = 6;</code> * <code>optional uint32 expirationTimer = 6;</code>
*/ */
int getExpireTimer(); int getExpirationTimer();
} }
/** /**
* Protobuf type {@code signalservice.ConfigurationMessage.ClosedGroup} * Protobuf type {@code signalservice.ConfigurationMessage.ClosedGroup}
@ -14207,7 +14207,7 @@ public final class SignalServiceProtos {
} }
case 48: { case 48: {
bitField0_ |= 0x00000008; bitField0_ |= 0x00000008;
expireTimer_ = input.readUInt32(); expirationTimer_ = input.readUInt32();
break; break;
} }
} }
@ -14383,20 +14383,20 @@ public final class SignalServiceProtos {
return admins_.get(index); return admins_.get(index);
} }
// optional uint32 expireTimer = 6; // optional uint32 expirationTimer = 6;
public static final int EXPIRETIMER_FIELD_NUMBER = 6; public static final int EXPIRATIONTIMER_FIELD_NUMBER = 6;
private int expireTimer_; private int expirationTimer_;
/** /**
* <code>optional uint32 expireTimer = 6;</code> * <code>optional uint32 expirationTimer = 6;</code>
*/ */
public boolean hasExpireTimer() { public boolean hasExpirationTimer() {
return ((bitField0_ & 0x00000008) == 0x00000008); return ((bitField0_ & 0x00000008) == 0x00000008);
} }
/** /**
* <code>optional uint32 expireTimer = 6;</code> * <code>optional uint32 expirationTimer = 6;</code>
*/ */
public int getExpireTimer() { public int getExpirationTimer() {
return expireTimer_; return expirationTimer_;
} }
private void initFields() { private void initFields() {
@ -14405,7 +14405,7 @@ public final class SignalServiceProtos {
encryptionKeyPair_ = org.session.libsignal.protos.SignalServiceProtos.KeyPair.getDefaultInstance(); encryptionKeyPair_ = org.session.libsignal.protos.SignalServiceProtos.KeyPair.getDefaultInstance();
members_ = java.util.Collections.emptyList(); members_ = java.util.Collections.emptyList();
admins_ = java.util.Collections.emptyList(); admins_ = java.util.Collections.emptyList();
expireTimer_ = 0; expirationTimer_ = 0;
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
@ -14441,7 +14441,7 @@ public final class SignalServiceProtos {
output.writeBytes(5, admins_.get(i)); output.writeBytes(5, admins_.get(i));
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
output.writeUInt32(6, expireTimer_); output.writeUInt32(6, expirationTimer_);
} }
getUnknownFields().writeTo(output); getUnknownFields().writeTo(output);
} }
@ -14484,7 +14484,7 @@ public final class SignalServiceProtos {
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(6, expireTimer_); .computeUInt32Size(6, expirationTimer_);
} }
size += getUnknownFields().getSerializedSize(); size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@ -14617,7 +14617,7 @@ public final class SignalServiceProtos {
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
admins_ = java.util.Collections.emptyList(); admins_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000010); bitField0_ = (bitField0_ & ~0x00000010);
expireTimer_ = 0; expirationTimer_ = 0;
bitField0_ = (bitField0_ & ~0x00000020); bitField0_ = (bitField0_ & ~0x00000020);
return this; return this;
} }
@ -14676,7 +14676,7 @@ public final class SignalServiceProtos {
if (((from_bitField0_ & 0x00000020) == 0x00000020)) { if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
to_bitField0_ |= 0x00000008; to_bitField0_ |= 0x00000008;
} }
result.expireTimer_ = expireTimer_; result.expirationTimer_ = expirationTimer_;
result.bitField0_ = to_bitField0_; result.bitField0_ = to_bitField0_;
onBuilt(); onBuilt();
return result; return result;
@ -14724,8 +14724,8 @@ public final class SignalServiceProtos {
} }
onChanged(); onChanged();
} }
if (other.hasExpireTimer()) { if (other.hasExpirationTimer()) {
setExpireTimer(other.getExpireTimer()); setExpirationTimer(other.getExpirationTimer());
} }
this.mergeUnknownFields(other.getUnknownFields()); this.mergeUnknownFields(other.getUnknownFields());
return this; return this;
@ -15131,35 +15131,35 @@ public final class SignalServiceProtos {
return this; return this;
} }
// optional uint32 expireTimer = 6; // optional uint32 expirationTimer = 6;
private int expireTimer_ ; private int expirationTimer_ ;
/** /**
* <code>optional uint32 expireTimer = 6;</code> * <code>optional uint32 expirationTimer = 6;</code>
*/ */
public boolean hasExpireTimer() { public boolean hasExpirationTimer() {
return ((bitField0_ & 0x00000020) == 0x00000020); return ((bitField0_ & 0x00000020) == 0x00000020);
} }
/** /**
* <code>optional uint32 expireTimer = 6;</code> * <code>optional uint32 expirationTimer = 6;</code>
*/ */
public int getExpireTimer() { public int getExpirationTimer() {
return expireTimer_; return expirationTimer_;
} }
/** /**
* <code>optional uint32 expireTimer = 6;</code> * <code>optional uint32 expirationTimer = 6;</code>
*/ */
public Builder setExpireTimer(int value) { public Builder setExpirationTimer(int value) {
bitField0_ |= 0x00000020; bitField0_ |= 0x00000020;
expireTimer_ = value; expirationTimer_ = value;
onChanged(); onChanged();
return this; return this;
} }
/** /**
* <code>optional uint32 expireTimer = 6;</code> * <code>optional uint32 expirationTimer = 6;</code>
*/ */
public Builder clearExpireTimer() { public Builder clearExpirationTimer() {
bitField0_ = (bitField0_ & ~0x00000020); bitField0_ = (bitField0_ & ~0x00000020);
expireTimer_ = 0; expirationTimer_ = 0;
onChanged(); onChanged();
return this; return this;
} }
@ -21370,7 +21370,7 @@ public final class SignalServiceProtos {
"fication\022<\n\004type\030\001 \002(\0162..signalservice.D", "fication\022<\n\004type\030\001 \002(\0162..signalservice.D",
"ataExtractionNotification.Type\022\021\n\ttimest" + "ataExtractionNotification.Type\022\021\n\ttimest" +
"amp\030\002 \001(\004\"\'\n\004Type\022\016\n\nSCREENSHOT\020\001\022\017\n\013MED" + "amp\030\002 \001(\004\"\'\n\004Type\022\016\n\nSCREENSHOT\020\001\022\017\n\013MED" +
"IA_SAVED\020\002\"\241\014\n\013DataMessage\022\014\n\004body\030\001 \001(\t" + "IA_SAVED\020\002\"\245\014\n\013DataMessage\022\014\n\004body\030\001 \001(\t" +
"\0225\n\013attachments\030\002 \003(\0132 .signalservice.At" + "\0225\n\013attachments\030\002 \003(\0132 .signalservice.At" +
"tachmentPointer\022*\n\005group\030\003 \001(\0132\033.signals" + "tachmentPointer\022*\n\005group\030\003 \001(\0132\033.signals" +
"ervice.GroupContext\022\r\n\005flags\030\004 \001(\r\022\023\n\013ex" + "ervice.GroupContext\022\r\n\005flags\030\004 \001(\r\022\023\n\013ex" +
@ -21395,7 +21395,7 @@ public final class SignalServiceProtos {
"\n\005image\030\003 \001(\0132 .signalservice.Attachment" + "\n\005image\030\003 \001(\0132 .signalservice.Attachment" +
"Pointer\032:\n\013LokiProfile\022\023\n\013displayName\030\001 " + "Pointer\032:\n\013LokiProfile\022\023\n\013displayName\030\001 " +
"\001(\t\022\026\n\016profilePicture\030\002 \001(\t\0320\n\023OpenGroup" + "\001(\t\022\026\n\016profilePicture\030\002 \001(\t\0320\n\023OpenGroup" +
"Invitation\022\013\n\003url\030\001 \002(\t\022\014\n\004name\030\003 \002(\t\032\370\003" + "Invitation\022\013\n\003url\030\001 \002(\t\022\014\n\004name\030\003 \002(\t\032\374\003" +
"\n\031ClosedGroupControlMessage\022G\n\004type\030\001 \002(" + "\n\031ClosedGroupControlMessage\022G\n\004type\030\001 \002(" +
"\01629.signalservice.DataMessage.ClosedGrou", "\01629.signalservice.DataMessage.ClosedGrou",
"pControlMessage.Type\022\021\n\tpublicKey\030\002 \001(\014\022" + "pControlMessage.Type\022\021\n\tpublicKey\030\002 \001(\014\022" +
@ -21403,42 +21403,42 @@ public final class SignalServiceProtos {
"2\026.signalservice.KeyPair\022\017\n\007members\030\005 \003(" + "2\026.signalservice.KeyPair\022\017\n\007members\030\005 \003(" +
"\014\022\016\n\006admins\030\006 \003(\014\022U\n\010wrappers\030\007 \003(\0132C.si" + "\014\022\016\n\006admins\030\006 \003(\014\022U\n\010wrappers\030\007 \003(\0132C.si" +
"gnalservice.DataMessage.ClosedGroupContr" + "gnalservice.DataMessage.ClosedGroupContr" +
"olMessage.KeyPairWrapper\022\023\n\013expireTimer\030" + "olMessage.KeyPairWrapper\022\027\n\017expirationTi" +
"\010 \001(\r\032=\n\016KeyPairWrapper\022\021\n\tpublicKey\030\001 \002" + "mer\030\010 \001(\r\032=\n\016KeyPairWrapper\022\021\n\tpublicKey" +
"(\014\022\030\n\020encryptedKeyPair\030\002 \002(\014\"r\n\004Type\022\007\n\003" + "\030\001 \002(\014\022\030\n\020encryptedKeyPair\030\002 \002(\014\"r\n\004Type" +
"NEW\020\001\022\027\n\023ENCRYPTION_KEY_PAIR\020\003\022\017\n\013NAME_C" + "\022\007\n\003NEW\020\001\022\027\n\023ENCRYPTION_KEY_PAIR\020\003\022\017\n\013NA" +
"HANGE\020\004\022\021\n\rMEMBERS_ADDED\020\005\022\023\n\017MEMBERS_RE", "ME_CHANGE\020\004\022\021\n\rMEMBERS_ADDED\020\005\022\023\n\017MEMBER",
"MOVED\020\006\022\017\n\013MEMBER_LEFT\020\007\"$\n\005Flags\022\033\n\027EXP" + "S_REMOVED\020\006\022\017\n\013MEMBER_LEFT\020\007\"$\n\005Flags\022\033\n" +
"IRATION_TIMER_UPDATE\020\002\"\343\003\n\024Configuration" + "\027EXPIRATION_TIMER_UPDATE\020\002\"\347\003\n\024Configura" +
"Message\022E\n\014closedGroups\030\001 \003(\0132/.signalse" + "tionMessage\022E\n\014closedGroups\030\001 \003(\0132/.sign" +
"rvice.ConfigurationMessage.ClosedGroup\022\022" + "alservice.ConfigurationMessage.ClosedGro" +
"\n\nopenGroups\030\002 \003(\t\022\023\n\013displayName\030\003 \001(\t\022" + "up\022\022\n\nopenGroups\030\002 \003(\t\022\023\n\013displayName\030\003 " +
"\026\n\016profilePicture\030\004 \001(\t\022\022\n\nprofileKey\030\005 " + "\001(\t\022\026\n\016profilePicture\030\004 \001(\t\022\022\n\nprofileKe" +
"\001(\014\022=\n\010contacts\030\006 \003(\0132+.signalservice.Co" + "y\030\005 \001(\014\022=\n\010contacts\030\006 \003(\0132+.signalservic" +
"nfigurationMessage.Contact\032\227\001\n\013ClosedGro" + "e.ConfigurationMessage.Contact\032\233\001\n\013Close" +
"up\022\021\n\tpublicKey\030\001 \001(\014\022\014\n\004name\030\002 \001(\t\0221\n\021e" + "dGroup\022\021\n\tpublicKey\030\001 \001(\014\022\014\n\004name\030\002 \001(\t\022" +
"ncryptionKeyPair\030\003 \001(\0132\026.signalservice.K", "1\n\021encryptionKeyPair\030\003 \001(\0132\026.signalservi",
"eyPair\022\017\n\007members\030\004 \003(\014\022\016\n\006admins\030\005 \003(\014\022" + "ce.KeyPair\022\017\n\007members\030\004 \003(\014\022\016\n\006admins\030\005 " +
"\023\n\013expireTimer\030\006 \001(\r\032V\n\007Contact\022\021\n\tpubli" + "\003(\014\022\027\n\017expirationTimer\030\006 \001(\r\032V\n\007Contact\022" +
"cKey\030\001 \002(\014\022\014\n\004name\030\002 \002(\t\022\026\n\016profilePictu" + "\021\n\tpublicKey\030\001 \002(\014\022\014\n\004name\030\002 \002(\t\022\026\n\016prof" +
"re\030\003 \001(\t\022\022\n\nprofileKey\030\004 \001(\014\"u\n\016ReceiptM" + "ilePicture\030\003 \001(\t\022\022\n\nprofileKey\030\004 \001(\014\"u\n\016" +
"essage\0220\n\004type\030\001 \002(\0162\".signalservice.Rec" + "ReceiptMessage\0220\n\004type\030\001 \002(\0162\".signalser" +
"eiptMessage.Type\022\021\n\ttimestamp\030\002 \003(\004\"\036\n\004T" + "vice.ReceiptMessage.Type\022\021\n\ttimestamp\030\002 " +
"ype\022\014\n\010DELIVERY\020\000\022\010\n\004READ\020\001\"\354\001\n\021Attachme" + "\003(\004\"\036\n\004Type\022\014\n\010DELIVERY\020\000\022\010\n\004READ\020\001\"\354\001\n\021" +
"ntPointer\022\n\n\002id\030\001 \002(\006\022\023\n\013contentType\030\002 \001" + "AttachmentPointer\022\n\n\002id\030\001 \002(\006\022\023\n\013content" +
"(\t\022\013\n\003key\030\003 \001(\014\022\014\n\004size\030\004 \001(\r\022\021\n\tthumbna" + "Type\030\002 \001(\t\022\013\n\003key\030\003 \001(\014\022\014\n\004size\030\004 \001(\r\022\021\n" +
"il\030\005 \001(\014\022\016\n\006digest\030\006 \001(\014\022\020\n\010fileName\030\007 \001", "\tthumbnail\030\005 \001(\014\022\016\n\006digest\030\006 \001(\014\022\020\n\010file",
"(\t\022\r\n\005flags\030\010 \001(\r\022\r\n\005width\030\t \001(\r\022\016\n\006heig" + "Name\030\007 \001(\t\022\r\n\005flags\030\010 \001(\r\022\r\n\005width\030\t \001(\r" +
"ht\030\n \001(\r\022\017\n\007caption\030\013 \001(\t\022\013\n\003url\030e \001(\t\"\032" + "\022\016\n\006height\030\n \001(\r\022\017\n\007caption\030\013 \001(\t\022\013\n\003url" +
"\n\005Flags\022\021\n\rVOICE_MESSAGE\020\001\"\365\001\n\014GroupCont" + "\030e \001(\t\"\032\n\005Flags\022\021\n\rVOICE_MESSAGE\020\001\"\365\001\n\014G" +
"ext\022\n\n\002id\030\001 \001(\014\022.\n\004type\030\002 \001(\0162 .signalse" + "roupContext\022\n\n\002id\030\001 \001(\014\022.\n\004type\030\002 \001(\0162 ." +
"rvice.GroupContext.Type\022\014\n\004name\030\003 \001(\t\022\017\n" + "signalservice.GroupContext.Type\022\014\n\004name\030" +
"\007members\030\004 \003(\t\0220\n\006avatar\030\005 \001(\0132 .signals" + "\003 \001(\t\022\017\n\007members\030\004 \003(\t\0220\n\006avatar\030\005 \001(\0132 " +
"ervice.AttachmentPointer\022\016\n\006admins\030\006 \003(\t" + ".signalservice.AttachmentPointer\022\016\n\006admi" +
"\"H\n\004Type\022\013\n\007UNKNOWN\020\000\022\n\n\006UPDATE\020\001\022\013\n\007DEL" + "ns\030\006 \003(\t\"H\n\004Type\022\013\n\007UNKNOWN\020\000\022\n\n\006UPDATE\020" +
"IVER\020\002\022\010\n\004QUIT\020\003\022\020\n\014REQUEST_INFO\020\004B3\n\034or" + "\001\022\013\n\007DELIVER\020\002\022\010\n\004QUIT\020\003\022\020\n\014REQUEST_INFO" +
"g.session.libsignal.protosB\023SignalServic", "\020\004B3\n\034org.session.libsignal.protosB\023Sign",
"eProtos" "alServiceProtos"
}; };
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@ -21516,7 +21516,7 @@ public final class SignalServiceProtos {
internal_static_signalservice_DataMessage_ClosedGroupControlMessage_fieldAccessorTable = new internal_static_signalservice_DataMessage_ClosedGroupControlMessage_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable( com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor, internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor,
new java.lang.String[] { "Type", "PublicKey", "Name", "EncryptionKeyPair", "Members", "Admins", "Wrappers", "ExpireTimer", }); new java.lang.String[] { "Type", "PublicKey", "Name", "EncryptionKeyPair", "Members", "Admins", "Wrappers", "ExpirationTimer", });
internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_descriptor = internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_descriptor =
internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor.getNestedTypes().get(0); internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor.getNestedTypes().get(0);
internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_fieldAccessorTable = new internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_fieldAccessorTable = new
@ -21534,7 +21534,7 @@ public final class SignalServiceProtos {
internal_static_signalservice_ConfigurationMessage_ClosedGroup_fieldAccessorTable = new internal_static_signalservice_ConfigurationMessage_ClosedGroup_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable( com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_signalservice_ConfigurationMessage_ClosedGroup_descriptor, internal_static_signalservice_ConfigurationMessage_ClosedGroup_descriptor,
new java.lang.String[] { "PublicKey", "Name", "EncryptionKeyPair", "Members", "Admins", "ExpireTimer", }); new java.lang.String[] { "PublicKey", "Name", "EncryptionKeyPair", "Members", "Admins", "ExpirationTimer", });
internal_static_signalservice_ConfigurationMessage_Contact_descriptor = internal_static_signalservice_ConfigurationMessage_Contact_descriptor =
internal_static_signalservice_ConfigurationMessage_descriptor.getNestedTypes().get(1); internal_static_signalservice_ConfigurationMessage_descriptor.getNestedTypes().get(1);
internal_static_signalservice_ConfigurationMessage_Contact_fieldAccessorTable = new internal_static_signalservice_ConfigurationMessage_Contact_fieldAccessorTable = new