diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 8c3ff68aec..892c6f1a8d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -166,6 +166,7 @@ import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
import org.thoughtcrime.securesms.util.DateUtils
import org.thoughtcrime.securesms.util.MediaUtil
import org.thoughtcrime.securesms.util.SaveAttachmentTask
+import org.thoughtcrime.securesms.util.drawToBitmap
import org.thoughtcrime.securesms.util.isScrolledToBottom
import org.thoughtcrime.securesms.util.push
import org.thoughtcrime.securesms.util.show
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
index 5fdadc3dab..17a87a486f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
@@ -92,7 +92,7 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
private static final int lokiV43 = 64;
// Loki - onUpgrade(...) must be updated to use Loki version numbers if Signal makes any database changes
- private static final int DATABASE_VERSION = lokiV42;
+ private static final int DATABASE_VERSION = lokiV43;
private static final int MIN_DATABASE_VERSION = lokiV7;
private static final String CIPHER3_DATABASE_NAME = "signal.db";
public static final String DATABASE_NAME = "signal_v4.db";
diff --git a/app/src/main/res/layout/view_control_message.xml b/app/src/main/res/layout/view_control_message.xml
index b3266eb215..3fc5c6af35 100644
--- a/app/src/main/res/layout/view_control_message.xml
+++ b/app/src/main/res/layout/view_control_message.xml
@@ -33,7 +33,6 @@
android:id="@+id/textView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:contentDescription="@string/AccessibilityId_configuration_message"
android:gravity="center"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/very_small_font_size"
diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/MessageRequestResponse.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/MessageRequestResponse.kt
index 346488ec1d..65c7d9abd2 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/MessageRequestResponse.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/MessageRequestResponse.kt
@@ -19,8 +19,8 @@ class MessageRequestResponse(val isApproved: Boolean, var profile: Profile? = nu
profile?.profileKey?.let { messageRequestResponseProto.profileKey = ByteString.copyFrom(it) }
return try {
SignalServiceProtos.Content.newBuilder()
- .setMessageRequestResponse(messageRequestResponseProto.build())
.setExpirationConfigurationIfNeeded(threadID)
+ .setMessageRequestResponse(messageRequestResponseProto.build())
.build()
} catch (e: Exception) {
Log.w(TAG, "Couldn't construct message request response proto from: $this")
diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
index d978e1a8bb..a552d5e153 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
@@ -15,6 +15,7 @@ import org.session.libsession.messaging.messages.control.ExpirationTimerUpdate
import org.session.libsession.messaging.messages.control.MessageRequestResponse
import org.session.libsession.messaging.messages.control.SharedConfigurationMessage
import org.session.libsession.messaging.messages.control.UnsendRequest
+import org.session.libsession.messaging.messages.control.UnsendRequest
import org.session.libsession.messaging.messages.visible.LinkPreview
import org.session.libsession.messaging.messages.visible.Quote
import org.session.libsession.messaging.messages.visible.VisibleMessage
@@ -34,7 +35,12 @@ import org.session.libsession.utilities.SSKEnvironment
import org.session.libsignal.crypto.PushTransportDetails
import org.session.libsignal.protos.SignalServiceProtos
import org.session.libsignal.protos.SignalServiceProtos.Content.ExpirationType
-import org.session.libsignal.utilities.*
+import org.session.libsignal.utilities.Base64
+import org.session.libsignal.utilities.IdPrefix
+import org.session.libsignal.utilities.Namespace
+import org.session.libsignal.utilities.defaultRequiresAuth
+import org.session.libsignal.utilities.hasNamespaces
+import org.session.libsignal.utilities.hexEncodedPublicKey
import java.util.concurrent.TimeUnit
import java.util.concurrent.atomic.AtomicInteger
import org.session.libsession.messaging.sending_receiving.attachments.Attachment as SignalAttachment
diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
index f8e9ad7e29..14968e1d52 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
@@ -104,8 +104,8 @@ object UpdateMessageBuilder {
}
} else {
val time = ExpirationUtil.getExpirationDisplayValue(context, duration.toInt())
- val threadId = storage.getThreadId(Address.fromSerialized(senderId!!)) ?: return ""
- val config = storage.getExpirationConfiguration(threadId)
+ val threadId = storage.getThreadId(Address.fromSerialized(senderId!!))
+ val config = threadId?.let { storage.getExpirationConfiguration(it) }
val state = when (config?.expirationType) {
ExpirationType.DELETE_AFTER_SEND -> context.getString(R.string.MessageRecord_state_sent)
ExpirationType.DELETE_AFTER_READ -> context.getString(R.string.MessageRecord_state_read)
diff --git a/libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java b/libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java
index 211eb0460a..46068a7ddc 100644
--- a/libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java
+++ b/libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java
@@ -2469,47 +2469,33 @@ public final class SignalServiceProtos {
*/
org.session.libsignal.protos.SignalServiceProtos.MessageRequestResponseOrBuilder getMessageRequestResponseOrBuilder();
- // optional .signalservice.SharedConfigMessage sharedConfigMessage = 11;
+ // optional .signalservice.Content.ExpirationType expirationType = 11;
/**
- * optional .signalservice.SharedConfigMessage sharedConfigMessage = 11;
- */
- boolean hasSharedConfigMessage();
- /**
- * optional .signalservice.SharedConfigMessage sharedConfigMessage = 11;
- */
- org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage getSharedConfigMessage();
- /**
- * optional .signalservice.SharedConfigMessage sharedConfigMessage = 11;
- */
- org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessageOrBuilder getSharedConfigMessageOrBuilder();
-
- // optional .signalservice.Content.ExpirationType expirationType = 12;
- /**
- * optional .signalservice.Content.ExpirationType expirationType = 12;
+ * optional .signalservice.Content.ExpirationType expirationType = 11;
*/
boolean hasExpirationType();
/**
- * optional .signalservice.Content.ExpirationType expirationType = 12;
+ * optional .signalservice.Content.ExpirationType expirationType = 11;
*/
org.session.libsignal.protos.SignalServiceProtos.Content.ExpirationType getExpirationType();
- // optional uint32 expirationTimer = 13;
+ // optional uint32 expirationTimer = 12;
/**
- * optional uint32 expirationTimer = 13;
+ * optional uint32 expirationTimer = 12;
*/
boolean hasExpirationTimer();
/**
- * optional uint32 expirationTimer = 13;
+ * optional uint32 expirationTimer = 12;
*/
int getExpirationTimer();
- // optional uint64 lastDisappearingMessageChangeTimestamp = 14;
+ // optional uint64 lastDisappearingMessageChangeTimestamp = 13;
/**
- * optional uint64 lastDisappearingMessageChangeTimestamp = 14;
+ * optional uint64 lastDisappearingMessageChangeTimestamp = 13;
*/
boolean hasLastDisappearingMessageChangeTimestamp();
/**
- * optional uint64 lastDisappearingMessageChangeTimestamp = 14;
+ * optional uint64 lastDisappearingMessageChangeTimestamp = 13;
*/
long getLastDisappearingMessageChangeTimestamp();
}
@@ -2668,37 +2654,24 @@ public final class SignalServiceProtos {
bitField0_ |= 0x00000080;
break;
}
- case 90: {
- org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.Builder subBuilder = null;
- if (((bitField0_ & 0x00000100) == 0x00000100)) {
- subBuilder = sharedConfigMessage_.toBuilder();
- }
- sharedConfigMessage_ = input.readMessage(org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.PARSER, extensionRegistry);
- if (subBuilder != null) {
- subBuilder.mergeFrom(sharedConfigMessage_);
- sharedConfigMessage_ = subBuilder.buildPartial();
- }
- bitField0_ |= 0x00000100;
- break;
- }
- case 96: {
+ case 88: {
int rawValue = input.readEnum();
org.session.libsignal.protos.SignalServiceProtos.Content.ExpirationType value = org.session.libsignal.protos.SignalServiceProtos.Content.ExpirationType.valueOf(rawValue);
if (value == null) {
- unknownFields.mergeVarintField(12, rawValue);
+ unknownFields.mergeVarintField(11, rawValue);
} else {
- bitField0_ |= 0x00000200;
+ bitField0_ |= 0x00000100;
expirationType_ = value;
}
break;
}
- case 104: {
- bitField0_ |= 0x00000400;
+ case 96: {
+ bitField0_ |= 0x00000200;
expirationTimer_ = input.readUInt32();
break;
}
- case 112: {
- bitField0_ |= 0x00000800;
+ case 104: {
+ bitField0_ |= 0x00000400;
lastDisappearingMessageChangeTimestamp_ = input.readUInt64();
break;
}
@@ -3000,71 +2973,49 @@ public final class SignalServiceProtos {
return messageRequestResponse_;
}
- // optional .signalservice.SharedConfigMessage sharedConfigMessage = 11;
- public static final int SHAREDCONFIGMESSAGE_FIELD_NUMBER = 11;
- private org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage sharedConfigMessage_;
+ // optional .signalservice.Content.ExpirationType expirationType = 11;
+ public static final int EXPIRATIONTYPE_FIELD_NUMBER = 11;
+ private org.session.libsignal.protos.SignalServiceProtos.Content.ExpirationType expirationType_;
/**
- * optional .signalservice.SharedConfigMessage sharedConfigMessage = 11;
+ * optional .signalservice.Content.ExpirationType expirationType = 11;
*/
- public boolean hasSharedConfigMessage() {
+ public boolean hasExpirationType() {
return ((bitField0_ & 0x00000100) == 0x00000100);
}
/**
- * optional .signalservice.SharedConfigMessage sharedConfigMessage = 11;
- */
- public org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage getSharedConfigMessage() {
- return sharedConfigMessage_;
- }
- /**
- * optional .signalservice.SharedConfigMessage sharedConfigMessage = 11;
- */
- public org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessageOrBuilder getSharedConfigMessageOrBuilder() {
- return sharedConfigMessage_;
- }
-
- // optional .signalservice.Content.ExpirationType expirationType = 12;
- public static final int EXPIRATIONTYPE_FIELD_NUMBER = 12;
- private org.session.libsignal.protos.SignalServiceProtos.Content.ExpirationType expirationType_;
- /**
- * optional .signalservice.Content.ExpirationType expirationType = 12;
- */
- public boolean hasExpirationType() {
- return ((bitField0_ & 0x00000200) == 0x00000200);
- }
- /**
- * optional .signalservice.Content.ExpirationType expirationType = 12;
+ * optional .signalservice.Content.ExpirationType expirationType = 11;
*/
public org.session.libsignal.protos.SignalServiceProtos.Content.ExpirationType getExpirationType() {
return expirationType_;
}
- // optional uint32 expirationTimer = 13;
- public static final int EXPIRATIONTIMER_FIELD_NUMBER = 13;
+ // optional uint32 expirationTimer = 12;
+ public static final int EXPIRATIONTIMER_FIELD_NUMBER = 12;
private int expirationTimer_;
/**
- * optional uint32 expirationTimer = 13;
+ * optional uint32 expirationTimer = 12;
*/
public boolean hasExpirationTimer() {
- return ((bitField0_ & 0x00000400) == 0x00000400);
+ return ((bitField0_ & 0x00000200) == 0x00000200);
}
/**
- * optional uint32 expirationTimer = 13;
+ * optional uint32 expirationTimer = 12;
*/
public int getExpirationTimer() {
return expirationTimer_;
}
- // optional uint64 lastDisappearingMessageChangeTimestamp = 14;
- public static final int LASTDISAPPEARINGMESSAGECHANGETIMESTAMP_FIELD_NUMBER = 14;
+ // optional uint64 lastDisappearingMessageChangeTimestamp = 13;
+ public static final int LASTDISAPPEARINGMESSAGECHANGETIMESTAMP_FIELD_NUMBER = 13;
private long lastDisappearingMessageChangeTimestamp_;
/**
- * optional uint64 lastDisappearingMessageChangeTimestamp = 14;
+ * optional uint64 lastDisappearingMessageChangeTimestamp = 13;
*/
public boolean hasLastDisappearingMessageChangeTimestamp() {
- return ((bitField0_ & 0x00000800) == 0x00000800);
+ return ((bitField0_ & 0x00000400) == 0x00000400);
}
/**
- * optional uint64 lastDisappearingMessageChangeTimestamp = 14;
+ * optional uint64 lastDisappearingMessageChangeTimestamp = 13;
*/
public long getLastDisappearingMessageChangeTimestamp() {
return lastDisappearingMessageChangeTimestamp_;
@@ -3079,7 +3030,6 @@ public final class SignalServiceProtos {
dataExtractionNotification_ = org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.getDefaultInstance();
unsendRequest_ = org.session.libsignal.protos.SignalServiceProtos.UnsendRequest.getDefaultInstance();
messageRequestResponse_ = org.session.libsignal.protos.SignalServiceProtos.MessageRequestResponse.getDefaultInstance();
- sharedConfigMessage_ = org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.getDefaultInstance();
expirationType_ = org.session.libsignal.protos.SignalServiceProtos.Content.ExpirationType.DELETE_AFTER_READ;
expirationTimer_ = 0;
lastDisappearingMessageChangeTimestamp_ = 0L;
@@ -3137,12 +3087,6 @@ public final class SignalServiceProtos {
return false;
}
}
- if (hasSharedConfigMessage()) {
- if (!getSharedConfigMessage().isInitialized()) {
- memoizedIsInitialized = 0;
- return false;
- }
- }
memoizedIsInitialized = 1;
return true;
}
@@ -3175,16 +3119,13 @@ public final class SignalServiceProtos {
output.writeMessage(10, messageRequestResponse_);
}
if (((bitField0_ & 0x00000100) == 0x00000100)) {
- output.writeMessage(11, sharedConfigMessage_);
+ output.writeEnum(11, expirationType_.getNumber());
}
if (((bitField0_ & 0x00000200) == 0x00000200)) {
- output.writeEnum(12, expirationType_.getNumber());
+ output.writeUInt32(12, expirationTimer_);
}
if (((bitField0_ & 0x00000400) == 0x00000400)) {
- output.writeUInt32(13, expirationTimer_);
- }
- if (((bitField0_ & 0x00000800) == 0x00000800)) {
- output.writeUInt64(14, lastDisappearingMessageChangeTimestamp_);
+ output.writeUInt64(13, lastDisappearingMessageChangeTimestamp_);
}
getUnknownFields().writeTo(output);
}
@@ -3229,19 +3170,15 @@ public final class SignalServiceProtos {
}
if (((bitField0_ & 0x00000100) == 0x00000100)) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(11, sharedConfigMessage_);
+ .computeEnumSize(11, expirationType_.getNumber());
}
if (((bitField0_ & 0x00000200) == 0x00000200)) {
size += com.google.protobuf.CodedOutputStream
- .computeEnumSize(12, expirationType_.getNumber());
+ .computeUInt32Size(12, expirationTimer_);
}
if (((bitField0_ & 0x00000400) == 0x00000400)) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(13, expirationTimer_);
- }
- if (((bitField0_ & 0x00000800) == 0x00000800)) {
- size += com.google.protobuf.CodedOutputStream
- .computeUInt64Size(14, lastDisappearingMessageChangeTimestamp_);
+ .computeUInt64Size(13, lastDisappearingMessageChangeTimestamp_);
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
@@ -3359,7 +3296,6 @@ public final class SignalServiceProtos {
getDataExtractionNotificationFieldBuilder();
getUnsendRequestFieldBuilder();
getMessageRequestResponseFieldBuilder();
- getSharedConfigMessageFieldBuilder();
}
}
private static Builder create() {
@@ -3416,18 +3352,12 @@ public final class SignalServiceProtos {
messageRequestResponseBuilder_.clear();
}
bitField0_ = (bitField0_ & ~0x00000080);
- if (sharedConfigMessageBuilder_ == null) {
- sharedConfigMessage_ = org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.getDefaultInstance();
- } else {
- sharedConfigMessageBuilder_.clear();
- }
- bitField0_ = (bitField0_ & ~0x00000100);
expirationType_ = org.session.libsignal.protos.SignalServiceProtos.Content.ExpirationType.DELETE_AFTER_READ;
- bitField0_ = (bitField0_ & ~0x00000200);
+ bitField0_ = (bitField0_ & ~0x00000100);
expirationTimer_ = 0;
- bitField0_ = (bitField0_ & ~0x00000400);
+ bitField0_ = (bitField0_ & ~0x00000200);
lastDisappearingMessageChangeTimestamp_ = 0L;
- bitField0_ = (bitField0_ & ~0x00000800);
+ bitField0_ = (bitField0_ & ~0x00000400);
return this;
}
@@ -3523,22 +3453,14 @@ public final class SignalServiceProtos {
if (((from_bitField0_ & 0x00000100) == 0x00000100)) {
to_bitField0_ |= 0x00000100;
}
- if (sharedConfigMessageBuilder_ == null) {
- result.sharedConfigMessage_ = sharedConfigMessage_;
- } else {
- result.sharedConfigMessage_ = sharedConfigMessageBuilder_.build();
- }
+ result.expirationType_ = expirationType_;
if (((from_bitField0_ & 0x00000200) == 0x00000200)) {
to_bitField0_ |= 0x00000200;
}
- result.expirationType_ = expirationType_;
+ result.expirationTimer_ = expirationTimer_;
if (((from_bitField0_ & 0x00000400) == 0x00000400)) {
to_bitField0_ |= 0x00000400;
}
- result.expirationTimer_ = expirationTimer_;
- if (((from_bitField0_ & 0x00000800) == 0x00000800)) {
- to_bitField0_ |= 0x00000800;
- }
result.lastDisappearingMessageChangeTimestamp_ = lastDisappearingMessageChangeTimestamp_;
result.bitField0_ = to_bitField0_;
onBuilt();
@@ -3580,9 +3502,6 @@ public final class SignalServiceProtos {
if (other.hasMessageRequestResponse()) {
mergeMessageRequestResponse(other.getMessageRequestResponse());
}
- if (other.hasSharedConfigMessage()) {
- mergeSharedConfigMessage(other.getSharedConfigMessage());
- }
if (other.hasExpirationType()) {
setExpirationType(other.getExpirationType());
}
@@ -3645,12 +3564,6 @@ public final class SignalServiceProtos {
return false;
}
}
- if (hasSharedConfigMessage()) {
- if (!getSharedConfigMessage().isInitialized()) {
-
- return false;
- }
- }
return true;
}
@@ -4609,220 +4522,103 @@ public final class SignalServiceProtos {
return messageRequestResponseBuilder_;
}
- // optional .signalservice.SharedConfigMessage sharedConfigMessage = 11;
- private org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage sharedConfigMessage_ = org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
- org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage, org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.Builder, org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessageOrBuilder> sharedConfigMessageBuilder_;
+ // optional .signalservice.Content.ExpirationType expirationType = 11;
+ private org.session.libsignal.protos.SignalServiceProtos.Content.ExpirationType expirationType_ = org.session.libsignal.protos.SignalServiceProtos.Content.ExpirationType.DELETE_AFTER_READ;
/**
- * optional .signalservice.SharedConfigMessage sharedConfigMessage = 11;
+ * optional .signalservice.Content.ExpirationType expirationType = 11;
*/
- public boolean hasSharedConfigMessage() {
+ public boolean hasExpirationType() {
return ((bitField0_ & 0x00000100) == 0x00000100);
}
/**
- * optional .signalservice.SharedConfigMessage sharedConfigMessage = 11;
- */
- public org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage getSharedConfigMessage() {
- if (sharedConfigMessageBuilder_ == null) {
- return sharedConfigMessage_;
- } else {
- return sharedConfigMessageBuilder_.getMessage();
- }
- }
- /**
- * optional .signalservice.SharedConfigMessage sharedConfigMessage = 11;
- */
- public Builder setSharedConfigMessage(org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage value) {
- if (sharedConfigMessageBuilder_ == null) {
- if (value == null) {
- throw new NullPointerException();
- }
- sharedConfigMessage_ = value;
- onChanged();
- } else {
- sharedConfigMessageBuilder_.setMessage(value);
- }
- bitField0_ |= 0x00000100;
- return this;
- }
- /**
- * optional .signalservice.SharedConfigMessage sharedConfigMessage = 11;
- */
- public Builder setSharedConfigMessage(
- org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.Builder builderForValue) {
- if (sharedConfigMessageBuilder_ == null) {
- sharedConfigMessage_ = builderForValue.build();
- onChanged();
- } else {
- sharedConfigMessageBuilder_.setMessage(builderForValue.build());
- }
- bitField0_ |= 0x00000100;
- return this;
- }
- /**
- * optional .signalservice.SharedConfigMessage sharedConfigMessage = 11;
- */
- public Builder mergeSharedConfigMessage(org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage value) {
- if (sharedConfigMessageBuilder_ == null) {
- if (((bitField0_ & 0x00000100) == 0x00000100) &&
- sharedConfigMessage_ != org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.getDefaultInstance()) {
- sharedConfigMessage_ =
- org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.newBuilder(sharedConfigMessage_).mergeFrom(value).buildPartial();
- } else {
- sharedConfigMessage_ = value;
- }
- onChanged();
- } else {
- sharedConfigMessageBuilder_.mergeFrom(value);
- }
- bitField0_ |= 0x00000100;
- return this;
- }
- /**
- * optional .signalservice.SharedConfigMessage sharedConfigMessage = 11;
- */
- public Builder clearSharedConfigMessage() {
- if (sharedConfigMessageBuilder_ == null) {
- sharedConfigMessage_ = org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.getDefaultInstance();
- onChanged();
- } else {
- sharedConfigMessageBuilder_.clear();
- }
- bitField0_ = (bitField0_ & ~0x00000100);
- return this;
- }
- /**
- * optional .signalservice.SharedConfigMessage sharedConfigMessage = 11;
- */
- public org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.Builder getSharedConfigMessageBuilder() {
- bitField0_ |= 0x00000100;
- onChanged();
- return getSharedConfigMessageFieldBuilder().getBuilder();
- }
- /**
- * optional .signalservice.SharedConfigMessage sharedConfigMessage = 11;
- */
- public org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessageOrBuilder getSharedConfigMessageOrBuilder() {
- if (sharedConfigMessageBuilder_ != null) {
- return sharedConfigMessageBuilder_.getMessageOrBuilder();
- } else {
- return sharedConfigMessage_;
- }
- }
- /**
- * optional .signalservice.SharedConfigMessage sharedConfigMessage = 11;
- */
- private com.google.protobuf.SingleFieldBuilder<
- org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage, org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.Builder, org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessageOrBuilder>
- getSharedConfigMessageFieldBuilder() {
- if (sharedConfigMessageBuilder_ == null) {
- sharedConfigMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
- org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage, org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.Builder, org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessageOrBuilder>(
- sharedConfigMessage_,
- getParentForChildren(),
- isClean());
- sharedConfigMessage_ = null;
- }
- return sharedConfigMessageBuilder_;
- }
-
- // optional .signalservice.Content.ExpirationType expirationType = 12;
- private org.session.libsignal.protos.SignalServiceProtos.Content.ExpirationType expirationType_ = org.session.libsignal.protos.SignalServiceProtos.Content.ExpirationType.DELETE_AFTER_READ;
- /**
- * optional .signalservice.Content.ExpirationType expirationType = 12;
- */
- public boolean hasExpirationType() {
- return ((bitField0_ & 0x00000200) == 0x00000200);
- }
- /**
- * optional .signalservice.Content.ExpirationType expirationType = 12;
+ * optional .signalservice.Content.ExpirationType expirationType = 11;
*/
public org.session.libsignal.protos.SignalServiceProtos.Content.ExpirationType getExpirationType() {
return expirationType_;
}
/**
- * optional .signalservice.Content.ExpirationType expirationType = 12;
+ * optional .signalservice.Content.ExpirationType expirationType = 11;
*/
public Builder setExpirationType(org.session.libsignal.protos.SignalServiceProtos.Content.ExpirationType value) {
if (value == null) {
throw new NullPointerException();
}
- bitField0_ |= 0x00000200;
+ bitField0_ |= 0x00000100;
expirationType_ = value;
onChanged();
return this;
}
/**
- * optional .signalservice.Content.ExpirationType expirationType = 12;
+ * optional .signalservice.Content.ExpirationType expirationType = 11;
*/
public Builder clearExpirationType() {
- bitField0_ = (bitField0_ & ~0x00000200);
+ bitField0_ = (bitField0_ & ~0x00000100);
expirationType_ = org.session.libsignal.protos.SignalServiceProtos.Content.ExpirationType.DELETE_AFTER_READ;
onChanged();
return this;
}
- // optional uint32 expirationTimer = 13;
+ // optional uint32 expirationTimer = 12;
private int expirationTimer_ ;
/**
- * optional uint32 expirationTimer = 13;
+ * optional uint32 expirationTimer = 12;
*/
public boolean hasExpirationTimer() {
- return ((bitField0_ & 0x00000400) == 0x00000400);
+ return ((bitField0_ & 0x00000200) == 0x00000200);
}
/**
- * optional uint32 expirationTimer = 13;
+ * optional uint32 expirationTimer = 12;
*/
public int getExpirationTimer() {
return expirationTimer_;
}
/**
- * optional uint32 expirationTimer = 13;
+ * optional uint32 expirationTimer = 12;
*/
public Builder setExpirationTimer(int value) {
- bitField0_ |= 0x00000400;
+ bitField0_ |= 0x00000200;
expirationTimer_ = value;
onChanged();
return this;
}
/**
- * optional uint32 expirationTimer = 13;
+ * optional uint32 expirationTimer = 12;
*/
public Builder clearExpirationTimer() {
- bitField0_ = (bitField0_ & ~0x00000400);
+ bitField0_ = (bitField0_ & ~0x00000200);
expirationTimer_ = 0;
onChanged();
return this;
}
- // optional uint64 lastDisappearingMessageChangeTimestamp = 14;
+ // optional uint64 lastDisappearingMessageChangeTimestamp = 13;
private long lastDisappearingMessageChangeTimestamp_ ;
/**
- * optional uint64 lastDisappearingMessageChangeTimestamp = 14;
+ * optional uint64 lastDisappearingMessageChangeTimestamp = 13;
*/
public boolean hasLastDisappearingMessageChangeTimestamp() {
- return ((bitField0_ & 0x00000800) == 0x00000800);
+ return ((bitField0_ & 0x00000400) == 0x00000400);
}
/**
- * optional uint64 lastDisappearingMessageChangeTimestamp = 14;
+ * optional uint64 lastDisappearingMessageChangeTimestamp = 13;
*/
public long getLastDisappearingMessageChangeTimestamp() {
return lastDisappearingMessageChangeTimestamp_;
}
/**
- * optional uint64 lastDisappearingMessageChangeTimestamp = 14;
+ * optional uint64 lastDisappearingMessageChangeTimestamp = 13;
*/
public Builder setLastDisappearingMessageChangeTimestamp(long value) {
- bitField0_ |= 0x00000800;
+ bitField0_ |= 0x00000400;
lastDisappearingMessageChangeTimestamp_ = value;
onChanged();
return this;
}
/**
- * optional uint64 lastDisappearingMessageChangeTimestamp = 14;
+ * optional uint64 lastDisappearingMessageChangeTimestamp = 13;
*/
public Builder clearLastDisappearingMessageChangeTimestamp() {
- bitField0_ = (bitField0_ & ~0x00000800);
+ bitField0_ = (bitField0_ & ~0x00000400);
lastDisappearingMessageChangeTimestamp_ = 0L;
onChanged();
return this;
@@ -22734,823 +22530,6 @@ public final class SignalServiceProtos {
// @@protoc_insertion_point(class_scope:signalservice.MessageRequestResponse)
}
- public interface SharedConfigMessageOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
-
- // required .signalservice.SharedConfigMessage.Kind kind = 1;
- /**
- * required .signalservice.SharedConfigMessage.Kind kind = 1;
- *
- *
- * @required
- *
- */
- boolean hasKind();
- /**
- * required .signalservice.SharedConfigMessage.Kind kind = 1;
- *
- *
- * @required
- *
- */
- org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.Kind getKind();
-
- // required int64 seqno = 2;
- /**
- * required int64 seqno = 2;
- *
- *
- * @required
- *
- */
- boolean hasSeqno();
- /**
- * required int64 seqno = 2;
- *
- *
- * @required
- *
- */
- long getSeqno();
-
- // required bytes data = 3;
- /**
- * required bytes data = 3;
- *
- *
- * @required
- *
- */
- boolean hasData();
- /**
- * required bytes data = 3;
- *
- *
- * @required
- *
- */
- com.google.protobuf.ByteString getData();
- }
- /**
- * Protobuf type {@code signalservice.SharedConfigMessage}
- */
- public static final class SharedConfigMessage extends
- com.google.protobuf.GeneratedMessage
- implements SharedConfigMessageOrBuilder {
- // Use SharedConfigMessage.newBuilder() to construct.
- private SharedConfigMessage(com.google.protobuf.GeneratedMessage.Builder builder) {
- super(builder);
- this.unknownFields = builder.getUnknownFields();
- }
- private SharedConfigMessage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
- private static final SharedConfigMessage defaultInstance;
- public static SharedConfigMessage getDefaultInstance() {
- return defaultInstance;
- }
-
- public SharedConfigMessage getDefaultInstanceForType() {
- return defaultInstance;
- }
-
- private final com.google.protobuf.UnknownFieldSet unknownFields;
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
- getUnknownFields() {
- return this.unknownFields;
- }
- private SharedConfigMessage(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- initFields();
- int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
- try {
- boolean done = false;
- while (!done) {
- int tag = input.readTag();
- switch (tag) {
- case 0:
- done = true;
- break;
- default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
- done = true;
- }
- break;
- }
- case 8: {
- int rawValue = input.readEnum();
- org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.Kind value = org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.Kind.valueOf(rawValue);
- if (value == null) {
- unknownFields.mergeVarintField(1, rawValue);
- } else {
- bitField0_ |= 0x00000001;
- kind_ = value;
- }
- break;
- }
- case 16: {
- bitField0_ |= 0x00000002;
- seqno_ = input.readInt64();
- break;
- }
- case 26: {
- bitField0_ |= 0x00000004;
- data_ = input.readBytes();
- break;
- }
- }
- }
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
- throw e.setUnfinishedMessage(this);
- } catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
- e.getMessage()).setUnfinishedMessage(this);
- } finally {
- this.unknownFields = unknownFields.build();
- makeExtensionsImmutable();
- }
- }
- public static final com.google.protobuf.Descriptors.Descriptor
- getDescriptor() {
- return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_SharedConfigMessage_descriptor;
- }
-
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
- internalGetFieldAccessorTable() {
- return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_SharedConfigMessage_fieldAccessorTable
- .ensureFieldAccessorsInitialized(
- org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.class, org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.Builder.class);
- }
-
- public static com.google.protobuf.Parser PARSER =
- new com.google.protobuf.AbstractParser() {
- public SharedConfigMessage parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return new SharedConfigMessage(input, extensionRegistry);
- }
- };
-
- @java.lang.Override
- public com.google.protobuf.Parser getParserForType() {
- return PARSER;
- }
-
- /**
- * Protobuf enum {@code signalservice.SharedConfigMessage.Kind}
- */
- public enum Kind
- implements com.google.protobuf.ProtocolMessageEnum {
- /**
- * USER_PROFILE = 1;
- */
- USER_PROFILE(0, 1),
- /**
- * CONTACTS = 2;
- */
- CONTACTS(1, 2),
- /**
- * CONVO_INFO_VOLATILE = 3;
- */
- CONVO_INFO_VOLATILE(2, 3),
- /**
- * GROUPS = 4;
- */
- GROUPS(3, 4),
- /**
- * CLOSED_GROUP_INFO = 5;
- */
- CLOSED_GROUP_INFO(4, 5),
- /**
- * CLOSED_GROUP_MEMBERS = 6;
- */
- CLOSED_GROUP_MEMBERS(5, 6),
- /**
- * ENCRYPTION_KEYS = 7;
- */
- ENCRYPTION_KEYS(6, 7),
- ;
-
- /**
- * USER_PROFILE = 1;
- */
- public static final int USER_PROFILE_VALUE = 1;
- /**
- * CONTACTS = 2;
- */
- public static final int CONTACTS_VALUE = 2;
- /**
- * CONVO_INFO_VOLATILE = 3;
- */
- public static final int CONVO_INFO_VOLATILE_VALUE = 3;
- /**
- * GROUPS = 4;
- */
- public static final int GROUPS_VALUE = 4;
- /**
- * CLOSED_GROUP_INFO = 5;
- */
- public static final int CLOSED_GROUP_INFO_VALUE = 5;
- /**
- * CLOSED_GROUP_MEMBERS = 6;
- */
- public static final int CLOSED_GROUP_MEMBERS_VALUE = 6;
- /**
- * ENCRYPTION_KEYS = 7;
- */
- public static final int ENCRYPTION_KEYS_VALUE = 7;
-
-
- public final int getNumber() { return value; }
-
- public static Kind valueOf(int value) {
- switch (value) {
- case 1: return USER_PROFILE;
- case 2: return CONTACTS;
- case 3: return CONVO_INFO_VOLATILE;
- case 4: return GROUPS;
- case 5: return CLOSED_GROUP_INFO;
- case 6: return CLOSED_GROUP_MEMBERS;
- case 7: return ENCRYPTION_KEYS;
- default: return null;
- }
- }
-
- public static com.google.protobuf.Internal.EnumLiteMap
- internalGetValueMap() {
- return internalValueMap;
- }
- private static com.google.protobuf.Internal.EnumLiteMap
- internalValueMap =
- new com.google.protobuf.Internal.EnumLiteMap() {
- public Kind findValueByNumber(int number) {
- return Kind.valueOf(number);
- }
- };
-
- public final com.google.protobuf.Descriptors.EnumValueDescriptor
- getValueDescriptor() {
- return getDescriptor().getValues().get(index);
- }
- public final com.google.protobuf.Descriptors.EnumDescriptor
- getDescriptorForType() {
- return getDescriptor();
- }
- public static final com.google.protobuf.Descriptors.EnumDescriptor
- getDescriptor() {
- return org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.getDescriptor().getEnumTypes().get(0);
- }
-
- private static final Kind[] VALUES = values();
-
- public static Kind valueOf(
- com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
- if (desc.getType() != getDescriptor()) {
- throw new java.lang.IllegalArgumentException(
- "EnumValueDescriptor is not for this type.");
- }
- return VALUES[desc.getIndex()];
- }
-
- private final int index;
- private final int value;
-
- private Kind(int index, int value) {
- this.index = index;
- this.value = value;
- }
-
- // @@protoc_insertion_point(enum_scope:signalservice.SharedConfigMessage.Kind)
- }
-
- private int bitField0_;
- // required .signalservice.SharedConfigMessage.Kind kind = 1;
- public static final int KIND_FIELD_NUMBER = 1;
- private org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.Kind kind_;
- /**
- * required .signalservice.SharedConfigMessage.Kind kind = 1;
- *
- *
- * @required
- *
- */
- public boolean hasKind() {
- return ((bitField0_ & 0x00000001) == 0x00000001);
- }
- /**
- * required .signalservice.SharedConfigMessage.Kind kind = 1;
- *
- *
- * @required
- *
- */
- public org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.Kind getKind() {
- return kind_;
- }
-
- // required int64 seqno = 2;
- public static final int SEQNO_FIELD_NUMBER = 2;
- private long seqno_;
- /**
- * required int64 seqno = 2;
- *
- *
- * @required
- *
- */
- public boolean hasSeqno() {
- return ((bitField0_ & 0x00000002) == 0x00000002);
- }
- /**
- * required int64 seqno = 2;
- *
- *
- * @required
- *
- */
- public long getSeqno() {
- return seqno_;
- }
-
- // required bytes data = 3;
- public static final int DATA_FIELD_NUMBER = 3;
- private com.google.protobuf.ByteString data_;
- /**
- * required bytes data = 3;
- *
- *
- * @required
- *
- */
- public boolean hasData() {
- return ((bitField0_ & 0x00000004) == 0x00000004);
- }
- /**
- * required bytes data = 3;
- *
- *
- * @required
- *
- */
- public com.google.protobuf.ByteString getData() {
- return data_;
- }
-
- private void initFields() {
- kind_ = org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.Kind.USER_PROFILE;
- seqno_ = 0L;
- data_ = com.google.protobuf.ByteString.EMPTY;
- }
- private byte memoizedIsInitialized = -1;
- public final boolean isInitialized() {
- byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
-
- if (!hasKind()) {
- memoizedIsInitialized = 0;
- return false;
- }
- if (!hasSeqno()) {
- memoizedIsInitialized = 0;
- return false;
- }
- if (!hasData()) {
- memoizedIsInitialized = 0;
- return false;
- }
- memoizedIsInitialized = 1;
- return true;
- }
-
- public void writeTo(com.google.protobuf.CodedOutputStream output)
- throws java.io.IOException {
- getSerializedSize();
- if (((bitField0_ & 0x00000001) == 0x00000001)) {
- output.writeEnum(1, kind_.getNumber());
- }
- if (((bitField0_ & 0x00000002) == 0x00000002)) {
- output.writeInt64(2, seqno_);
- }
- if (((bitField0_ & 0x00000004) == 0x00000004)) {
- output.writeBytes(3, data_);
- }
- getUnknownFields().writeTo(output);
- }
-
- private int memoizedSerializedSize = -1;
- public int getSerializedSize() {
- int size = memoizedSerializedSize;
- if (size != -1) return size;
-
- size = 0;
- if (((bitField0_ & 0x00000001) == 0x00000001)) {
- size += com.google.protobuf.CodedOutputStream
- .computeEnumSize(1, kind_.getNumber());
- }
- if (((bitField0_ & 0x00000002) == 0x00000002)) {
- size += com.google.protobuf.CodedOutputStream
- .computeInt64Size(2, seqno_);
- }
- if (((bitField0_ & 0x00000004) == 0x00000004)) {
- size += com.google.protobuf.CodedOutputStream
- .computeBytesSize(3, data_);
- }
- size += getUnknownFields().getSerializedSize();
- memoizedSerializedSize = size;
- return size;
- }
-
- private static final long serialVersionUID = 0L;
- @java.lang.Override
- protected java.lang.Object writeReplace()
- throws java.io.ObjectStreamException {
- return super.writeReplace();
- }
-
- public static org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data);
- }
- public static org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data, extensionRegistry);
- }
- public static org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data);
- }
- public static org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage parseFrom(
- byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data, extensionRegistry);
- }
- public static org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage parseFrom(java.io.InputStream input)
- throws java.io.IOException {
- return PARSER.parseFrom(input);
- }
- public static org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage parseFrom(
- java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return PARSER.parseFrom(input, extensionRegistry);
- }
- public static org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage parseDelimitedFrom(java.io.InputStream input)
- throws java.io.IOException {
- return PARSER.parseDelimitedFrom(input);
- }
- public static org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage parseDelimitedFrom(
- java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return PARSER.parseDelimitedFrom(input, extensionRegistry);
- }
- public static org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage parseFrom(
- com.google.protobuf.CodedInputStream input)
- throws java.io.IOException {
- return PARSER.parseFrom(input);
- }
- public static org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return PARSER.parseFrom(input, extensionRegistry);
- }
-
- public static Builder newBuilder() { return Builder.create(); }
- public Builder newBuilderForType() { return newBuilder(); }
- public static Builder newBuilder(org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage prototype) {
- return newBuilder().mergeFrom(prototype);
- }
- public Builder toBuilder() { return newBuilder(this); }
-
- @java.lang.Override
- protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
- Builder builder = new Builder(parent);
- return builder;
- }
- /**
- * Protobuf type {@code signalservice.SharedConfigMessage}
- */
- public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder
- implements org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessageOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
- getDescriptor() {
- return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_SharedConfigMessage_descriptor;
- }
-
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
- internalGetFieldAccessorTable() {
- return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_SharedConfigMessage_fieldAccessorTable
- .ensureFieldAccessorsInitialized(
- org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.class, org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.Builder.class);
- }
-
- // Construct using org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.newBuilder()
- private Builder() {
- maybeForceBuilderInitialization();
- }
-
- private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
- super(parent);
- maybeForceBuilderInitialization();
- }
- private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
- }
- }
- private static Builder create() {
- return new Builder();
- }
-
- public Builder clear() {
- super.clear();
- kind_ = org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.Kind.USER_PROFILE;
- bitField0_ = (bitField0_ & ~0x00000001);
- seqno_ = 0L;
- bitField0_ = (bitField0_ & ~0x00000002);
- data_ = com.google.protobuf.ByteString.EMPTY;
- bitField0_ = (bitField0_ & ~0x00000004);
- return this;
- }
-
- public Builder clone() {
- return create().mergeFrom(buildPartial());
- }
-
- public com.google.protobuf.Descriptors.Descriptor
- getDescriptorForType() {
- return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_SharedConfigMessage_descriptor;
- }
-
- public org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage getDefaultInstanceForType() {
- return org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.getDefaultInstance();
- }
-
- public org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage build() {
- org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage result = buildPartial();
- if (!result.isInitialized()) {
- throw newUninitializedMessageException(result);
- }
- return result;
- }
-
- public org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage buildPartial() {
- org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage result = new org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage(this);
- int from_bitField0_ = bitField0_;
- int to_bitField0_ = 0;
- if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
- to_bitField0_ |= 0x00000001;
- }
- result.kind_ = kind_;
- if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
- to_bitField0_ |= 0x00000002;
- }
- result.seqno_ = seqno_;
- if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
- to_bitField0_ |= 0x00000004;
- }
- result.data_ = data_;
- result.bitField0_ = to_bitField0_;
- onBuilt();
- return result;
- }
-
- public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage) {
- return mergeFrom((org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage)other);
- } else {
- super.mergeFrom(other);
- return this;
- }
- }
-
- public Builder mergeFrom(org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage other) {
- if (other == org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.getDefaultInstance()) return this;
- if (other.hasKind()) {
- setKind(other.getKind());
- }
- if (other.hasSeqno()) {
- setSeqno(other.getSeqno());
- }
- if (other.hasData()) {
- setData(other.getData());
- }
- this.mergeUnknownFields(other.getUnknownFields());
- return this;
- }
-
- public final boolean isInitialized() {
- if (!hasKind()) {
-
- return false;
- }
- if (!hasSeqno()) {
-
- return false;
- }
- if (!hasData()) {
-
- return false;
- }
- return true;
- }
-
- public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage parsedMessage = null;
- try {
- parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage) e.getUnfinishedMessage();
- throw e;
- } finally {
- if (parsedMessage != null) {
- mergeFrom(parsedMessage);
- }
- }
- return this;
- }
- private int bitField0_;
-
- // required .signalservice.SharedConfigMessage.Kind kind = 1;
- private org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.Kind kind_ = org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.Kind.USER_PROFILE;
- /**
- * required .signalservice.SharedConfigMessage.Kind kind = 1;
- *
- *
- * @required
- *
- */
- public boolean hasKind() {
- return ((bitField0_ & 0x00000001) == 0x00000001);
- }
- /**
- * required .signalservice.SharedConfigMessage.Kind kind = 1;
- *
- *
- * @required
- *
- */
- public org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.Kind getKind() {
- return kind_;
- }
- /**
- * required .signalservice.SharedConfigMessage.Kind kind = 1;
- *
- *
- * @required
- *
- */
- public Builder setKind(org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.Kind value) {
- if (value == null) {
- throw new NullPointerException();
- }
- bitField0_ |= 0x00000001;
- kind_ = value;
- onChanged();
- return this;
- }
- /**
- * required .signalservice.SharedConfigMessage.Kind kind = 1;
- *
- *
- * @required
- *
- */
- public Builder clearKind() {
- bitField0_ = (bitField0_ & ~0x00000001);
- kind_ = org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage.Kind.USER_PROFILE;
- onChanged();
- return this;
- }
-
- // required int64 seqno = 2;
- private long seqno_ ;
- /**
- * required int64 seqno = 2;
- *
- *
- * @required
- *
- */
- public boolean hasSeqno() {
- return ((bitField0_ & 0x00000002) == 0x00000002);
- }
- /**
- * required int64 seqno = 2;
- *
- *
- * @required
- *
- */
- public long getSeqno() {
- return seqno_;
- }
- /**
- * required int64 seqno = 2;
- *
- *
- * @required
- *
- */
- public Builder setSeqno(long value) {
- bitField0_ |= 0x00000002;
- seqno_ = value;
- onChanged();
- return this;
- }
- /**
- * required int64 seqno = 2;
- *
- *
- * @required
- *
- */
- public Builder clearSeqno() {
- bitField0_ = (bitField0_ & ~0x00000002);
- seqno_ = 0L;
- onChanged();
- return this;
- }
-
- // required bytes data = 3;
- private com.google.protobuf.ByteString data_ = com.google.protobuf.ByteString.EMPTY;
- /**
- * required bytes data = 3;
- *
- *
- * @required
- *
- */
- public boolean hasData() {
- return ((bitField0_ & 0x00000004) == 0x00000004);
- }
- /**
- * required bytes data = 3;
- *
- *
- * @required
- *
- */
- public com.google.protobuf.ByteString getData() {
- return data_;
- }
- /**
- * required bytes data = 3;
- *
- *
- * @required
- *
- */
- public Builder setData(com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- bitField0_ |= 0x00000004;
- data_ = value;
- onChanged();
- return this;
- }
- /**
- * required bytes data = 3;
- *
- *
- * @required
- *
- */
- public Builder clearData() {
- bitField0_ = (bitField0_ & ~0x00000004);
- data_ = getDefaultInstance().getData();
- onChanged();
- return this;
- }
-
- // @@protoc_insertion_point(builder_scope:signalservice.SharedConfigMessage)
- }
-
- static {
- defaultInstance = new SharedConfigMessage(true);
- defaultInstance.initFields();
- }
-
- // @@protoc_insertion_point(class_scope:signalservice.SharedConfigMessage)
- }
-
public interface ReceiptMessageOrBuilder
extends com.google.protobuf.MessageOrBuilder {
@@ -27436,11 +26415,6 @@ public final class SignalServiceProtos {
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_signalservice_MessageRequestResponse_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
- internal_static_signalservice_SharedConfigMessage_descriptor;
- private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
- internal_static_signalservice_SharedConfigMessage_fieldAccessorTable;
private static com.google.protobuf.Descriptors.Descriptor
internal_static_signalservice_ReceiptMessage_descriptor;
private static
@@ -27475,7 +26449,7 @@ public final class SignalServiceProtos {
"\002(\004\0223\n\006action\030\002 \002(\0162#.signalservice.Typi" +
"ngMessage.Action\"\"\n\006Action\022\013\n\007STARTED\020\000\022" +
"\013\n\007STOPPED\020\001\"2\n\rUnsendRequest\022\021\n\ttimesta",
- "mp\030\001 \002(\004\022\016\n\006author\030\002 \002(\t\"\356\005\n\007Content\022/\n\013" +
+ "mp\030\001 \002(\004\022\016\n\006author\030\002 \002(\t\"\255\005\n\007Content\022/\n\013" +
"dataMessage\030\001 \001(\0132\032.signalservice.DataMe" +
"ssage\022/\n\013callMessage\030\003 \001(\0132\032.signalservi" +
"ce.CallMessage\0225\n\016receiptMessage\030\005 \001(\0132\035" +
@@ -27487,109 +26461,101 @@ public final class SignalServiceProtos {
"e.DataExtractionNotification\0223\n\runsendRe",
"quest\030\t \001(\0132\034.signalservice.UnsendReques" +
"t\022E\n\026messageRequestResponse\030\n \001(\0132%.sign" +
- "alservice.MessageRequestResponse\022?\n\023shar" +
- "edConfigMessage\030\013 \001(\0132\".signalservice.Sh" +
- "aredConfigMessage\022=\n\016expirationType\030\014 \001(" +
- "\0162%.signalservice.Content.ExpirationType" +
- "\022\027\n\017expirationTimer\030\r \001(\r\022.\n&lastDisappe" +
- "aringMessageChangeTimestamp\030\016 \001(\004\">\n\016Exp" +
- "irationType\022\025\n\021DELETE_AFTER_READ\020\001\022\025\n\021DE" +
- "LETE_AFTER_SEND\020\002\"0\n\007KeyPair\022\021\n\tpublicKe",
- "y\030\001 \002(\014\022\022\n\nprivateKey\030\002 \002(\014\"\226\001\n\032DataExtr" +
- "actionNotification\022<\n\004type\030\001 \002(\0162..signa" +
- "lservice.DataExtractionNotification.Type" +
- "\022\021\n\ttimestamp\030\002 \001(\004\"\'\n\004Type\022\016\n\nSCREENSHO" +
- "T\020\001\022\017\n\013MEDIA_SAVED\020\002\"\361\r\n\013DataMessage\022\014\n\004" +
- "body\030\001 \001(\t\0225\n\013attachments\030\002 \003(\0132 .signal" +
- "service.AttachmentPointer\022*\n\005group\030\003 \001(\013" +
- "2\033.signalservice.GroupContext\022\r\n\005flags\030\004" +
- " \001(\r\022\023\n\013expireTimer\030\005 \001(\r\022\022\n\nprofileKey\030" +
- "\006 \001(\014\022\021\n\ttimestamp\030\007 \001(\004\022/\n\005quote\030\010 \001(\0132",
- " .signalservice.DataMessage.Quote\0223\n\007pre" +
- "view\030\n \003(\0132\".signalservice.DataMessage.P" +
- "review\0225\n\010reaction\030\013 \001(\0132#.signalservice" +
- ".DataMessage.Reaction\0227\n\007profile\030e \001(\0132&" +
- ".signalservice.DataMessage.LokiProfile\022K" +
- "\n\023openGroupInvitation\030f \001(\0132..signalserv" +
- "ice.DataMessage.OpenGroupInvitation\022W\n\031c" +
- "losedGroupControlMessage\030h \001(\01324.signals" +
- "ervice.DataMessage.ClosedGroupControlMes" +
- "sage\022\022\n\nsyncTarget\030i \001(\t\032\225\002\n\005Quote\022\n\n\002id",
- "\030\001 \002(\004\022\016\n\006author\030\002 \002(\t\022\014\n\004text\030\003 \001(\t\022F\n\013" +
- "attachments\030\004 \003(\01321.signalservice.DataMe" +
- "ssage.Quote.QuotedAttachment\032\231\001\n\020QuotedA" +
- "ttachment\022\023\n\013contentType\030\001 \001(\t\022\020\n\010fileNa" +
- "me\030\002 \001(\t\0223\n\tthumbnail\030\003 \001(\0132 .signalserv" +
- "ice.AttachmentPointer\022\r\n\005flags\030\004 \001(\r\"\032\n\005" +
- "Flags\022\021\n\rVOICE_MESSAGE\020\001\032V\n\007Preview\022\013\n\003u" +
- "rl\030\001 \002(\t\022\r\n\005title\030\002 \001(\t\022/\n\005image\030\003 \001(\0132 " +
- ".signalservice.AttachmentPointer\032:\n\013Loki" +
- "Profile\022\023\n\013displayName\030\001 \001(\t\022\026\n\016profileP",
- "icture\030\002 \001(\t\0320\n\023OpenGroupInvitation\022\013\n\003u" +
- "rl\030\001 \002(\t\022\014\n\004name\030\003 \002(\t\032\374\003\n\031ClosedGroupCo" +
- "ntrolMessage\022G\n\004type\030\001 \002(\01629.signalservi" +
- "ce.DataMessage.ClosedGroupControlMessage" +
- ".Type\022\021\n\tpublicKey\030\002 \001(\014\022\014\n\004name\030\003 \001(\t\0221" +
- "\n\021encryptionKeyPair\030\004 \001(\0132\026.signalservic" +
- "e.KeyPair\022\017\n\007members\030\005 \003(\014\022\016\n\006admins\030\006 \003" +
- "(\014\022U\n\010wrappers\030\007 \003(\0132C.signalservice.Dat" +
- "aMessage.ClosedGroupControlMessage.KeyPa" +
- "irWrapper\022\027\n\017expirationTimer\030\010 \001(\r\032=\n\016Ke",
- "yPairWrapper\022\021\n\tpublicKey\030\001 \002(\014\022\030\n\020encry" +
- "ptedKeyPair\030\002 \002(\014\"r\n\004Type\022\007\n\003NEW\020\001\022\027\n\023EN" +
- "CRYPTION_KEY_PAIR\020\003\022\017\n\013NAME_CHANGE\020\004\022\021\n\r" +
- "MEMBERS_ADDED\020\005\022\023\n\017MEMBERS_REMOVED\020\006\022\017\n\013" +
- "MEMBER_LEFT\020\007\032\222\001\n\010Reaction\022\n\n\002id\030\001 \002(\004\022\016" +
- "\n\006author\030\002 \002(\t\022\r\n\005emoji\030\003 \001(\t\022:\n\006action\030" +
- "\004 \002(\0162*.signalservice.DataMessage.Reacti" +
- "on.Action\"\037\n\006Action\022\t\n\005REACT\020\000\022\n\n\006REMOVE" +
- "\020\001\"$\n\005Flags\022\033\n\027EXPIRATION_TIMER_UPDATE\020\002" +
- "\"\352\001\n\013CallMessage\022-\n\004type\030\001 \002(\0162\037.signals",
- "ervice.CallMessage.Type\022\014\n\004sdps\030\002 \003(\t\022\027\n" +
- "\017sdpMLineIndexes\030\003 \003(\r\022\017\n\007sdpMids\030\004 \003(\t\022" +
- "\014\n\004uuid\030\005 \002(\t\"f\n\004Type\022\r\n\tPRE_OFFER\020\006\022\t\n\005" +
- "OFFER\020\001\022\n\n\006ANSWER\020\002\022\026\n\022PROVISIONAL_ANSWE" +
- "R\020\003\022\022\n\016ICE_CANDIDATES\020\004\022\014\n\010END_CALL\020\005\"\245\004" +
- "\n\024ConfigurationMessage\022E\n\014closedGroups\030\001" +
- " \003(\0132/.signalservice.ConfigurationMessag" +
- "e.ClosedGroup\022\022\n\nopenGroups\030\002 \003(\t\022\023\n\013dis" +
- "playName\030\003 \001(\t\022\026\n\016profilePicture\030\004 \001(\t\022\022" +
- "\n\nprofileKey\030\005 \001(\014\022=\n\010contacts\030\006 \003(\0132+.s",
- "ignalservice.ConfigurationMessage.Contac" +
- "t\032\233\001\n\013ClosedGroup\022\021\n\tpublicKey\030\001 \001(\014\022\014\n\004" +
- "name\030\002 \001(\t\0221\n\021encryptionKeyPair\030\003 \001(\0132\026." +
- "signalservice.KeyPair\022\017\n\007members\030\004 \003(\014\022\016" +
- "\n\006admins\030\005 \003(\014\022\027\n\017expirationTimer\030\006 \001(\r\032" +
- "\223\001\n\007Contact\022\021\n\tpublicKey\030\001 \002(\014\022\014\n\004name\030\002" +
- " \002(\t\022\026\n\016profilePicture\030\003 \001(\t\022\022\n\nprofileK" +
- "ey\030\004 \001(\014\022\022\n\nisApproved\030\005 \001(\010\022\021\n\tisBlocke" +
- "d\030\006 \001(\010\022\024\n\014didApproveMe\030\007 \001(\010\"y\n\026Message" +
- "RequestResponse\022\022\n\nisApproved\030\001 \002(\010\022\022\n\np",
- "rofileKey\030\002 \001(\014\0227\n\007profile\030\003 \001(\0132&.signa" +
- "lservice.DataMessage.LokiProfile\"\375\001\n\023Sha" +
- "redConfigMessage\0225\n\004kind\030\001 \002(\0162\'.signals" +
- "ervice.SharedConfigMessage.Kind\022\r\n\005seqno" +
- "\030\002 \002(\003\022\014\n\004data\030\003 \002(\014\"\221\001\n\004Kind\022\020\n\014USER_PR" +
- "OFILE\020\001\022\014\n\010CONTACTS\020\002\022\027\n\023CONVO_INFO_VOLA" +
- "TILE\020\003\022\n\n\006GROUPS\020\004\022\025\n\021CLOSED_GROUP_INFO\020" +
- "\005\022\030\n\024CLOSED_GROUP_MEMBERS\020\006\022\023\n\017ENCRYPTIO" +
- "N_KEYS\020\007\"u\n\016ReceiptMessage\0220\n\004type\030\001 \002(\016" +
- "2\".signalservice.ReceiptMessage.Type\022\021\n\t",
- "timestamp\030\002 \003(\004\"\036\n\004Type\022\014\n\010DELIVERY\020\000\022\010\n" +
- "\004READ\020\001\"\354\001\n\021AttachmentPointer\022\n\n\002id\030\001 \002(" +
- "\006\022\023\n\013contentType\030\002 \001(\t\022\013\n\003key\030\003 \001(\014\022\014\n\004s" +
- "ize\030\004 \001(\r\022\021\n\tthumbnail\030\005 \001(\014\022\016\n\006digest\030\006" +
- " \001(\014\022\020\n\010fileName\030\007 \001(\t\022\r\n\005flags\030\010 \001(\r\022\r\n" +
- "\005width\030\t \001(\r\022\016\n\006height\030\n \001(\r\022\017\n\007caption\030" +
- "\013 \001(\t\022\013\n\003url\030e \001(\t\"\032\n\005Flags\022\021\n\rVOICE_MES" +
- "SAGE\020\001\"\365\001\n\014GroupContext\022\n\n\002id\030\001 \001(\014\022.\n\004t" +
- "ype\030\002 \001(\0162 .signalservice.GroupContext.T" +
- "ype\022\014\n\004name\030\003 \001(\t\022\017\n\007members\030\004 \003(\t\0220\n\006av",
- "atar\030\005 \001(\0132 .signalservice.AttachmentPoi" +
- "nter\022\016\n\006admins\030\006 \003(\t\"H\n\004Type\022\013\n\007UNKNOWN\020" +
- "\000\022\n\n\006UPDATE\020\001\022\013\n\007DELIVER\020\002\022\010\n\004QUIT\020\003\022\020\n\014" +
- "REQUEST_INFO\020\004B3\n\034org.session.libsignal." +
- "protosB\023SignalServiceProtos"
+ "alservice.MessageRequestResponse\022=\n\016expi" +
+ "rationType\030\013 \001(\0162%.signalservice.Content" +
+ ".ExpirationType\022\027\n\017expirationTimer\030\014 \001(\r" +
+ "\022.\n&lastDisappearingMessageChangeTimesta" +
+ "mp\030\r \001(\004\">\n\016ExpirationType\022\025\n\021DELETE_AFT" +
+ "ER_READ\020\001\022\025\n\021DELETE_AFTER_SEND\020\002\"0\n\007KeyP" +
+ "air\022\021\n\tpublicKey\030\001 \002(\014\022\022\n\nprivateKey\030\002 \002" +
+ "(\014\"\226\001\n\032DataExtractionNotification\022<\n\004typ",
+ "e\030\001 \002(\0162..signalservice.DataExtractionNo" +
+ "tification.Type\022\021\n\ttimestamp\030\002 \001(\004\"\'\n\004Ty" +
+ "pe\022\016\n\nSCREENSHOT\020\001\022\017\n\013MEDIA_SAVED\020\002\"\361\r\n\013" +
+ "DataMessage\022\014\n\004body\030\001 \001(\t\0225\n\013attachments" +
+ "\030\002 \003(\0132 .signalservice.AttachmentPointer" +
+ "\022*\n\005group\030\003 \001(\0132\033.signalservice.GroupCon" +
+ "text\022\r\n\005flags\030\004 \001(\r\022\023\n\013expireTimer\030\005 \001(\r" +
+ "\022\022\n\nprofileKey\030\006 \001(\014\022\021\n\ttimestamp\030\007 \001(\004\022" +
+ "/\n\005quote\030\010 \001(\0132 .signalservice.DataMessa" +
+ "ge.Quote\0223\n\007preview\030\n \003(\0132\".signalservic",
+ "e.DataMessage.Preview\0225\n\010reaction\030\013 \001(\0132" +
+ "#.signalservice.DataMessage.Reaction\0227\n\007" +
+ "profile\030e \001(\0132&.signalservice.DataMessag" +
+ "e.LokiProfile\022K\n\023openGroupInvitation\030f \001" +
+ "(\0132..signalservice.DataMessage.OpenGroup" +
+ "Invitation\022W\n\031closedGroupControlMessage\030" +
+ "h \001(\01324.signalservice.DataMessage.Closed" +
+ "GroupControlMessage\022\022\n\nsyncTarget\030i \001(\t\032" +
+ "\225\002\n\005Quote\022\n\n\002id\030\001 \002(\004\022\016\n\006author\030\002 \002(\t\022\014\n" +
+ "\004text\030\003 \001(\t\022F\n\013attachments\030\004 \003(\01321.signa",
+ "lservice.DataMessage.Quote.QuotedAttachm" +
+ "ent\032\231\001\n\020QuotedAttachment\022\023\n\013contentType\030" +
+ "\001 \001(\t\022\020\n\010fileName\030\002 \001(\t\0223\n\tthumbnail\030\003 \001" +
+ "(\0132 .signalservice.AttachmentPointer\022\r\n\005" +
+ "flags\030\004 \001(\r\"\032\n\005Flags\022\021\n\rVOICE_MESSAGE\020\001\032" +
+ "V\n\007Preview\022\013\n\003url\030\001 \002(\t\022\r\n\005title\030\002 \001(\t\022/" +
+ "\n\005image\030\003 \001(\0132 .signalservice.Attachment" +
+ "Pointer\032:\n\013LokiProfile\022\023\n\013displayName\030\001 " +
+ "\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\374\003",
+ "\n\031ClosedGroupControlMessage\022G\n\004type\030\001 \002(" +
+ "\01629.signalservice.DataMessage.ClosedGrou" +
+ "pControlMessage.Type\022\021\n\tpublicKey\030\002 \001(\014\022" +
+ "\014\n\004name\030\003 \001(\t\0221\n\021encryptionKeyPair\030\004 \001(\013" +
+ "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" +
+ "gnalservice.DataMessage.ClosedGroupContr" +
+ "olMessage.KeyPairWrapper\022\027\n\017expirationTi" +
+ "mer\030\010 \001(\r\032=\n\016KeyPairWrapper\022\021\n\tpublicKey" +
+ "\030\001 \002(\014\022\030\n\020encryptedKeyPair\030\002 \002(\014\"r\n\004Type",
+ "\022\007\n\003NEW\020\001\022\027\n\023ENCRYPTION_KEY_PAIR\020\003\022\017\n\013NA" +
+ "ME_CHANGE\020\004\022\021\n\rMEMBERS_ADDED\020\005\022\023\n\017MEMBER" +
+ "S_REMOVED\020\006\022\017\n\013MEMBER_LEFT\020\007\032\222\001\n\010Reactio" +
+ "n\022\n\n\002id\030\001 \002(\004\022\016\n\006author\030\002 \002(\t\022\r\n\005emoji\030\003" +
+ " \001(\t\022:\n\006action\030\004 \002(\0162*.signalservice.Dat" +
+ "aMessage.Reaction.Action\"\037\n\006Action\022\t\n\005RE" +
+ "ACT\020\000\022\n\n\006REMOVE\020\001\"$\n\005Flags\022\033\n\027EXPIRATION" +
+ "_TIMER_UPDATE\020\002\"\352\001\n\013CallMessage\022-\n\004type\030" +
+ "\001 \002(\0162\037.signalservice.CallMessage.Type\022\014" +
+ "\n\004sdps\030\002 \003(\t\022\027\n\017sdpMLineIndexes\030\003 \003(\r\022\017\n",
+ "\007sdpMids\030\004 \003(\t\022\014\n\004uuid\030\005 \002(\t\"f\n\004Type\022\r\n\t" +
+ "PRE_OFFER\020\006\022\t\n\005OFFER\020\001\022\n\n\006ANSWER\020\002\022\026\n\022PR" +
+ "OVISIONAL_ANSWER\020\003\022\022\n\016ICE_CANDIDATES\020\004\022\014" +
+ "\n\010END_CALL\020\005\"\245\004\n\024ConfigurationMessage\022E\n" +
+ "\014closedGroups\030\001 \003(\0132/.signalservice.Conf" +
+ "igurationMessage.ClosedGroup\022\022\n\nopenGrou" +
+ "ps\030\002 \003(\t\022\023\n\013displayName\030\003 \001(\t\022\026\n\016profile" +
+ "Picture\030\004 \001(\t\022\022\n\nprofileKey\030\005 \001(\014\022=\n\010con" +
+ "tacts\030\006 \003(\0132+.signalservice.Configuratio" +
+ "nMessage.Contact\032\233\001\n\013ClosedGroup\022\021\n\tpubl",
+ "icKey\030\001 \001(\014\022\014\n\004name\030\002 \001(\t\0221\n\021encryptionK" +
+ "eyPair\030\003 \001(\0132\026.signalservice.KeyPair\022\017\n\007" +
+ "members\030\004 \003(\014\022\016\n\006admins\030\005 \003(\014\022\027\n\017expirat" +
+ "ionTimer\030\006 \001(\r\032\223\001\n\007Contact\022\021\n\tpublicKey\030" +
+ "\001 \002(\014\022\014\n\004name\030\002 \002(\t\022\026\n\016profilePicture\030\003 " +
+ "\001(\t\022\022\n\nprofileKey\030\004 \001(\014\022\022\n\nisApproved\030\005 " +
+ "\001(\010\022\021\n\tisBlocked\030\006 \001(\010\022\024\n\014didApproveMe\030\007" +
+ " \001(\010\"y\n\026MessageRequestResponse\022\022\n\nisAppr" +
+ "oved\030\001 \002(\010\022\022\n\nprofileKey\030\002 \001(\014\0227\n\007profil" +
+ "e\030\003 \001(\0132&.signalservice.DataMessage.Loki",
+ "Profile\"u\n\016ReceiptMessage\0220\n\004type\030\001 \002(\0162" +
+ "\".signalservice.ReceiptMessage.Type\022\021\n\tt" +
+ "imestamp\030\002 \003(\004\"\036\n\004Type\022\014\n\010DELIVERY\020\000\022\010\n\004" +
+ "READ\020\001\"\354\001\n\021AttachmentPointer\022\n\n\002id\030\001 \002(\006" +
+ "\022\023\n\013contentType\030\002 \001(\t\022\013\n\003key\030\003 \001(\014\022\014\n\004si" +
+ "ze\030\004 \001(\r\022\021\n\tthumbnail\030\005 \001(\014\022\016\n\006digest\030\006 " +
+ "\001(\014\022\020\n\010fileName\030\007 \001(\t\022\r\n\005flags\030\010 \001(\r\022\r\n\005" +
+ "width\030\t \001(\r\022\016\n\006height\030\n \001(\r\022\017\n\007caption\030\013" +
+ " \001(\t\022\013\n\003url\030e \001(\t\"\032\n\005Flags\022\021\n\rVOICE_MESS" +
+ "AGE\020\001\"\365\001\n\014GroupContext\022\n\n\002id\030\001 \001(\014\022.\n\004ty",
+ "pe\030\002 \001(\0162 .signalservice.GroupContext.Ty" +
+ "pe\022\014\n\004name\030\003 \001(\t\022\017\n\007members\030\004 \003(\t\0220\n\006ava" +
+ "tar\030\005 \001(\0132 .signalservice.AttachmentPoin" +
+ "ter\022\016\n\006admins\030\006 \003(\t\"H\n\004Type\022\013\n\007UNKNOWN\020\000" +
+ "\022\n\n\006UPDATE\020\001\022\013\n\007DELIVER\020\002\022\010\n\004QUIT\020\003\022\020\n\014R" +
+ "EQUEST_INFO\020\004B3\n\034org.session.libsignal.p" +
+ "rotosB\023SignalServiceProtos"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -27619,7 +26585,7 @@ public final class SignalServiceProtos {
internal_static_signalservice_Content_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_signalservice_Content_descriptor,
- new java.lang.String[] { "DataMessage", "CallMessage", "ReceiptMessage", "TypingMessage", "ConfigurationMessage", "DataExtractionNotification", "UnsendRequest", "MessageRequestResponse", "SharedConfigMessage", "ExpirationType", "ExpirationTimer", "LastDisappearingMessageChangeTimestamp", });
+ new java.lang.String[] { "DataMessage", "CallMessage", "ReceiptMessage", "TypingMessage", "ConfigurationMessage", "DataExtractionNotification", "UnsendRequest", "MessageRequestResponse", "ExpirationType", "ExpirationTimer", "LastDisappearingMessageChangeTimestamp", });
internal_static_signalservice_KeyPair_descriptor =
getDescriptor().getMessageTypes().get(4);
internal_static_signalservice_KeyPair_fieldAccessorTable = new
@@ -27716,26 +26682,20 @@ public final class SignalServiceProtos {
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_signalservice_MessageRequestResponse_descriptor,
new java.lang.String[] { "IsApproved", "ProfileKey", "Profile", });
- internal_static_signalservice_SharedConfigMessage_descriptor =
- getDescriptor().getMessageTypes().get(10);
- internal_static_signalservice_SharedConfigMessage_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_signalservice_SharedConfigMessage_descriptor,
- new java.lang.String[] { "Kind", "Seqno", "Data", });
internal_static_signalservice_ReceiptMessage_descriptor =
- getDescriptor().getMessageTypes().get(11);
+ getDescriptor().getMessageTypes().get(10);
internal_static_signalservice_ReceiptMessage_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_signalservice_ReceiptMessage_descriptor,
new java.lang.String[] { "Type", "Timestamp", });
internal_static_signalservice_AttachmentPointer_descriptor =
- getDescriptor().getMessageTypes().get(12);
+ getDescriptor().getMessageTypes().get(11);
internal_static_signalservice_AttachmentPointer_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_signalservice_AttachmentPointer_descriptor,
new java.lang.String[] { "Id", "ContentType", "Key", "Size", "Thumbnail", "Digest", "FileName", "Flags", "Width", "Height", "Caption", "Url", });
internal_static_signalservice_GroupContext_descriptor =
- getDescriptor().getMessageTypes().get(13);
+ getDescriptor().getMessageTypes().get(12);
internal_static_signalservice_GroupContext_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_signalservice_GroupContext_descriptor,