From 9399da6badf1e5467da529ed429d48535d5263ee Mon Sep 17 00:00:00 2001 From: Brice-W Date: Thu, 6 May 2021 14:49:28 +1000 Subject: [PATCH 01/12] handle the case when an added member is a zombie --- .../messaging/sending_receiving/ReceivedMessageHandler.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt index 2a0b13ae3e..8b0588364f 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt @@ -395,6 +395,11 @@ private fun MessageReceiver.handleClosedGroupMembersAdded(message: ClosedGroupCo val newMembers = members + updateMembers storage.updateMembers(groupID, newMembers.map { Address.fromSerialized(it) }) + // update zombie members in case the added members are zombies + val zombies = storage.getZombieMember(groupID) + if (zombies.intersect(updateMembers).isNotEmpty()) + storage.updateZombieMembers(groupID, zombies.minus(updateMembers).map { Address.fromSerialized(it) }) + // Notify the user if (userPublicKey == senderPublicKey) { // sender is a linked device From 5eaef76b02b3cf87f8324d87a6a762bea07c06ac Mon Sep 17 00:00:00 2001 From: Brice-W Date: Tue, 25 May 2021 15:45:43 +1000 Subject: [PATCH 02/12] don't update zombie members if current user is removed --- .../sending_receiving/ReceivedMessageHandler.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt index ff5dd6002c..73dab9759a 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt @@ -451,6 +451,7 @@ private fun MessageReceiver.handleClosedGroupMembersRemoved(message: ClosedGroup val members = group.members.map { it.serialize() } val admins = group.admins.map { it.toString() } val removedMembers = kind.members.map { it.toByteArray().toHexString() } + val zombies = storage.getZombieMember(groupID) // Check that the admin wasn't removed if (removedMembers.contains(admins.first())) { Log.d("Loki", "Ignoring invalid closed group update.") @@ -476,12 +477,12 @@ private fun MessageReceiver.handleClosedGroupMembersRemoved(message: ClosedGroup disableLocalGroupAndUnsubscribe(groupPublicKey, groupID, userPublicKey) } else { storage.updateMembers(groupID, newMembers.map { Address.fromSerialized(it) }) + // Update zombie members + storage.updateZombieMembers(groupID, zombies.minus(removedMembers).map { Address.fromSerialized(it) }) } - // Update zombie members - val zombies = storage.getZombieMember(groupID) - storage.updateZombieMembers(groupID, zombies.minus(removedMembers).map { Address.fromSerialized(it) }) - val type = if (senderLeft) SignalServiceGroup.Type.QUIT else SignalServiceGroup.Type.MEMBER_REMOVED + // Notify the user + val type = if (senderLeft) SignalServiceGroup.Type.QUIT else SignalServiceGroup.Type.MEMBER_REMOVED // We don't display zombie members in the notification as users have already been notified when those members left val notificationMembers = removedMembers.minus(zombies) if (notificationMembers.isNotEmpty()) { From 2c7730260dd5b5c54e3f428826d86cef722e3e86 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Thu, 3 Jun 2021 14:08:13 +1000 Subject: [PATCH 03/12] fix case where closed group was impossible to delete --- .../org/thoughtcrime/securesms/loki/activities/HomeActivity.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt index 9948aec40e..54cf2f8d7c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt @@ -317,9 +317,6 @@ class HomeActivity : PassphraseRequiredActionBarActivity(), ConversationClickLis } if (isClosedGroup) { MessageSender.explicitLeave(groupPublicKey!!, false) - } else { - Toast.makeText(context, R.string.activity_home_leaving_group_failed_message, Toast.LENGTH_LONG).show() - return@launch } } // Delete the conversation From 807e1042caf9439001e6381414227ca0af6e45cf Mon Sep 17 00:00:00 2001 From: Brice-W Date: Thu, 3 Jun 2021 14:43:23 +1000 Subject: [PATCH 04/12] make update messages not selectable --- .../securesms/conversation/ConversationFragment.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java index f8162aae0a..2e4dee6a38 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java @@ -1029,6 +1029,7 @@ public class ConversationFragment extends Fragment @Override public void onItemClick(MessageRecord messageRecord) { + if (messageRecord.isUpdate()) return; if (actionMode != null) { ((ConversationAdapter) list.getAdapter()).toggleSelection(messageRecord); list.getAdapter().notifyDataSetChanged(); @@ -1044,6 +1045,7 @@ public class ConversationFragment extends Fragment @Override public void onItemLongClick(MessageRecord messageRecord) { + if (messageRecord.isUpdate()) return; if (actionMode == null) { ((ConversationAdapter) list.getAdapter()).toggleSelection(messageRecord); list.getAdapter().notifyDataSetChanged(); From 6fb461f7d8e3add085c61bbeda3a193c1f966f15 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Fri, 4 Jun 2021 11:24:01 +1000 Subject: [PATCH 05/12] reset zombie members list if group already exists --- .../messaging/sending_receiving/ReceivedMessageHandler.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt index 18fa8c5b08..bc4cbe358b 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt @@ -268,6 +268,7 @@ private fun handleNewClosedGroup(sender: String, sentTimestamp: Long, groupPubli // Update the group storage.updateTitle(groupID, name) storage.updateMembers(groupID, members.map { Address.fromSerialized(it) }) + storage.setZombieMembers(groupID, listOf().map { Address.fromSerialized(it) }) } else { storage.createGroup(groupID, name, LinkedList(members.map { Address.fromSerialized(it) }), null, null, LinkedList(admins.map { Address.fromSerialized(it) }), formationTimestamp) From 1d0b61cf89617598843c5ce868543c64b35e82aa Mon Sep 17 00:00:00 2001 From: Brice-W Date: Fri, 4 Jun 2021 12:20:21 +1000 Subject: [PATCH 06/12] fix to avoid zombies to be cleared when new group update received --- .../org/thoughtcrime/securesms/database/GroupDatabase.java | 1 - .../messaging/sending_receiving/ReceivedMessageHandler.kt | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java index c3f25bf907..de34abb650 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java @@ -294,7 +294,6 @@ public class GroupDatabase extends Database implements LokiOpenGroupDatabaseProt ContentValues contents = new ContentValues(); contents.put(ZOMBIE_MEMBERS, Address.toSerializedList(members, ',')); - contents.put(ACTIVE, 1); databaseHelper.getWritableDatabase().update(TABLE_NAME, contents, GROUP_ID + " = ?", new String[] {groupId}); } diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt index bc4cbe358b..3c2c95f855 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt @@ -266,9 +266,11 @@ private fun handleNewClosedGroup(sender: String, sentTimestamp: Long, groupPubli val groupID = GroupUtil.doubleEncodeGroupID(groupPublicKey) if (storage.getGroup(groupID) != null) { // Update the group + // clearing zombie list if the group was not active before the update is received + if (!storage.isGroupActive(groupID)) + storage.setZombieMembers(groupID, listOf().map { Address.fromSerialized(it) }) storage.updateTitle(groupID, name) storage.updateMembers(groupID, members.map { Address.fromSerialized(it) }) - storage.setZombieMembers(groupID, listOf().map { Address.fromSerialized(it) }) } else { storage.createGroup(groupID, name, LinkedList(members.map { Address.fromSerialized(it) }), null, null, LinkedList(admins.map { Address.fromSerialized(it) }), formationTimestamp) From 3bf5a50439440b1a7346e6302786c9e809aa7f3f Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Fri, 4 Jun 2021 16:32:19 +1000 Subject: [PATCH 07/12] Fix readability issues & simplify code --- .../sending_receiving/ReceivedMessageHandler.kt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt index 3c2c95f855..54a4e1b954 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt @@ -266,9 +266,10 @@ private fun handleNewClosedGroup(sender: String, sentTimestamp: Long, groupPubli val groupID = GroupUtil.doubleEncodeGroupID(groupPublicKey) if (storage.getGroup(groupID) != null) { // Update the group - // clearing zombie list if the group was not active before the update is received - if (!storage.isGroupActive(groupID)) - storage.setZombieMembers(groupID, listOf().map { Address.fromSerialized(it) }) + // Clear zombie list if the group wasn't active + if (!storage.isGroupActive(groupID)) { + storage.setZombieMembers(groupID, listOf()) + } storage.updateTitle(groupID, name) storage.updateMembers(groupID, members.map { Address.fromSerialized(it) }) } else { @@ -394,10 +395,11 @@ private fun MessageReceiver.handleClosedGroupMembersAdded(message: ClosedGroupCo val newMembers = members + updateMembers storage.updateMembers(groupID, newMembers.map { Address.fromSerialized(it) }) - // update zombie members in case the added members are zombies + // Update zombie members in case the added members are zombies val zombies = storage.getZombieMembers(groupID) - if (zombies.intersect(updateMembers).isNotEmpty()) + if (zombies.intersect(updateMembers).isNotEmpty()) { storage.setZombieMembers(groupID, zombies.minus(updateMembers).map { Address.fromSerialized(it) }) + } // Notify the user if (userPublicKey == senderPublicKey) { From 14d401b27a780434e4b1a014a9925a0d7ffd6aeb Mon Sep 17 00:00:00 2001 From: Brice-W Date: Mon, 7 Jun 2021 14:46:54 +1000 Subject: [PATCH 08/12] fix --- .../messaging/sending_receiving/ReceivedMessageHandler.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt index 54a4e1b954..653492138e 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt @@ -267,7 +267,7 @@ private fun handleNewClosedGroup(sender: String, sentTimestamp: Long, groupPubli if (storage.getGroup(groupID) != null) { // Update the group // Clear zombie list if the group wasn't active - if (!storage.isGroupActive(groupID)) { + if (!storage.isGroupActive(groupPublicKey)) { storage.setZombieMembers(groupID, listOf()) } storage.updateTitle(groupID, name) From 411a0dee6f22babd38e1b2591778dc55286ca88d Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Tue, 8 Jun 2021 08:38:43 +1000 Subject: [PATCH 09/12] Update build number --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index bb6d82f8fe..b36544fb9d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -143,7 +143,7 @@ dependencies { testImplementation 'org.robolectric:shadows-multidex:4.2' } -def canonicalVersionCode = 181 +def canonicalVersionCode = 182 def canonicalVersionName = "1.10.13" def postFixSize = 10 From 534e0e8e6957336c014cc84eadb40dac8efc28c1 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Wed, 9 Jun 2021 11:03:18 +1000 Subject: [PATCH 10/12] proto updated --- libsignal/protobuf/SignalService.proto | 5 +- libsignal/protobuf/WebSocketResources.proto | 2 +- .../libsignal/protos/SignalServiceProtos.java | 2533 +++++++++-------- .../libsignal/protos/WebSocketProtos.java | 300 +- 4 files changed, 1461 insertions(+), 1379 deletions(-) diff --git a/libsignal/protobuf/SignalService.proto b/libsignal/protobuf/SignalService.proto index 624446adcd..7c44fce228 100644 --- a/libsignal/protobuf/SignalService.proto +++ b/libsignal/protobuf/SignalService.proto @@ -2,7 +2,7 @@ syntax = "proto2"; package signalservice; -option java_package = "org.session.libsignal.service.internal.push"; +option java_package = "org.session.libsignal.protos"; option java_outer_classname = "SignalServiceProtos"; message Envelope { @@ -112,7 +112,7 @@ message DataMessage { message ClosedGroupControlMessage { enum Type { - NEW = 1; // publicKey, name, encryptionKeyPair, members, admins + NEW = 1; // publicKey, name, encryptionKeyPair, members, admins, expireTimer ENCRYPTION_KEY_PAIR = 3; // publicKey, wrappers NAME_CHANGE = 4; // name MEMBERS_ADDED = 5; // members @@ -135,6 +135,7 @@ message DataMessage { repeated bytes members = 5; repeated bytes admins = 6; repeated KeyPairWrapper wrappers = 7; + optional uint32 expireTimer = 8; } optional string body = 1; diff --git a/libsignal/protobuf/WebSocketResources.proto b/libsignal/protobuf/WebSocketResources.proto index c6228fb3eb..8f82d9811e 100644 --- a/libsignal/protobuf/WebSocketResources.proto +++ b/libsignal/protobuf/WebSocketResources.proto @@ -8,7 +8,7 @@ syntax = "proto2"; package signalservice; -option java_package = "org.session.libsignal.service.internal.websocket"; +option java_package = "org.session.libsignal.protos"; option java_outer_classname = "WebSocketProtos"; message WebSocketRequestMessage { 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 5bd3d84d51..8f7921dcb2 100644 --- a/libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java +++ b/libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java @@ -27,7 +27,7 @@ public final class SignalServiceProtos { * @required * */ - SignalServiceProtos.Envelope.Type getType(); + org.session.libsignal.protos.SignalServiceProtos.Envelope.Type getType(); // optional string source = 2; /** @@ -145,7 +145,7 @@ public final class SignalServiceProtos { } case 8: { int rawValue = input.readEnum(); - SignalServiceProtos.Envelope.Type value = SignalServiceProtos.Envelope.Type.valueOf(rawValue); + org.session.libsignal.protos.SignalServiceProtos.Envelope.Type value = org.session.libsignal.protos.SignalServiceProtos.Envelope.Type.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); } else { @@ -193,14 +193,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_Envelope_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_Envelope_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_Envelope_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_Envelope_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.Envelope.class, SignalServiceProtos.Envelope.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.Envelope.class, org.session.libsignal.protos.SignalServiceProtos.Envelope.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -275,7 +275,7 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return SignalServiceProtos.Envelope.getDescriptor().getEnumTypes().get(0); + return org.session.libsignal.protos.SignalServiceProtos.Envelope.getDescriptor().getEnumTypes().get(0); } private static final Type[] VALUES = values(); @@ -303,7 +303,7 @@ public final class SignalServiceProtos { private int bitField0_; // required .signalservice.Envelope.Type type = 1; public static final int TYPE_FIELD_NUMBER = 1; - private SignalServiceProtos.Envelope.Type type_; + private org.session.libsignal.protos.SignalServiceProtos.Envelope.Type type_; /** * required .signalservice.Envelope.Type type = 1; * @@ -321,7 +321,7 @@ public final class SignalServiceProtos { * @required * */ - public SignalServiceProtos.Envelope.Type getType() { + public org.session.libsignal.protos.SignalServiceProtos.Envelope.Type getType() { return type_; } @@ -441,7 +441,7 @@ public final class SignalServiceProtos { } private void initFields() { - type_ = SignalServiceProtos.Envelope.Type.SESSION_MESSAGE; + type_ = org.session.libsignal.protos.SignalServiceProtos.Envelope.Type.SESSION_MESSAGE; source_ = ""; sourceDevice_ = 0; timestamp_ = 0L; @@ -531,53 +531,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static SignalServiceProtos.Envelope parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.Envelope parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.Envelope parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.Envelope parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.Envelope parseFrom(byte[] data) + public static org.session.libsignal.protos.SignalServiceProtos.Envelope parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.Envelope parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.Envelope parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.Envelope parseFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.Envelope parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.Envelope parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.Envelope parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static SignalServiceProtos.Envelope parseDelimitedFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.Envelope parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static SignalServiceProtos.Envelope parseDelimitedFrom( + public static org.session.libsignal.protos.SignalServiceProtos.Envelope parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static SignalServiceProtos.Envelope parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.Envelope parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.Envelope parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.Envelope parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -586,7 +586,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(SignalServiceProtos.Envelope prototype) { + public static Builder newBuilder(org.session.libsignal.protos.SignalServiceProtos.Envelope prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -602,17 +602,17 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements SignalServiceProtos.EnvelopeOrBuilder { + implements org.session.libsignal.protos.SignalServiceProtos.EnvelopeOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_Envelope_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_Envelope_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_Envelope_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_Envelope_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.Envelope.class, SignalServiceProtos.Envelope.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.Envelope.class, org.session.libsignal.protos.SignalServiceProtos.Envelope.Builder.class); } // Construct using org.session.libsignal.protos.SignalServiceProtos.Envelope.newBuilder() @@ -635,7 +635,7 @@ public final class SignalServiceProtos { public Builder clear() { super.clear(); - type_ = SignalServiceProtos.Envelope.Type.SESSION_MESSAGE; + type_ = org.session.libsignal.protos.SignalServiceProtos.Envelope.Type.SESSION_MESSAGE; bitField0_ = (bitField0_ & ~0x00000001); source_ = ""; bitField0_ = (bitField0_ & ~0x00000002); @@ -656,23 +656,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return SignalServiceProtos.internal_static_signalservice_Envelope_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_Envelope_descriptor; } - public SignalServiceProtos.Envelope getDefaultInstanceForType() { - return SignalServiceProtos.Envelope.getDefaultInstance(); + public org.session.libsignal.protos.SignalServiceProtos.Envelope getDefaultInstanceForType() { + return org.session.libsignal.protos.SignalServiceProtos.Envelope.getDefaultInstance(); } - public SignalServiceProtos.Envelope build() { - SignalServiceProtos.Envelope result = buildPartial(); + public org.session.libsignal.protos.SignalServiceProtos.Envelope build() { + org.session.libsignal.protos.SignalServiceProtos.Envelope result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public SignalServiceProtos.Envelope buildPartial() { - SignalServiceProtos.Envelope result = new SignalServiceProtos.Envelope(this); + public org.session.libsignal.protos.SignalServiceProtos.Envelope buildPartial() { + org.session.libsignal.protos.SignalServiceProtos.Envelope result = new org.session.libsignal.protos.SignalServiceProtos.Envelope(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -705,16 +705,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof SignalServiceProtos.Envelope) { - return mergeFrom((SignalServiceProtos.Envelope)other); + if (other instanceof org.session.libsignal.protos.SignalServiceProtos.Envelope) { + return mergeFrom((org.session.libsignal.protos.SignalServiceProtos.Envelope)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(SignalServiceProtos.Envelope other) { - if (other == SignalServiceProtos.Envelope.getDefaultInstance()) return this; + public Builder mergeFrom(org.session.libsignal.protos.SignalServiceProtos.Envelope other) { + if (other == org.session.libsignal.protos.SignalServiceProtos.Envelope.getDefaultInstance()) return this; if (other.hasType()) { setType(other.getType()); } @@ -755,11 +755,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - SignalServiceProtos.Envelope parsedMessage = null; + org.session.libsignal.protos.SignalServiceProtos.Envelope parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (SignalServiceProtos.Envelope) e.getUnfinishedMessage(); + parsedMessage = (org.session.libsignal.protos.SignalServiceProtos.Envelope) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -771,7 +771,7 @@ public final class SignalServiceProtos { private int bitField0_; // required .signalservice.Envelope.Type type = 1; - private SignalServiceProtos.Envelope.Type type_ = SignalServiceProtos.Envelope.Type.SESSION_MESSAGE; + private org.session.libsignal.protos.SignalServiceProtos.Envelope.Type type_ = org.session.libsignal.protos.SignalServiceProtos.Envelope.Type.SESSION_MESSAGE; /** * required .signalservice.Envelope.Type type = 1; * @@ -789,7 +789,7 @@ public final class SignalServiceProtos { * @required * */ - public SignalServiceProtos.Envelope.Type getType() { + public org.session.libsignal.protos.SignalServiceProtos.Envelope.Type getType() { return type_; } /** @@ -799,7 +799,7 @@ public final class SignalServiceProtos { * @required * */ - public Builder setType(SignalServiceProtos.Envelope.Type value) { + public Builder setType(org.session.libsignal.protos.SignalServiceProtos.Envelope.Type value) { if (value == null) { throw new NullPointerException(); } @@ -817,7 +817,7 @@ public final class SignalServiceProtos { */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); - type_ = SignalServiceProtos.Envelope.Type.SESSION_MESSAGE; + type_ = org.session.libsignal.protos.SignalServiceProtos.Envelope.Type.SESSION_MESSAGE; onChanged(); return this; } @@ -1095,7 +1095,7 @@ public final class SignalServiceProtos { * @required * */ - SignalServiceProtos.TypingMessage.Action getAction(); + org.session.libsignal.protos.SignalServiceProtos.TypingMessage.Action getAction(); } /** * Protobuf type {@code signalservice.TypingMessage} @@ -1155,7 +1155,7 @@ public final class SignalServiceProtos { } case 16: { int rawValue = input.readEnum(); - SignalServiceProtos.TypingMessage.Action value = SignalServiceProtos.TypingMessage.Action.valueOf(rawValue); + org.session.libsignal.protos.SignalServiceProtos.TypingMessage.Action value = org.session.libsignal.protos.SignalServiceProtos.TypingMessage.Action.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(2, rawValue); } else { @@ -1178,14 +1178,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_TypingMessage_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_TypingMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_TypingMessage_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_TypingMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.TypingMessage.class, SignalServiceProtos.TypingMessage.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.TypingMessage.class, org.session.libsignal.protos.SignalServiceProtos.TypingMessage.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1260,7 +1260,7 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return SignalServiceProtos.TypingMessage.getDescriptor().getEnumTypes().get(0); + return org.session.libsignal.protos.SignalServiceProtos.TypingMessage.getDescriptor().getEnumTypes().get(0); } private static final Action[] VALUES = values(); @@ -1312,7 +1312,7 @@ public final class SignalServiceProtos { // required .signalservice.TypingMessage.Action action = 2; public static final int ACTION_FIELD_NUMBER = 2; - private SignalServiceProtos.TypingMessage.Action action_; + private org.session.libsignal.protos.SignalServiceProtos.TypingMessage.Action action_; /** * required .signalservice.TypingMessage.Action action = 2; * @@ -1330,13 +1330,13 @@ public final class SignalServiceProtos { * @required * */ - public SignalServiceProtos.TypingMessage.Action getAction() { + public org.session.libsignal.protos.SignalServiceProtos.TypingMessage.Action getAction() { return action_; } private void initFields() { timestamp_ = 0L; - action_ = SignalServiceProtos.TypingMessage.Action.STARTED; + action_ = org.session.libsignal.protos.SignalServiceProtos.TypingMessage.Action.STARTED; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -1393,53 +1393,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static SignalServiceProtos.TypingMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.TypingMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.TypingMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.TypingMessage parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.TypingMessage parseFrom(byte[] data) + public static org.session.libsignal.protos.SignalServiceProtos.TypingMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.TypingMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.TypingMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.TypingMessage parseFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.TypingMessage parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.TypingMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.TypingMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static SignalServiceProtos.TypingMessage parseDelimitedFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.TypingMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static SignalServiceProtos.TypingMessage parseDelimitedFrom( + public static org.session.libsignal.protos.SignalServiceProtos.TypingMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static SignalServiceProtos.TypingMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.TypingMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.TypingMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.TypingMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1448,7 +1448,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(SignalServiceProtos.TypingMessage prototype) { + public static Builder newBuilder(org.session.libsignal.protos.SignalServiceProtos.TypingMessage prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1464,17 +1464,17 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements SignalServiceProtos.TypingMessageOrBuilder { + implements org.session.libsignal.protos.SignalServiceProtos.TypingMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_TypingMessage_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_TypingMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_TypingMessage_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_TypingMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.TypingMessage.class, SignalServiceProtos.TypingMessage.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.TypingMessage.class, org.session.libsignal.protos.SignalServiceProtos.TypingMessage.Builder.class); } // Construct using org.session.libsignal.protos.SignalServiceProtos.TypingMessage.newBuilder() @@ -1499,7 +1499,7 @@ public final class SignalServiceProtos { super.clear(); timestamp_ = 0L; bitField0_ = (bitField0_ & ~0x00000001); - action_ = SignalServiceProtos.TypingMessage.Action.STARTED; + action_ = org.session.libsignal.protos.SignalServiceProtos.TypingMessage.Action.STARTED; bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -1510,23 +1510,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return SignalServiceProtos.internal_static_signalservice_TypingMessage_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_TypingMessage_descriptor; } - public SignalServiceProtos.TypingMessage getDefaultInstanceForType() { - return SignalServiceProtos.TypingMessage.getDefaultInstance(); + public org.session.libsignal.protos.SignalServiceProtos.TypingMessage getDefaultInstanceForType() { + return org.session.libsignal.protos.SignalServiceProtos.TypingMessage.getDefaultInstance(); } - public SignalServiceProtos.TypingMessage build() { - SignalServiceProtos.TypingMessage result = buildPartial(); + public org.session.libsignal.protos.SignalServiceProtos.TypingMessage build() { + org.session.libsignal.protos.SignalServiceProtos.TypingMessage result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public SignalServiceProtos.TypingMessage buildPartial() { - SignalServiceProtos.TypingMessage result = new SignalServiceProtos.TypingMessage(this); + public org.session.libsignal.protos.SignalServiceProtos.TypingMessage buildPartial() { + org.session.libsignal.protos.SignalServiceProtos.TypingMessage result = new org.session.libsignal.protos.SignalServiceProtos.TypingMessage(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -1543,16 +1543,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof SignalServiceProtos.TypingMessage) { - return mergeFrom((SignalServiceProtos.TypingMessage)other); + if (other instanceof org.session.libsignal.protos.SignalServiceProtos.TypingMessage) { + return mergeFrom((org.session.libsignal.protos.SignalServiceProtos.TypingMessage)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(SignalServiceProtos.TypingMessage other) { - if (other == SignalServiceProtos.TypingMessage.getDefaultInstance()) return this; + public Builder mergeFrom(org.session.libsignal.protos.SignalServiceProtos.TypingMessage other) { + if (other == org.session.libsignal.protos.SignalServiceProtos.TypingMessage.getDefaultInstance()) return this; if (other.hasTimestamp()) { setTimestamp(other.getTimestamp()); } @@ -1579,11 +1579,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - SignalServiceProtos.TypingMessage parsedMessage = null; + org.session.libsignal.protos.SignalServiceProtos.TypingMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (SignalServiceProtos.TypingMessage) e.getUnfinishedMessage(); + parsedMessage = (org.session.libsignal.protos.SignalServiceProtos.TypingMessage) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1644,7 +1644,7 @@ public final class SignalServiceProtos { } // required .signalservice.TypingMessage.Action action = 2; - private SignalServiceProtos.TypingMessage.Action action_ = SignalServiceProtos.TypingMessage.Action.STARTED; + private org.session.libsignal.protos.SignalServiceProtos.TypingMessage.Action action_ = org.session.libsignal.protos.SignalServiceProtos.TypingMessage.Action.STARTED; /** * required .signalservice.TypingMessage.Action action = 2; * @@ -1662,7 +1662,7 @@ public final class SignalServiceProtos { * @required * */ - public SignalServiceProtos.TypingMessage.Action getAction() { + public org.session.libsignal.protos.SignalServiceProtos.TypingMessage.Action getAction() { return action_; } /** @@ -1672,7 +1672,7 @@ public final class SignalServiceProtos { * @required * */ - public Builder setAction(SignalServiceProtos.TypingMessage.Action value) { + public Builder setAction(org.session.libsignal.protos.SignalServiceProtos.TypingMessage.Action value) { if (value == null) { throw new NullPointerException(); } @@ -1690,7 +1690,7 @@ public final class SignalServiceProtos { */ public Builder clearAction() { bitField0_ = (bitField0_ & ~0x00000002); - action_ = SignalServiceProtos.TypingMessage.Action.STARTED; + action_ = org.session.libsignal.protos.SignalServiceProtos.TypingMessage.Action.STARTED; onChanged(); return this; } @@ -1717,11 +1717,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage dataMessage = 1; */ - SignalServiceProtos.DataMessage getDataMessage(); + org.session.libsignal.protos.SignalServiceProtos.DataMessage getDataMessage(); /** * optional .signalservice.DataMessage dataMessage = 1; */ - SignalServiceProtos.DataMessageOrBuilder getDataMessageOrBuilder(); + org.session.libsignal.protos.SignalServiceProtos.DataMessageOrBuilder getDataMessageOrBuilder(); // optional .signalservice.ReceiptMessage receiptMessage = 5; /** @@ -1731,11 +1731,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - SignalServiceProtos.ReceiptMessage getReceiptMessage(); + org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage getReceiptMessage(); /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - SignalServiceProtos.ReceiptMessageOrBuilder getReceiptMessageOrBuilder(); + org.session.libsignal.protos.SignalServiceProtos.ReceiptMessageOrBuilder getReceiptMessageOrBuilder(); // optional .signalservice.TypingMessage typingMessage = 6; /** @@ -1745,11 +1745,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.TypingMessage typingMessage = 6; */ - SignalServiceProtos.TypingMessage getTypingMessage(); + org.session.libsignal.protos.SignalServiceProtos.TypingMessage getTypingMessage(); /** * optional .signalservice.TypingMessage typingMessage = 6; */ - SignalServiceProtos.TypingMessageOrBuilder getTypingMessageOrBuilder(); + org.session.libsignal.protos.SignalServiceProtos.TypingMessageOrBuilder getTypingMessageOrBuilder(); // optional .signalservice.ConfigurationMessage configurationMessage = 7; /** @@ -1759,11 +1759,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - SignalServiceProtos.ConfigurationMessage getConfigurationMessage(); + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage getConfigurationMessage(); /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - SignalServiceProtos.ConfigurationMessageOrBuilder getConfigurationMessageOrBuilder(); + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessageOrBuilder getConfigurationMessageOrBuilder(); // optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; /** @@ -1773,11 +1773,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - SignalServiceProtos.DataExtractionNotification getDataExtractionNotification(); + org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification getDataExtractionNotification(); /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - SignalServiceProtos.DataExtractionNotificationOrBuilder getDataExtractionNotificationOrBuilder(); + org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotificationOrBuilder getDataExtractionNotificationOrBuilder(); } /** * Protobuf type {@code signalservice.Content} @@ -1831,11 +1831,11 @@ public final class SignalServiceProtos { break; } case 10: { - SignalServiceProtos.DataMessage.Builder subBuilder = null; + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { subBuilder = dataMessage_.toBuilder(); } - dataMessage_ = input.readMessage(SignalServiceProtos.DataMessage.PARSER, extensionRegistry); + dataMessage_ = input.readMessage(org.session.libsignal.protos.SignalServiceProtos.DataMessage.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(dataMessage_); dataMessage_ = subBuilder.buildPartial(); @@ -1844,11 +1844,11 @@ public final class SignalServiceProtos { break; } case 42: { - SignalServiceProtos.ReceiptMessage.Builder subBuilder = null; + org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = receiptMessage_.toBuilder(); } - receiptMessage_ = input.readMessage(SignalServiceProtos.ReceiptMessage.PARSER, extensionRegistry); + receiptMessage_ = input.readMessage(org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(receiptMessage_); receiptMessage_ = subBuilder.buildPartial(); @@ -1857,11 +1857,11 @@ public final class SignalServiceProtos { break; } case 50: { - SignalServiceProtos.TypingMessage.Builder subBuilder = null; + org.session.libsignal.protos.SignalServiceProtos.TypingMessage.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = typingMessage_.toBuilder(); } - typingMessage_ = input.readMessage(SignalServiceProtos.TypingMessage.PARSER, extensionRegistry); + typingMessage_ = input.readMessage(org.session.libsignal.protos.SignalServiceProtos.TypingMessage.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(typingMessage_); typingMessage_ = subBuilder.buildPartial(); @@ -1870,11 +1870,11 @@ public final class SignalServiceProtos { break; } case 58: { - SignalServiceProtos.ConfigurationMessage.Builder subBuilder = null; + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Builder subBuilder = null; if (((bitField0_ & 0x00000008) == 0x00000008)) { subBuilder = configurationMessage_.toBuilder(); } - configurationMessage_ = input.readMessage(SignalServiceProtos.ConfigurationMessage.PARSER, extensionRegistry); + configurationMessage_ = input.readMessage(org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(configurationMessage_); configurationMessage_ = subBuilder.buildPartial(); @@ -1883,11 +1883,11 @@ public final class SignalServiceProtos { break; } case 66: { - SignalServiceProtos.DataExtractionNotification.Builder subBuilder = null; + org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.Builder subBuilder = null; if (((bitField0_ & 0x00000010) == 0x00000010)) { subBuilder = dataExtractionNotification_.toBuilder(); } - dataExtractionNotification_ = input.readMessage(SignalServiceProtos.DataExtractionNotification.PARSER, extensionRegistry); + dataExtractionNotification_ = input.readMessage(org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(dataExtractionNotification_); dataExtractionNotification_ = subBuilder.buildPartial(); @@ -1909,14 +1909,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_Content_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_Content_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_Content_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_Content_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.Content.class, SignalServiceProtos.Content.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.Content.class, org.session.libsignal.protos.SignalServiceProtos.Content.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1937,7 +1937,7 @@ public final class SignalServiceProtos { private int bitField0_; // optional .signalservice.DataMessage dataMessage = 1; public static final int DATAMESSAGE_FIELD_NUMBER = 1; - private SignalServiceProtos.DataMessage dataMessage_; + private org.session.libsignal.protos.SignalServiceProtos.DataMessage dataMessage_; /** * optional .signalservice.DataMessage dataMessage = 1; */ @@ -1947,19 +1947,19 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage dataMessage = 1; */ - public SignalServiceProtos.DataMessage getDataMessage() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage getDataMessage() { return dataMessage_; } /** * optional .signalservice.DataMessage dataMessage = 1; */ - public SignalServiceProtos.DataMessageOrBuilder getDataMessageOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessageOrBuilder getDataMessageOrBuilder() { return dataMessage_; } // optional .signalservice.ReceiptMessage receiptMessage = 5; public static final int RECEIPTMESSAGE_FIELD_NUMBER = 5; - private SignalServiceProtos.ReceiptMessage receiptMessage_; + private org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage receiptMessage_; /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ @@ -1969,19 +1969,19 @@ public final class SignalServiceProtos { /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - public SignalServiceProtos.ReceiptMessage getReceiptMessage() { + public org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage getReceiptMessage() { return receiptMessage_; } /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - public SignalServiceProtos.ReceiptMessageOrBuilder getReceiptMessageOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.ReceiptMessageOrBuilder getReceiptMessageOrBuilder() { return receiptMessage_; } // optional .signalservice.TypingMessage typingMessage = 6; public static final int TYPINGMESSAGE_FIELD_NUMBER = 6; - private SignalServiceProtos.TypingMessage typingMessage_; + private org.session.libsignal.protos.SignalServiceProtos.TypingMessage typingMessage_; /** * optional .signalservice.TypingMessage typingMessage = 6; */ @@ -1991,19 +1991,19 @@ public final class SignalServiceProtos { /** * optional .signalservice.TypingMessage typingMessage = 6; */ - public SignalServiceProtos.TypingMessage getTypingMessage() { + public org.session.libsignal.protos.SignalServiceProtos.TypingMessage getTypingMessage() { return typingMessage_; } /** * optional .signalservice.TypingMessage typingMessage = 6; */ - public SignalServiceProtos.TypingMessageOrBuilder getTypingMessageOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.TypingMessageOrBuilder getTypingMessageOrBuilder() { return typingMessage_; } // optional .signalservice.ConfigurationMessage configurationMessage = 7; public static final int CONFIGURATIONMESSAGE_FIELD_NUMBER = 7; - private SignalServiceProtos.ConfigurationMessage configurationMessage_; + private org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage configurationMessage_; /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ @@ -2013,19 +2013,19 @@ public final class SignalServiceProtos { /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - public SignalServiceProtos.ConfigurationMessage getConfigurationMessage() { + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage getConfigurationMessage() { return configurationMessage_; } /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - public SignalServiceProtos.ConfigurationMessageOrBuilder getConfigurationMessageOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessageOrBuilder getConfigurationMessageOrBuilder() { return configurationMessage_; } // optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; public static final int DATAEXTRACTIONNOTIFICATION_FIELD_NUMBER = 8; - private SignalServiceProtos.DataExtractionNotification dataExtractionNotification_; + private org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification dataExtractionNotification_; /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ @@ -2035,22 +2035,22 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - public SignalServiceProtos.DataExtractionNotification getDataExtractionNotification() { + public org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification getDataExtractionNotification() { return dataExtractionNotification_; } /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - public SignalServiceProtos.DataExtractionNotificationOrBuilder getDataExtractionNotificationOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotificationOrBuilder getDataExtractionNotificationOrBuilder() { return dataExtractionNotification_; } private void initFields() { - dataMessage_ = SignalServiceProtos.DataMessage.getDefaultInstance(); - receiptMessage_ = SignalServiceProtos.ReceiptMessage.getDefaultInstance(); - typingMessage_ = SignalServiceProtos.TypingMessage.getDefaultInstance(); - configurationMessage_ = SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); - dataExtractionNotification_ = SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); + dataMessage_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.getDefaultInstance(); + receiptMessage_ = org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.getDefaultInstance(); + typingMessage_ = org.session.libsignal.protos.SignalServiceProtos.TypingMessage.getDefaultInstance(); + configurationMessage_ = org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); + dataExtractionNotification_ = org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -2150,53 +2150,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static SignalServiceProtos.Content parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.Content parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.Content parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.Content parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.Content parseFrom(byte[] data) + public static org.session.libsignal.protos.SignalServiceProtos.Content parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.Content parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.Content parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.Content parseFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.Content parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.Content parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.Content parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static SignalServiceProtos.Content parseDelimitedFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.Content parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static SignalServiceProtos.Content parseDelimitedFrom( + public static org.session.libsignal.protos.SignalServiceProtos.Content parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static SignalServiceProtos.Content parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.Content parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.Content parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.Content parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2205,7 +2205,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(SignalServiceProtos.Content prototype) { + public static Builder newBuilder(org.session.libsignal.protos.SignalServiceProtos.Content prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -2221,17 +2221,17 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements SignalServiceProtos.ContentOrBuilder { + implements org.session.libsignal.protos.SignalServiceProtos.ContentOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_Content_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_Content_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_Content_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_Content_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.Content.class, SignalServiceProtos.Content.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.Content.class, org.session.libsignal.protos.SignalServiceProtos.Content.Builder.class); } // Construct using org.session.libsignal.protos.SignalServiceProtos.Content.newBuilder() @@ -2260,31 +2260,31 @@ public final class SignalServiceProtos { public Builder clear() { super.clear(); if (dataMessageBuilder_ == null) { - dataMessage_ = SignalServiceProtos.DataMessage.getDefaultInstance(); + dataMessage_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.getDefaultInstance(); } else { dataMessageBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000001); if (receiptMessageBuilder_ == null) { - receiptMessage_ = SignalServiceProtos.ReceiptMessage.getDefaultInstance(); + receiptMessage_ = org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.getDefaultInstance(); } else { receiptMessageBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000002); if (typingMessageBuilder_ == null) { - typingMessage_ = SignalServiceProtos.TypingMessage.getDefaultInstance(); + typingMessage_ = org.session.libsignal.protos.SignalServiceProtos.TypingMessage.getDefaultInstance(); } else { typingMessageBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000004); if (configurationMessageBuilder_ == null) { - configurationMessage_ = SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); + configurationMessage_ = org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); } else { configurationMessageBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000008); if (dataExtractionNotificationBuilder_ == null) { - dataExtractionNotification_ = SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); + dataExtractionNotification_ = org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); } else { dataExtractionNotificationBuilder_.clear(); } @@ -2298,23 +2298,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return SignalServiceProtos.internal_static_signalservice_Content_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_Content_descriptor; } - public SignalServiceProtos.Content getDefaultInstanceForType() { - return SignalServiceProtos.Content.getDefaultInstance(); + public org.session.libsignal.protos.SignalServiceProtos.Content getDefaultInstanceForType() { + return org.session.libsignal.protos.SignalServiceProtos.Content.getDefaultInstance(); } - public SignalServiceProtos.Content build() { - SignalServiceProtos.Content result = buildPartial(); + public org.session.libsignal.protos.SignalServiceProtos.Content build() { + org.session.libsignal.protos.SignalServiceProtos.Content result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public SignalServiceProtos.Content buildPartial() { - SignalServiceProtos.Content result = new SignalServiceProtos.Content(this); + public org.session.libsignal.protos.SignalServiceProtos.Content buildPartial() { + org.session.libsignal.protos.SignalServiceProtos.Content result = new org.session.libsignal.protos.SignalServiceProtos.Content(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -2363,16 +2363,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof SignalServiceProtos.Content) { - return mergeFrom((SignalServiceProtos.Content)other); + if (other instanceof org.session.libsignal.protos.SignalServiceProtos.Content) { + return mergeFrom((org.session.libsignal.protos.SignalServiceProtos.Content)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(SignalServiceProtos.Content other) { - if (other == SignalServiceProtos.Content.getDefaultInstance()) return this; + public Builder mergeFrom(org.session.libsignal.protos.SignalServiceProtos.Content other) { + if (other == org.session.libsignal.protos.SignalServiceProtos.Content.getDefaultInstance()) return this; if (other.hasDataMessage()) { mergeDataMessage(other.getDataMessage()); } @@ -2430,11 +2430,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - SignalServiceProtos.Content parsedMessage = null; + org.session.libsignal.protos.SignalServiceProtos.Content parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (SignalServiceProtos.Content) e.getUnfinishedMessage(); + parsedMessage = (org.session.libsignal.protos.SignalServiceProtos.Content) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -2446,9 +2446,9 @@ public final class SignalServiceProtos { private int bitField0_; // optional .signalservice.DataMessage dataMessage = 1; - private SignalServiceProtos.DataMessage dataMessage_ = SignalServiceProtos.DataMessage.getDefaultInstance(); + private org.session.libsignal.protos.SignalServiceProtos.DataMessage dataMessage_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.DataMessage, SignalServiceProtos.DataMessage.Builder, SignalServiceProtos.DataMessageOrBuilder> dataMessageBuilder_; + org.session.libsignal.protos.SignalServiceProtos.DataMessage, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Builder, org.session.libsignal.protos.SignalServiceProtos.DataMessageOrBuilder> dataMessageBuilder_; /** * optional .signalservice.DataMessage dataMessage = 1; */ @@ -2458,7 +2458,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage dataMessage = 1; */ - public SignalServiceProtos.DataMessage getDataMessage() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage getDataMessage() { if (dataMessageBuilder_ == null) { return dataMessage_; } else { @@ -2468,7 +2468,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage dataMessage = 1; */ - public Builder setDataMessage(SignalServiceProtos.DataMessage value) { + public Builder setDataMessage(org.session.libsignal.protos.SignalServiceProtos.DataMessage value) { if (dataMessageBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2485,7 +2485,7 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage dataMessage = 1; */ public Builder setDataMessage( - SignalServiceProtos.DataMessage.Builder builderForValue) { + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Builder builderForValue) { if (dataMessageBuilder_ == null) { dataMessage_ = builderForValue.build(); onChanged(); @@ -2498,12 +2498,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage dataMessage = 1; */ - public Builder mergeDataMessage(SignalServiceProtos.DataMessage value) { + public Builder mergeDataMessage(org.session.libsignal.protos.SignalServiceProtos.DataMessage value) { if (dataMessageBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001) && - dataMessage_ != SignalServiceProtos.DataMessage.getDefaultInstance()) { + dataMessage_ != org.session.libsignal.protos.SignalServiceProtos.DataMessage.getDefaultInstance()) { dataMessage_ = - SignalServiceProtos.DataMessage.newBuilder(dataMessage_).mergeFrom(value).buildPartial(); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.newBuilder(dataMessage_).mergeFrom(value).buildPartial(); } else { dataMessage_ = value; } @@ -2519,7 +2519,7 @@ public final class SignalServiceProtos { */ public Builder clearDataMessage() { if (dataMessageBuilder_ == null) { - dataMessage_ = SignalServiceProtos.DataMessage.getDefaultInstance(); + dataMessage_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.getDefaultInstance(); onChanged(); } else { dataMessageBuilder_.clear(); @@ -2530,7 +2530,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage dataMessage = 1; */ - public SignalServiceProtos.DataMessage.Builder getDataMessageBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Builder getDataMessageBuilder() { bitField0_ |= 0x00000001; onChanged(); return getDataMessageFieldBuilder().getBuilder(); @@ -2538,7 +2538,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage dataMessage = 1; */ - public SignalServiceProtos.DataMessageOrBuilder getDataMessageOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessageOrBuilder getDataMessageOrBuilder() { if (dataMessageBuilder_ != null) { return dataMessageBuilder_.getMessageOrBuilder(); } else { @@ -2549,11 +2549,11 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage dataMessage = 1; */ private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.DataMessage, SignalServiceProtos.DataMessage.Builder, SignalServiceProtos.DataMessageOrBuilder> + org.session.libsignal.protos.SignalServiceProtos.DataMessage, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Builder, org.session.libsignal.protos.SignalServiceProtos.DataMessageOrBuilder> getDataMessageFieldBuilder() { if (dataMessageBuilder_ == null) { dataMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.DataMessage, SignalServiceProtos.DataMessage.Builder, SignalServiceProtos.DataMessageOrBuilder>( + org.session.libsignal.protos.SignalServiceProtos.DataMessage, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Builder, org.session.libsignal.protos.SignalServiceProtos.DataMessageOrBuilder>( dataMessage_, getParentForChildren(), isClean()); @@ -2563,9 +2563,9 @@ public final class SignalServiceProtos { } // optional .signalservice.ReceiptMessage receiptMessage = 5; - private SignalServiceProtos.ReceiptMessage receiptMessage_ = SignalServiceProtos.ReceiptMessage.getDefaultInstance(); + private org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage receiptMessage_ = org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.ReceiptMessage, SignalServiceProtos.ReceiptMessage.Builder, SignalServiceProtos.ReceiptMessageOrBuilder> receiptMessageBuilder_; + org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage, org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.Builder, org.session.libsignal.protos.SignalServiceProtos.ReceiptMessageOrBuilder> receiptMessageBuilder_; /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ @@ -2575,7 +2575,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - public SignalServiceProtos.ReceiptMessage getReceiptMessage() { + public org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage getReceiptMessage() { if (receiptMessageBuilder_ == null) { return receiptMessage_; } else { @@ -2585,7 +2585,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - public Builder setReceiptMessage(SignalServiceProtos.ReceiptMessage value) { + public Builder setReceiptMessage(org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage value) { if (receiptMessageBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2602,7 +2602,7 @@ public final class SignalServiceProtos { * optional .signalservice.ReceiptMessage receiptMessage = 5; */ public Builder setReceiptMessage( - SignalServiceProtos.ReceiptMessage.Builder builderForValue) { + org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.Builder builderForValue) { if (receiptMessageBuilder_ == null) { receiptMessage_ = builderForValue.build(); onChanged(); @@ -2615,12 +2615,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - public Builder mergeReceiptMessage(SignalServiceProtos.ReceiptMessage value) { + public Builder mergeReceiptMessage(org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage value) { if (receiptMessageBuilder_ == null) { if (((bitField0_ & 0x00000002) == 0x00000002) && - receiptMessage_ != SignalServiceProtos.ReceiptMessage.getDefaultInstance()) { + receiptMessage_ != org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.getDefaultInstance()) { receiptMessage_ = - SignalServiceProtos.ReceiptMessage.newBuilder(receiptMessage_).mergeFrom(value).buildPartial(); + org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.newBuilder(receiptMessage_).mergeFrom(value).buildPartial(); } else { receiptMessage_ = value; } @@ -2636,7 +2636,7 @@ public final class SignalServiceProtos { */ public Builder clearReceiptMessage() { if (receiptMessageBuilder_ == null) { - receiptMessage_ = SignalServiceProtos.ReceiptMessage.getDefaultInstance(); + receiptMessage_ = org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.getDefaultInstance(); onChanged(); } else { receiptMessageBuilder_.clear(); @@ -2647,7 +2647,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - public SignalServiceProtos.ReceiptMessage.Builder getReceiptMessageBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.Builder getReceiptMessageBuilder() { bitField0_ |= 0x00000002; onChanged(); return getReceiptMessageFieldBuilder().getBuilder(); @@ -2655,7 +2655,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - public SignalServiceProtos.ReceiptMessageOrBuilder getReceiptMessageOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.ReceiptMessageOrBuilder getReceiptMessageOrBuilder() { if (receiptMessageBuilder_ != null) { return receiptMessageBuilder_.getMessageOrBuilder(); } else { @@ -2666,11 +2666,11 @@ public final class SignalServiceProtos { * optional .signalservice.ReceiptMessage receiptMessage = 5; */ private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.ReceiptMessage, SignalServiceProtos.ReceiptMessage.Builder, SignalServiceProtos.ReceiptMessageOrBuilder> + org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage, org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.Builder, org.session.libsignal.protos.SignalServiceProtos.ReceiptMessageOrBuilder> getReceiptMessageFieldBuilder() { if (receiptMessageBuilder_ == null) { receiptMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.ReceiptMessage, SignalServiceProtos.ReceiptMessage.Builder, SignalServiceProtos.ReceiptMessageOrBuilder>( + org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage, org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.Builder, org.session.libsignal.protos.SignalServiceProtos.ReceiptMessageOrBuilder>( receiptMessage_, getParentForChildren(), isClean()); @@ -2680,9 +2680,9 @@ public final class SignalServiceProtos { } // optional .signalservice.TypingMessage typingMessage = 6; - private SignalServiceProtos.TypingMessage typingMessage_ = SignalServiceProtos.TypingMessage.getDefaultInstance(); + private org.session.libsignal.protos.SignalServiceProtos.TypingMessage typingMessage_ = org.session.libsignal.protos.SignalServiceProtos.TypingMessage.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.TypingMessage, SignalServiceProtos.TypingMessage.Builder, SignalServiceProtos.TypingMessageOrBuilder> typingMessageBuilder_; + org.session.libsignal.protos.SignalServiceProtos.TypingMessage, org.session.libsignal.protos.SignalServiceProtos.TypingMessage.Builder, org.session.libsignal.protos.SignalServiceProtos.TypingMessageOrBuilder> typingMessageBuilder_; /** * optional .signalservice.TypingMessage typingMessage = 6; */ @@ -2692,7 +2692,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.TypingMessage typingMessage = 6; */ - public SignalServiceProtos.TypingMessage getTypingMessage() { + public org.session.libsignal.protos.SignalServiceProtos.TypingMessage getTypingMessage() { if (typingMessageBuilder_ == null) { return typingMessage_; } else { @@ -2702,7 +2702,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.TypingMessage typingMessage = 6; */ - public Builder setTypingMessage(SignalServiceProtos.TypingMessage value) { + public Builder setTypingMessage(org.session.libsignal.protos.SignalServiceProtos.TypingMessage value) { if (typingMessageBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2719,7 +2719,7 @@ public final class SignalServiceProtos { * optional .signalservice.TypingMessage typingMessage = 6; */ public Builder setTypingMessage( - SignalServiceProtos.TypingMessage.Builder builderForValue) { + org.session.libsignal.protos.SignalServiceProtos.TypingMessage.Builder builderForValue) { if (typingMessageBuilder_ == null) { typingMessage_ = builderForValue.build(); onChanged(); @@ -2732,12 +2732,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.TypingMessage typingMessage = 6; */ - public Builder mergeTypingMessage(SignalServiceProtos.TypingMessage value) { + public Builder mergeTypingMessage(org.session.libsignal.protos.SignalServiceProtos.TypingMessage value) { if (typingMessageBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - typingMessage_ != SignalServiceProtos.TypingMessage.getDefaultInstance()) { + typingMessage_ != org.session.libsignal.protos.SignalServiceProtos.TypingMessage.getDefaultInstance()) { typingMessage_ = - SignalServiceProtos.TypingMessage.newBuilder(typingMessage_).mergeFrom(value).buildPartial(); + org.session.libsignal.protos.SignalServiceProtos.TypingMessage.newBuilder(typingMessage_).mergeFrom(value).buildPartial(); } else { typingMessage_ = value; } @@ -2753,7 +2753,7 @@ public final class SignalServiceProtos { */ public Builder clearTypingMessage() { if (typingMessageBuilder_ == null) { - typingMessage_ = SignalServiceProtos.TypingMessage.getDefaultInstance(); + typingMessage_ = org.session.libsignal.protos.SignalServiceProtos.TypingMessage.getDefaultInstance(); onChanged(); } else { typingMessageBuilder_.clear(); @@ -2764,7 +2764,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.TypingMessage typingMessage = 6; */ - public SignalServiceProtos.TypingMessage.Builder getTypingMessageBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.TypingMessage.Builder getTypingMessageBuilder() { bitField0_ |= 0x00000004; onChanged(); return getTypingMessageFieldBuilder().getBuilder(); @@ -2772,7 +2772,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.TypingMessage typingMessage = 6; */ - public SignalServiceProtos.TypingMessageOrBuilder getTypingMessageOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.TypingMessageOrBuilder getTypingMessageOrBuilder() { if (typingMessageBuilder_ != null) { return typingMessageBuilder_.getMessageOrBuilder(); } else { @@ -2783,11 +2783,11 @@ public final class SignalServiceProtos { * optional .signalservice.TypingMessage typingMessage = 6; */ private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.TypingMessage, SignalServiceProtos.TypingMessage.Builder, SignalServiceProtos.TypingMessageOrBuilder> + org.session.libsignal.protos.SignalServiceProtos.TypingMessage, org.session.libsignal.protos.SignalServiceProtos.TypingMessage.Builder, org.session.libsignal.protos.SignalServiceProtos.TypingMessageOrBuilder> getTypingMessageFieldBuilder() { if (typingMessageBuilder_ == null) { typingMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.TypingMessage, SignalServiceProtos.TypingMessage.Builder, SignalServiceProtos.TypingMessageOrBuilder>( + org.session.libsignal.protos.SignalServiceProtos.TypingMessage, org.session.libsignal.protos.SignalServiceProtos.TypingMessage.Builder, org.session.libsignal.protos.SignalServiceProtos.TypingMessageOrBuilder>( typingMessage_, getParentForChildren(), isClean()); @@ -2797,9 +2797,9 @@ public final class SignalServiceProtos { } // optional .signalservice.ConfigurationMessage configurationMessage = 7; - private SignalServiceProtos.ConfigurationMessage configurationMessage_ = SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); + private org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage configurationMessage_ = org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.ConfigurationMessage, SignalServiceProtos.ConfigurationMessage.Builder, SignalServiceProtos.ConfigurationMessageOrBuilder> configurationMessageBuilder_; + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Builder, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessageOrBuilder> configurationMessageBuilder_; /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ @@ -2809,7 +2809,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - public SignalServiceProtos.ConfigurationMessage getConfigurationMessage() { + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage getConfigurationMessage() { if (configurationMessageBuilder_ == null) { return configurationMessage_; } else { @@ -2819,7 +2819,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - public Builder setConfigurationMessage(SignalServiceProtos.ConfigurationMessage value) { + public Builder setConfigurationMessage(org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage value) { if (configurationMessageBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2836,7 +2836,7 @@ public final class SignalServiceProtos { * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ public Builder setConfigurationMessage( - SignalServiceProtos.ConfigurationMessage.Builder builderForValue) { + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Builder builderForValue) { if (configurationMessageBuilder_ == null) { configurationMessage_ = builderForValue.build(); onChanged(); @@ -2849,12 +2849,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - public Builder mergeConfigurationMessage(SignalServiceProtos.ConfigurationMessage value) { + public Builder mergeConfigurationMessage(org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage value) { if (configurationMessageBuilder_ == null) { if (((bitField0_ & 0x00000008) == 0x00000008) && - configurationMessage_ != SignalServiceProtos.ConfigurationMessage.getDefaultInstance()) { + configurationMessage_ != org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.getDefaultInstance()) { configurationMessage_ = - SignalServiceProtos.ConfigurationMessage.newBuilder(configurationMessage_).mergeFrom(value).buildPartial(); + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.newBuilder(configurationMessage_).mergeFrom(value).buildPartial(); } else { configurationMessage_ = value; } @@ -2870,7 +2870,7 @@ public final class SignalServiceProtos { */ public Builder clearConfigurationMessage() { if (configurationMessageBuilder_ == null) { - configurationMessage_ = SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); + configurationMessage_ = org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); onChanged(); } else { configurationMessageBuilder_.clear(); @@ -2881,7 +2881,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - public SignalServiceProtos.ConfigurationMessage.Builder getConfigurationMessageBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Builder getConfigurationMessageBuilder() { bitField0_ |= 0x00000008; onChanged(); return getConfigurationMessageFieldBuilder().getBuilder(); @@ -2889,7 +2889,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - public SignalServiceProtos.ConfigurationMessageOrBuilder getConfigurationMessageOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessageOrBuilder getConfigurationMessageOrBuilder() { if (configurationMessageBuilder_ != null) { return configurationMessageBuilder_.getMessageOrBuilder(); } else { @@ -2900,11 +2900,11 @@ public final class SignalServiceProtos { * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.ConfigurationMessage, SignalServiceProtos.ConfigurationMessage.Builder, SignalServiceProtos.ConfigurationMessageOrBuilder> + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Builder, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessageOrBuilder> getConfigurationMessageFieldBuilder() { if (configurationMessageBuilder_ == null) { configurationMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.ConfigurationMessage, SignalServiceProtos.ConfigurationMessage.Builder, SignalServiceProtos.ConfigurationMessageOrBuilder>( + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Builder, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessageOrBuilder>( configurationMessage_, getParentForChildren(), isClean()); @@ -2914,9 +2914,9 @@ public final class SignalServiceProtos { } // optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; - private SignalServiceProtos.DataExtractionNotification dataExtractionNotification_ = SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); + private org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification dataExtractionNotification_ = org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.DataExtractionNotification, SignalServiceProtos.DataExtractionNotification.Builder, SignalServiceProtos.DataExtractionNotificationOrBuilder> dataExtractionNotificationBuilder_; + org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification, org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.Builder, org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotificationOrBuilder> dataExtractionNotificationBuilder_; /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ @@ -2926,7 +2926,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - public SignalServiceProtos.DataExtractionNotification getDataExtractionNotification() { + public org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification getDataExtractionNotification() { if (dataExtractionNotificationBuilder_ == null) { return dataExtractionNotification_; } else { @@ -2936,7 +2936,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - public Builder setDataExtractionNotification(SignalServiceProtos.DataExtractionNotification value) { + public Builder setDataExtractionNotification(org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification value) { if (dataExtractionNotificationBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2953,7 +2953,7 @@ public final class SignalServiceProtos { * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ public Builder setDataExtractionNotification( - SignalServiceProtos.DataExtractionNotification.Builder builderForValue) { + org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.Builder builderForValue) { if (dataExtractionNotificationBuilder_ == null) { dataExtractionNotification_ = builderForValue.build(); onChanged(); @@ -2966,12 +2966,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - public Builder mergeDataExtractionNotification(SignalServiceProtos.DataExtractionNotification value) { + public Builder mergeDataExtractionNotification(org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification value) { if (dataExtractionNotificationBuilder_ == null) { if (((bitField0_ & 0x00000010) == 0x00000010) && - dataExtractionNotification_ != SignalServiceProtos.DataExtractionNotification.getDefaultInstance()) { + dataExtractionNotification_ != org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.getDefaultInstance()) { dataExtractionNotification_ = - SignalServiceProtos.DataExtractionNotification.newBuilder(dataExtractionNotification_).mergeFrom(value).buildPartial(); + org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.newBuilder(dataExtractionNotification_).mergeFrom(value).buildPartial(); } else { dataExtractionNotification_ = value; } @@ -2987,7 +2987,7 @@ public final class SignalServiceProtos { */ public Builder clearDataExtractionNotification() { if (dataExtractionNotificationBuilder_ == null) { - dataExtractionNotification_ = SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); + dataExtractionNotification_ = org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); onChanged(); } else { dataExtractionNotificationBuilder_.clear(); @@ -2998,7 +2998,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - public SignalServiceProtos.DataExtractionNotification.Builder getDataExtractionNotificationBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.Builder getDataExtractionNotificationBuilder() { bitField0_ |= 0x00000010; onChanged(); return getDataExtractionNotificationFieldBuilder().getBuilder(); @@ -3006,7 +3006,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - public SignalServiceProtos.DataExtractionNotificationOrBuilder getDataExtractionNotificationOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotificationOrBuilder getDataExtractionNotificationOrBuilder() { if (dataExtractionNotificationBuilder_ != null) { return dataExtractionNotificationBuilder_.getMessageOrBuilder(); } else { @@ -3017,11 +3017,11 @@ public final class SignalServiceProtos { * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.DataExtractionNotification, SignalServiceProtos.DataExtractionNotification.Builder, SignalServiceProtos.DataExtractionNotificationOrBuilder> + org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification, org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.Builder, org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotificationOrBuilder> getDataExtractionNotificationFieldBuilder() { if (dataExtractionNotificationBuilder_ == null) { dataExtractionNotificationBuilder_ = new com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.DataExtractionNotification, SignalServiceProtos.DataExtractionNotification.Builder, SignalServiceProtos.DataExtractionNotificationOrBuilder>( + org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification, org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.Builder, org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotificationOrBuilder>( dataExtractionNotification_, getParentForChildren(), isClean()); @@ -3155,14 +3155,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_KeyPair_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_KeyPair_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_KeyPair_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_KeyPair_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.KeyPair.class, SignalServiceProtos.KeyPair.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.KeyPair.class, org.session.libsignal.protos.SignalServiceProtos.KeyPair.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -3288,53 +3288,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static SignalServiceProtos.KeyPair parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.KeyPair parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.KeyPair parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.KeyPair parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.KeyPair parseFrom(byte[] data) + public static org.session.libsignal.protos.SignalServiceProtos.KeyPair parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.KeyPair parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.KeyPair parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.KeyPair parseFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.KeyPair parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.KeyPair parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.KeyPair parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static SignalServiceProtos.KeyPair parseDelimitedFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.KeyPair parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static SignalServiceProtos.KeyPair parseDelimitedFrom( + public static org.session.libsignal.protos.SignalServiceProtos.KeyPair parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static SignalServiceProtos.KeyPair parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.KeyPair parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.KeyPair parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.KeyPair parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3343,7 +3343,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(SignalServiceProtos.KeyPair prototype) { + public static Builder newBuilder(org.session.libsignal.protos.SignalServiceProtos.KeyPair prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -3359,17 +3359,17 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements SignalServiceProtos.KeyPairOrBuilder { + implements org.session.libsignal.protos.SignalServiceProtos.KeyPairOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_KeyPair_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_KeyPair_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_KeyPair_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_KeyPair_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.KeyPair.class, SignalServiceProtos.KeyPair.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.KeyPair.class, org.session.libsignal.protos.SignalServiceProtos.KeyPair.Builder.class); } // Construct using org.session.libsignal.protos.SignalServiceProtos.KeyPair.newBuilder() @@ -3405,23 +3405,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return SignalServiceProtos.internal_static_signalservice_KeyPair_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_KeyPair_descriptor; } - public SignalServiceProtos.KeyPair getDefaultInstanceForType() { - return SignalServiceProtos.KeyPair.getDefaultInstance(); + public org.session.libsignal.protos.SignalServiceProtos.KeyPair getDefaultInstanceForType() { + return org.session.libsignal.protos.SignalServiceProtos.KeyPair.getDefaultInstance(); } - public SignalServiceProtos.KeyPair build() { - SignalServiceProtos.KeyPair result = buildPartial(); + public org.session.libsignal.protos.SignalServiceProtos.KeyPair build() { + org.session.libsignal.protos.SignalServiceProtos.KeyPair result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public SignalServiceProtos.KeyPair buildPartial() { - SignalServiceProtos.KeyPair result = new SignalServiceProtos.KeyPair(this); + public org.session.libsignal.protos.SignalServiceProtos.KeyPair buildPartial() { + org.session.libsignal.protos.SignalServiceProtos.KeyPair result = new org.session.libsignal.protos.SignalServiceProtos.KeyPair(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -3438,16 +3438,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof SignalServiceProtos.KeyPair) { - return mergeFrom((SignalServiceProtos.KeyPair)other); + if (other instanceof org.session.libsignal.protos.SignalServiceProtos.KeyPair) { + return mergeFrom((org.session.libsignal.protos.SignalServiceProtos.KeyPair)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(SignalServiceProtos.KeyPair other) { - if (other == SignalServiceProtos.KeyPair.getDefaultInstance()) return this; + public Builder mergeFrom(org.session.libsignal.protos.SignalServiceProtos.KeyPair other) { + if (other == org.session.libsignal.protos.SignalServiceProtos.KeyPair.getDefaultInstance()) return this; if (other.hasPublicKey()) { setPublicKey(other.getPublicKey()); } @@ -3474,11 +3474,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - SignalServiceProtos.KeyPair parsedMessage = null; + org.session.libsignal.protos.SignalServiceProtos.KeyPair parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (SignalServiceProtos.KeyPair) e.getUnfinishedMessage(); + parsedMessage = (org.session.libsignal.protos.SignalServiceProtos.KeyPair) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -3623,7 +3623,7 @@ public final class SignalServiceProtos { * @required * */ - SignalServiceProtos.DataExtractionNotification.Type getType(); + org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.Type getType(); // optional uint64 timestamp = 2; /** @@ -3688,7 +3688,7 @@ public final class SignalServiceProtos { } case 8: { int rawValue = input.readEnum(); - SignalServiceProtos.DataExtractionNotification.Type value = SignalServiceProtos.DataExtractionNotification.Type.valueOf(rawValue); + org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.Type value = org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.Type.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); } else { @@ -3716,14 +3716,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.DataExtractionNotification.class, SignalServiceProtos.DataExtractionNotification.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.class, org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -3806,7 +3806,7 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return SignalServiceProtos.DataExtractionNotification.getDescriptor().getEnumTypes().get(0); + return org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.getDescriptor().getEnumTypes().get(0); } private static final Type[] VALUES = values(); @@ -3834,7 +3834,7 @@ public final class SignalServiceProtos { private int bitField0_; // required .signalservice.DataExtractionNotification.Type type = 1; public static final int TYPE_FIELD_NUMBER = 1; - private SignalServiceProtos.DataExtractionNotification.Type type_; + private org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.Type type_; /** * required .signalservice.DataExtractionNotification.Type type = 1; * @@ -3852,7 +3852,7 @@ public final class SignalServiceProtos { * @required * */ - public SignalServiceProtos.DataExtractionNotification.Type getType() { + public org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.Type getType() { return type_; } @@ -3873,7 +3873,7 @@ public final class SignalServiceProtos { } private void initFields() { - type_ = SignalServiceProtos.DataExtractionNotification.Type.SCREENSHOT; + type_ = org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.Type.SCREENSHOT; timestamp_ = 0L; } private byte memoizedIsInitialized = -1; @@ -3927,53 +3927,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static SignalServiceProtos.DataExtractionNotification parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.DataExtractionNotification parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.DataExtractionNotification parseFrom(byte[] data) + public static org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.DataExtractionNotification parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.DataExtractionNotification parseFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.DataExtractionNotification parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static SignalServiceProtos.DataExtractionNotification parseDelimitedFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static SignalServiceProtos.DataExtractionNotification parseDelimitedFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static SignalServiceProtos.DataExtractionNotification parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.DataExtractionNotification parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3982,7 +3982,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(SignalServiceProtos.DataExtractionNotification prototype) { + public static Builder newBuilder(org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -3998,17 +3998,17 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements SignalServiceProtos.DataExtractionNotificationOrBuilder { + implements org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotificationOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.DataExtractionNotification.class, SignalServiceProtos.DataExtractionNotification.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.class, org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.Builder.class); } // Construct using org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.newBuilder() @@ -4031,7 +4031,7 @@ public final class SignalServiceProtos { public Builder clear() { super.clear(); - type_ = SignalServiceProtos.DataExtractionNotification.Type.SCREENSHOT; + type_ = org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.Type.SCREENSHOT; bitField0_ = (bitField0_ & ~0x00000001); timestamp_ = 0L; bitField0_ = (bitField0_ & ~0x00000002); @@ -4044,23 +4044,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_descriptor; } - public SignalServiceProtos.DataExtractionNotification getDefaultInstanceForType() { - return SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); + public org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification getDefaultInstanceForType() { + return org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); } - public SignalServiceProtos.DataExtractionNotification build() { - SignalServiceProtos.DataExtractionNotification result = buildPartial(); + public org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification build() { + org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public SignalServiceProtos.DataExtractionNotification buildPartial() { - SignalServiceProtos.DataExtractionNotification result = new SignalServiceProtos.DataExtractionNotification(this); + public org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification buildPartial() { + org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification result = new org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -4077,16 +4077,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof SignalServiceProtos.DataExtractionNotification) { - return mergeFrom((SignalServiceProtos.DataExtractionNotification)other); + if (other instanceof org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification) { + return mergeFrom((org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(SignalServiceProtos.DataExtractionNotification other) { - if (other == SignalServiceProtos.DataExtractionNotification.getDefaultInstance()) return this; + public Builder mergeFrom(org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification other) { + if (other == org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.getDefaultInstance()) return this; if (other.hasType()) { setType(other.getType()); } @@ -4109,11 +4109,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - SignalServiceProtos.DataExtractionNotification parsedMessage = null; + org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (SignalServiceProtos.DataExtractionNotification) e.getUnfinishedMessage(); + parsedMessage = (org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -4125,7 +4125,7 @@ public final class SignalServiceProtos { private int bitField0_; // required .signalservice.DataExtractionNotification.Type type = 1; - private SignalServiceProtos.DataExtractionNotification.Type type_ = SignalServiceProtos.DataExtractionNotification.Type.SCREENSHOT; + private org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.Type type_ = org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.Type.SCREENSHOT; /** * required .signalservice.DataExtractionNotification.Type type = 1; * @@ -4143,7 +4143,7 @@ public final class SignalServiceProtos { * @required * */ - public SignalServiceProtos.DataExtractionNotification.Type getType() { + public org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.Type getType() { return type_; } /** @@ -4153,7 +4153,7 @@ public final class SignalServiceProtos { * @required * */ - public Builder setType(SignalServiceProtos.DataExtractionNotification.Type value) { + public Builder setType(org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.Type value) { if (value == null) { throw new NullPointerException(); } @@ -4171,7 +4171,7 @@ public final class SignalServiceProtos { */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); - type_ = SignalServiceProtos.DataExtractionNotification.Type.SCREENSHOT; + type_ = org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.Type.SCREENSHOT; onChanged(); return this; } @@ -4242,12 +4242,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - java.util.List + java.util.List getAttachmentsList(); /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - SignalServiceProtos.AttachmentPointer getAttachments(int index); + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer getAttachments(int index); /** * repeated .signalservice.AttachmentPointer attachments = 2; */ @@ -4255,12 +4255,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - java.util.List + java.util.List getAttachmentsOrBuilderList(); /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - SignalServiceProtos.AttachmentPointerOrBuilder getAttachmentsOrBuilder( + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder getAttachmentsOrBuilder( int index); // optional .signalservice.GroupContext group = 3; @@ -4271,11 +4271,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.GroupContext group = 3; */ - SignalServiceProtos.GroupContext getGroup(); + org.session.libsignal.protos.SignalServiceProtos.GroupContext getGroup(); /** * optional .signalservice.GroupContext group = 3; */ - SignalServiceProtos.GroupContextOrBuilder getGroupOrBuilder(); + org.session.libsignal.protos.SignalServiceProtos.GroupContextOrBuilder getGroupOrBuilder(); // optional uint32 flags = 4; /** @@ -4325,22 +4325,22 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.Quote quote = 8; */ - SignalServiceProtos.DataMessage.Quote getQuote(); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote getQuote(); /** * optional .signalservice.DataMessage.Quote quote = 8; */ - SignalServiceProtos.DataMessage.QuoteOrBuilder getQuoteOrBuilder(); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.QuoteOrBuilder getQuoteOrBuilder(); // repeated .signalservice.DataMessage.Preview preview = 10; /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - java.util.List + java.util.List getPreviewList(); /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - SignalServiceProtos.DataMessage.Preview getPreview(int index); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview getPreview(int index); /** * repeated .signalservice.DataMessage.Preview preview = 10; */ @@ -4348,12 +4348,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - java.util.List + java.util.List getPreviewOrBuilderList(); /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - SignalServiceProtos.DataMessage.PreviewOrBuilder getPreviewOrBuilder( + org.session.libsignal.protos.SignalServiceProtos.DataMessage.PreviewOrBuilder getPreviewOrBuilder( int index); // optional .signalservice.DataMessage.LokiProfile profile = 101; @@ -4364,11 +4364,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - SignalServiceProtos.DataMessage.LokiProfile getProfile(); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile getProfile(); /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - SignalServiceProtos.DataMessage.LokiProfileOrBuilder getProfileOrBuilder(); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfileOrBuilder getProfileOrBuilder(); // optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; /** @@ -4378,11 +4378,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - SignalServiceProtos.DataMessage.OpenGroupInvitation getOpenGroupInvitation(); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation getOpenGroupInvitation(); /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder(); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder(); // optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; /** @@ -4392,11 +4392,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - SignalServiceProtos.DataMessage.ClosedGroupControlMessage getClosedGroupControlMessage(); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage getClosedGroupControlMessage(); /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder getClosedGroupControlMessageOrBuilder(); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder getClosedGroupControlMessageOrBuilder(); // optional string syncTarget = 105; /** @@ -4471,18 +4471,18 @@ public final class SignalServiceProtos { } case 18: { if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - attachments_ = new java.util.ArrayList(); + attachments_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } - attachments_.add(input.readMessage(SignalServiceProtos.AttachmentPointer.PARSER, extensionRegistry)); + attachments_.add(input.readMessage(org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.PARSER, extensionRegistry)); break; } case 26: { - SignalServiceProtos.GroupContext.Builder subBuilder = null; + org.session.libsignal.protos.SignalServiceProtos.GroupContext.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = group_.toBuilder(); } - group_ = input.readMessage(SignalServiceProtos.GroupContext.PARSER, extensionRegistry); + group_ = input.readMessage(org.session.libsignal.protos.SignalServiceProtos.GroupContext.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(group_); group_ = subBuilder.buildPartial(); @@ -4511,11 +4511,11 @@ public final class SignalServiceProtos { break; } case 66: { - SignalServiceProtos.DataMessage.Quote.Builder subBuilder = null; + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.Builder subBuilder = null; if (((bitField0_ & 0x00000040) == 0x00000040)) { subBuilder = quote_.toBuilder(); } - quote_ = input.readMessage(SignalServiceProtos.DataMessage.Quote.PARSER, extensionRegistry); + quote_ = input.readMessage(org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(quote_); quote_ = subBuilder.buildPartial(); @@ -4525,18 +4525,18 @@ public final class SignalServiceProtos { } case 82: { if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) { - preview_ = new java.util.ArrayList(); + preview_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000100; } - preview_.add(input.readMessage(SignalServiceProtos.DataMessage.Preview.PARSER, extensionRegistry)); + preview_.add(input.readMessage(org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview.PARSER, extensionRegistry)); break; } case 810: { - SignalServiceProtos.DataMessage.LokiProfile.Builder subBuilder = null; + org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile.Builder subBuilder = null; if (((bitField0_ & 0x00000080) == 0x00000080)) { subBuilder = profile_.toBuilder(); } - profile_ = input.readMessage(SignalServiceProtos.DataMessage.LokiProfile.PARSER, extensionRegistry); + profile_ = input.readMessage(org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(profile_); profile_ = subBuilder.buildPartial(); @@ -4545,11 +4545,11 @@ public final class SignalServiceProtos { break; } case 818: { - SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder subBuilder = null; + org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder subBuilder = null; if (((bitField0_ & 0x00000100) == 0x00000100)) { subBuilder = openGroupInvitation_.toBuilder(); } - openGroupInvitation_ = input.readMessage(SignalServiceProtos.DataMessage.OpenGroupInvitation.PARSER, extensionRegistry); + openGroupInvitation_ = input.readMessage(org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(openGroupInvitation_); openGroupInvitation_ = subBuilder.buildPartial(); @@ -4558,11 +4558,11 @@ public final class SignalServiceProtos { break; } case 834: { - SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder subBuilder = null; + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder subBuilder = null; if (((bitField0_ & 0x00000200) == 0x00000200)) { subBuilder = closedGroupControlMessage_.toBuilder(); } - closedGroupControlMessage_ = input.readMessage(SignalServiceProtos.DataMessage.ClosedGroupControlMessage.PARSER, extensionRegistry); + closedGroupControlMessage_ = input.readMessage(org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(closedGroupControlMessage_); closedGroupControlMessage_ = subBuilder.buildPartial(); @@ -4595,14 +4595,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.DataMessage.class, SignalServiceProtos.DataMessage.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.class, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -4668,7 +4668,7 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return SignalServiceProtos.DataMessage.getDescriptor().getEnumTypes().get(0); + return org.session.libsignal.protos.SignalServiceProtos.DataMessage.getDescriptor().getEnumTypes().get(0); } private static final Flags[] VALUES = values(); @@ -4760,12 +4760,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - java.util.List + java.util.List getAttachmentsList(); /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - SignalServiceProtos.DataMessage.Quote.QuotedAttachment getAttachments(int index); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment getAttachments(int index); /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ @@ -4773,12 +4773,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - java.util.List + java.util.List getAttachmentsOrBuilderList(); /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder getAttachmentsOrBuilder( + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder getAttachmentsOrBuilder( int index); } /** @@ -4849,10 +4849,10 @@ public final class SignalServiceProtos { } case 34: { if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { - attachments_ = new java.util.ArrayList(); + attachments_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; } - attachments_.add(input.readMessage(SignalServiceProtos.DataMessage.Quote.QuotedAttachment.PARSER, extensionRegistry)); + attachments_.add(input.readMessage(org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.PARSER, extensionRegistry)); break; } } @@ -4872,14 +4872,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.DataMessage.Quote.class, SignalServiceProtos.DataMessage.Quote.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.class, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -4938,11 +4938,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ - SignalServiceProtos.AttachmentPointer getThumbnail(); + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer getThumbnail(); /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ - SignalServiceProtos.AttachmentPointerOrBuilder getThumbnailOrBuilder(); + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder getThumbnailOrBuilder(); // optional uint32 flags = 4; /** @@ -5016,11 +5016,11 @@ public final class SignalServiceProtos { break; } case 26: { - SignalServiceProtos.AttachmentPointer.Builder subBuilder = null; + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = thumbnail_.toBuilder(); } - thumbnail_ = input.readMessage(SignalServiceProtos.AttachmentPointer.PARSER, extensionRegistry); + thumbnail_ = input.readMessage(org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(thumbnail_); thumbnail_ = subBuilder.buildPartial(); @@ -5047,14 +5047,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.DataMessage.Quote.QuotedAttachment.class, SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.class, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -5120,7 +5120,7 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDescriptor().getEnumTypes().get(0); + return org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDescriptor().getEnumTypes().get(0); } private static final Flags[] VALUES = values(); @@ -5234,7 +5234,7 @@ public final class SignalServiceProtos { // optional .signalservice.AttachmentPointer thumbnail = 3; public static final int THUMBNAIL_FIELD_NUMBER = 3; - private SignalServiceProtos.AttachmentPointer thumbnail_; + private org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer thumbnail_; /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ @@ -5244,13 +5244,13 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ - public SignalServiceProtos.AttachmentPointer getThumbnail() { + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer getThumbnail() { return thumbnail_; } /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ - public SignalServiceProtos.AttachmentPointerOrBuilder getThumbnailOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder getThumbnailOrBuilder() { return thumbnail_; } @@ -5273,7 +5273,7 @@ public final class SignalServiceProtos { private void initFields() { contentType_ = ""; fileName_ = ""; - thumbnail_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + thumbnail_ = org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); flags_ = 0; } private byte memoizedIsInitialized = -1; @@ -5343,53 +5343,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom(byte[] data) + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseDelimitedFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseDelimitedFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -5398,7 +5398,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(SignalServiceProtos.DataMessage.Quote.QuotedAttachment prototype) { + public static Builder newBuilder(org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -5414,17 +5414,17 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder { + implements org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.DataMessage.Quote.QuotedAttachment.class, SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.class, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder.class); } // Construct using org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.newBuilder() @@ -5453,7 +5453,7 @@ public final class SignalServiceProtos { fileName_ = ""; bitField0_ = (bitField0_ & ~0x00000002); if (thumbnailBuilder_ == null) { - thumbnail_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + thumbnail_ = org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); } else { thumbnailBuilder_.clear(); } @@ -5469,23 +5469,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_descriptor; } - public SignalServiceProtos.DataMessage.Quote.QuotedAttachment getDefaultInstanceForType() { - return SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDefaultInstance(); + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment getDefaultInstanceForType() { + return org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDefaultInstance(); } - public SignalServiceProtos.DataMessage.Quote.QuotedAttachment build() { - SignalServiceProtos.DataMessage.Quote.QuotedAttachment result = buildPartial(); + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment build() { + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public SignalServiceProtos.DataMessage.Quote.QuotedAttachment buildPartial() { - SignalServiceProtos.DataMessage.Quote.QuotedAttachment result = new SignalServiceProtos.DataMessage.Quote.QuotedAttachment(this); + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment buildPartial() { + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment result = new org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -5514,16 +5514,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof SignalServiceProtos.DataMessage.Quote.QuotedAttachment) { - return mergeFrom((SignalServiceProtos.DataMessage.Quote.QuotedAttachment)other); + if (other instanceof org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment) { + return mergeFrom((org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(SignalServiceProtos.DataMessage.Quote.QuotedAttachment other) { - if (other == SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDefaultInstance()) return this; + public Builder mergeFrom(org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment other) { + if (other == org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDefaultInstance()) return this; if (other.hasContentType()) { bitField0_ |= 0x00000001; contentType_ = other.contentType_; @@ -5558,11 +5558,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - SignalServiceProtos.DataMessage.Quote.QuotedAttachment parsedMessage = null; + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (SignalServiceProtos.DataMessage.Quote.QuotedAttachment) e.getUnfinishedMessage(); + parsedMessage = (org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -5722,9 +5722,9 @@ public final class SignalServiceProtos { } // optional .signalservice.AttachmentPointer thumbnail = 3; - private SignalServiceProtos.AttachmentPointer thumbnail_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + private org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer thumbnail_ = org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder> thumbnailBuilder_; + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder> thumbnailBuilder_; /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ @@ -5734,7 +5734,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ - public SignalServiceProtos.AttachmentPointer getThumbnail() { + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer getThumbnail() { if (thumbnailBuilder_ == null) { return thumbnail_; } else { @@ -5744,7 +5744,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ - public Builder setThumbnail(SignalServiceProtos.AttachmentPointer value) { + public Builder setThumbnail(org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer value) { if (thumbnailBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -5761,7 +5761,7 @@ public final class SignalServiceProtos { * optional .signalservice.AttachmentPointer thumbnail = 3; */ public Builder setThumbnail( - SignalServiceProtos.AttachmentPointer.Builder builderForValue) { + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder builderForValue) { if (thumbnailBuilder_ == null) { thumbnail_ = builderForValue.build(); onChanged(); @@ -5774,12 +5774,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ - public Builder mergeThumbnail(SignalServiceProtos.AttachmentPointer value) { + public Builder mergeThumbnail(org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer value) { if (thumbnailBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - thumbnail_ != SignalServiceProtos.AttachmentPointer.getDefaultInstance()) { + thumbnail_ != org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.getDefaultInstance()) { thumbnail_ = - SignalServiceProtos.AttachmentPointer.newBuilder(thumbnail_).mergeFrom(value).buildPartial(); + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.newBuilder(thumbnail_).mergeFrom(value).buildPartial(); } else { thumbnail_ = value; } @@ -5795,7 +5795,7 @@ public final class SignalServiceProtos { */ public Builder clearThumbnail() { if (thumbnailBuilder_ == null) { - thumbnail_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + thumbnail_ = org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); onChanged(); } else { thumbnailBuilder_.clear(); @@ -5806,7 +5806,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ - public SignalServiceProtos.AttachmentPointer.Builder getThumbnailBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder getThumbnailBuilder() { bitField0_ |= 0x00000004; onChanged(); return getThumbnailFieldBuilder().getBuilder(); @@ -5814,7 +5814,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ - public SignalServiceProtos.AttachmentPointerOrBuilder getThumbnailOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder getThumbnailOrBuilder() { if (thumbnailBuilder_ != null) { return thumbnailBuilder_.getMessageOrBuilder(); } else { @@ -5825,11 +5825,11 @@ public final class SignalServiceProtos { * optional .signalservice.AttachmentPointer thumbnail = 3; */ private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder> + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder> getThumbnailFieldBuilder() { if (thumbnailBuilder_ == null) { thumbnailBuilder_ = new com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder>( + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder>( thumbnail_, getParentForChildren(), isClean()); @@ -6007,17 +6007,17 @@ public final class SignalServiceProtos { // repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; public static final int ATTACHMENTS_FIELD_NUMBER = 4; - private java.util.List attachments_; + private java.util.List attachments_; /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public java.util.List getAttachmentsList() { + public java.util.List getAttachmentsList() { return attachments_; } /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public java.util.List + public java.util.List getAttachmentsOrBuilderList() { return attachments_; } @@ -6030,13 +6030,13 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public SignalServiceProtos.DataMessage.Quote.QuotedAttachment getAttachments(int index) { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment getAttachments(int index) { return attachments_.get(index); } /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder getAttachmentsOrBuilder( + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder getAttachmentsOrBuilder( int index) { return attachments_.get(index); } @@ -6122,53 +6122,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static SignalServiceProtos.DataMessage.Quote parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.DataMessage.Quote parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.DataMessage.Quote parseFrom(byte[] data) + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.DataMessage.Quote parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.DataMessage.Quote parseFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.DataMessage.Quote parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static SignalServiceProtos.DataMessage.Quote parseDelimitedFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static SignalServiceProtos.DataMessage.Quote parseDelimitedFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static SignalServiceProtos.DataMessage.Quote parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.DataMessage.Quote parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -6177,7 +6177,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(SignalServiceProtos.DataMessage.Quote prototype) { + public static Builder newBuilder(org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -6193,17 +6193,17 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements SignalServiceProtos.DataMessage.QuoteOrBuilder { + implements org.session.libsignal.protos.SignalServiceProtos.DataMessage.QuoteOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.DataMessage.Quote.class, SignalServiceProtos.DataMessage.Quote.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.class, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.Builder.class); } // Construct using org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.newBuilder() @@ -6248,23 +6248,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_descriptor; } - public SignalServiceProtos.DataMessage.Quote getDefaultInstanceForType() { - return SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote getDefaultInstanceForType() { + return org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); } - public SignalServiceProtos.DataMessage.Quote build() { - SignalServiceProtos.DataMessage.Quote result = buildPartial(); + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote build() { + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public SignalServiceProtos.DataMessage.Quote buildPartial() { - SignalServiceProtos.DataMessage.Quote result = new SignalServiceProtos.DataMessage.Quote(this); + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote buildPartial() { + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote result = new org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -6294,16 +6294,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof SignalServiceProtos.DataMessage.Quote) { - return mergeFrom((SignalServiceProtos.DataMessage.Quote)other); + if (other instanceof org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote) { + return mergeFrom((org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(SignalServiceProtos.DataMessage.Quote other) { - if (other == SignalServiceProtos.DataMessage.Quote.getDefaultInstance()) return this; + public Builder mergeFrom(org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote other) { + if (other == org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.getDefaultInstance()) return this; if (other.hasId()) { setId(other.getId()); } @@ -6369,11 +6369,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - SignalServiceProtos.DataMessage.Quote parsedMessage = null; + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (SignalServiceProtos.DataMessage.Quote) e.getUnfinishedMessage(); + parsedMessage = (org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -6606,22 +6606,22 @@ public final class SignalServiceProtos { } // repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; - private java.util.List attachments_ = + private java.util.List attachments_ = java.util.Collections.emptyList(); private void ensureAttachmentsIsMutable() { if (!((bitField0_ & 0x00000008) == 0x00000008)) { - attachments_ = new java.util.ArrayList(attachments_); + attachments_ = new java.util.ArrayList(attachments_); bitField0_ |= 0x00000008; } } private com.google.protobuf.RepeatedFieldBuilder< - SignalServiceProtos.DataMessage.Quote.QuotedAttachment, SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder, SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder> attachmentsBuilder_; + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder> attachmentsBuilder_; /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public java.util.List getAttachmentsList() { + public java.util.List getAttachmentsList() { if (attachmentsBuilder_ == null) { return java.util.Collections.unmodifiableList(attachments_); } else { @@ -6641,7 +6641,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public SignalServiceProtos.DataMessage.Quote.QuotedAttachment getAttachments(int index) { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment getAttachments(int index) { if (attachmentsBuilder_ == null) { return attachments_.get(index); } else { @@ -6652,7 +6652,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ public Builder setAttachments( - int index, SignalServiceProtos.DataMessage.Quote.QuotedAttachment value) { + int index, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment value) { if (attachmentsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6669,7 +6669,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ public Builder setAttachments( - int index, SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder builderForValue) { + int index, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder builderForValue) { if (attachmentsBuilder_ == null) { ensureAttachmentsIsMutable(); attachments_.set(index, builderForValue.build()); @@ -6682,7 +6682,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public Builder addAttachments(SignalServiceProtos.DataMessage.Quote.QuotedAttachment value) { + public Builder addAttachments(org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment value) { if (attachmentsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6699,7 +6699,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ public Builder addAttachments( - int index, SignalServiceProtos.DataMessage.Quote.QuotedAttachment value) { + int index, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment value) { if (attachmentsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6716,7 +6716,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ public Builder addAttachments( - SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder builderForValue) { + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder builderForValue) { if (attachmentsBuilder_ == null) { ensureAttachmentsIsMutable(); attachments_.add(builderForValue.build()); @@ -6730,7 +6730,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ public Builder addAttachments( - int index, SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder builderForValue) { + int index, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder builderForValue) { if (attachmentsBuilder_ == null) { ensureAttachmentsIsMutable(); attachments_.add(index, builderForValue.build()); @@ -6744,7 +6744,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ public Builder addAllAttachments( - java.lang.Iterable values) { + java.lang.Iterable values) { if (attachmentsBuilder_ == null) { ensureAttachmentsIsMutable(); super.addAll(values, attachments_); @@ -6783,14 +6783,14 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder getAttachmentsBuilder( + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder getAttachmentsBuilder( int index) { return getAttachmentsFieldBuilder().getBuilder(index); } /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder getAttachmentsOrBuilder( + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder getAttachmentsOrBuilder( int index) { if (attachmentsBuilder_ == null) { return attachments_.get(index); } else { @@ -6800,7 +6800,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public java.util.List + public java.util.List getAttachmentsOrBuilderList() { if (attachmentsBuilder_ != null) { return attachmentsBuilder_.getMessageOrBuilderList(); @@ -6811,31 +6811,31 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder addAttachmentsBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder addAttachmentsBuilder() { return getAttachmentsFieldBuilder().addBuilder( - SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDefaultInstance()); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDefaultInstance()); } /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder addAttachmentsBuilder( + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder addAttachmentsBuilder( int index) { return getAttachmentsFieldBuilder().addBuilder( - index, SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDefaultInstance()); + index, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDefaultInstance()); } /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public java.util.List + public java.util.List getAttachmentsBuilderList() { return getAttachmentsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - SignalServiceProtos.DataMessage.Quote.QuotedAttachment, SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder, SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder> + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder> getAttachmentsFieldBuilder() { if (attachmentsBuilder_ == null) { attachmentsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - SignalServiceProtos.DataMessage.Quote.QuotedAttachment, SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder, SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder>( + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder>( attachments_, ((bitField0_ & 0x00000008) == 0x00000008), getParentForChildren(), @@ -6909,11 +6909,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer image = 3; */ - SignalServiceProtos.AttachmentPointer getImage(); + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer getImage(); /** * optional .signalservice.AttachmentPointer image = 3; */ - SignalServiceProtos.AttachmentPointerOrBuilder getImageOrBuilder(); + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder getImageOrBuilder(); } /** * Protobuf type {@code signalservice.DataMessage.Preview} @@ -6977,11 +6977,11 @@ public final class SignalServiceProtos { break; } case 26: { - SignalServiceProtos.AttachmentPointer.Builder subBuilder = null; + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = image_.toBuilder(); } - image_ = input.readMessage(SignalServiceProtos.AttachmentPointer.PARSER, extensionRegistry); + image_ = input.readMessage(org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(image_); image_ = subBuilder.buildPartial(); @@ -7003,14 +7003,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.DataMessage.Preview.class, SignalServiceProtos.DataMessage.Preview.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview.class, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -7129,7 +7129,7 @@ public final class SignalServiceProtos { // optional .signalservice.AttachmentPointer image = 3; public static final int IMAGE_FIELD_NUMBER = 3; - private SignalServiceProtos.AttachmentPointer image_; + private org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer image_; /** * optional .signalservice.AttachmentPointer image = 3; */ @@ -7139,20 +7139,20 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer image = 3; */ - public SignalServiceProtos.AttachmentPointer getImage() { + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer getImage() { return image_; } /** * optional .signalservice.AttachmentPointer image = 3; */ - public SignalServiceProtos.AttachmentPointerOrBuilder getImageOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder getImageOrBuilder() { return image_; } private void initFields() { url_ = ""; title_ = ""; - image_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + image_ = org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -7218,53 +7218,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static SignalServiceProtos.DataMessage.Preview parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.DataMessage.Preview parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.DataMessage.Preview parseFrom(byte[] data) + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.DataMessage.Preview parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.DataMessage.Preview parseFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.DataMessage.Preview parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static SignalServiceProtos.DataMessage.Preview parseDelimitedFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static SignalServiceProtos.DataMessage.Preview parseDelimitedFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static SignalServiceProtos.DataMessage.Preview parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.DataMessage.Preview parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -7273,7 +7273,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(SignalServiceProtos.DataMessage.Preview prototype) { + public static Builder newBuilder(org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -7289,17 +7289,17 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements SignalServiceProtos.DataMessage.PreviewOrBuilder { + implements org.session.libsignal.protos.SignalServiceProtos.DataMessage.PreviewOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.DataMessage.Preview.class, SignalServiceProtos.DataMessage.Preview.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview.class, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview.Builder.class); } // Construct using org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview.newBuilder() @@ -7328,7 +7328,7 @@ public final class SignalServiceProtos { title_ = ""; bitField0_ = (bitField0_ & ~0x00000002); if (imageBuilder_ == null) { - image_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + image_ = org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); } else { imageBuilder_.clear(); } @@ -7342,23 +7342,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_descriptor; } - public SignalServiceProtos.DataMessage.Preview getDefaultInstanceForType() { - return SignalServiceProtos.DataMessage.Preview.getDefaultInstance(); + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview getDefaultInstanceForType() { + return org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview.getDefaultInstance(); } - public SignalServiceProtos.DataMessage.Preview build() { - SignalServiceProtos.DataMessage.Preview result = buildPartial(); + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview build() { + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public SignalServiceProtos.DataMessage.Preview buildPartial() { - SignalServiceProtos.DataMessage.Preview result = new SignalServiceProtos.DataMessage.Preview(this); + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview buildPartial() { + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview result = new org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -7383,16 +7383,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof SignalServiceProtos.DataMessage.Preview) { - return mergeFrom((SignalServiceProtos.DataMessage.Preview)other); + if (other instanceof org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview) { + return mergeFrom((org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(SignalServiceProtos.DataMessage.Preview other) { - if (other == SignalServiceProtos.DataMessage.Preview.getDefaultInstance()) return this; + public Builder mergeFrom(org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview other) { + if (other == org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview.getDefaultInstance()) return this; if (other.hasUrl()) { bitField0_ |= 0x00000001; url_ = other.url_; @@ -7428,11 +7428,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - SignalServiceProtos.DataMessage.Preview parsedMessage = null; + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (SignalServiceProtos.DataMessage.Preview) e.getUnfinishedMessage(); + parsedMessage = (org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -7616,9 +7616,9 @@ public final class SignalServiceProtos { } // optional .signalservice.AttachmentPointer image = 3; - private SignalServiceProtos.AttachmentPointer image_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + private org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer image_ = org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder> imageBuilder_; + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder> imageBuilder_; /** * optional .signalservice.AttachmentPointer image = 3; */ @@ -7628,7 +7628,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer image = 3; */ - public SignalServiceProtos.AttachmentPointer getImage() { + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer getImage() { if (imageBuilder_ == null) { return image_; } else { @@ -7638,7 +7638,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer image = 3; */ - public Builder setImage(SignalServiceProtos.AttachmentPointer value) { + public Builder setImage(org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer value) { if (imageBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -7655,7 +7655,7 @@ public final class SignalServiceProtos { * optional .signalservice.AttachmentPointer image = 3; */ public Builder setImage( - SignalServiceProtos.AttachmentPointer.Builder builderForValue) { + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder builderForValue) { if (imageBuilder_ == null) { image_ = builderForValue.build(); onChanged(); @@ -7668,12 +7668,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer image = 3; */ - public Builder mergeImage(SignalServiceProtos.AttachmentPointer value) { + public Builder mergeImage(org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer value) { if (imageBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - image_ != SignalServiceProtos.AttachmentPointer.getDefaultInstance()) { + image_ != org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.getDefaultInstance()) { image_ = - SignalServiceProtos.AttachmentPointer.newBuilder(image_).mergeFrom(value).buildPartial(); + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.newBuilder(image_).mergeFrom(value).buildPartial(); } else { image_ = value; } @@ -7689,7 +7689,7 @@ public final class SignalServiceProtos { */ public Builder clearImage() { if (imageBuilder_ == null) { - image_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + image_ = org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); onChanged(); } else { imageBuilder_.clear(); @@ -7700,7 +7700,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer image = 3; */ - public SignalServiceProtos.AttachmentPointer.Builder getImageBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder getImageBuilder() { bitField0_ |= 0x00000004; onChanged(); return getImageFieldBuilder().getBuilder(); @@ -7708,7 +7708,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer image = 3; */ - public SignalServiceProtos.AttachmentPointerOrBuilder getImageOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder getImageOrBuilder() { if (imageBuilder_ != null) { return imageBuilder_.getMessageOrBuilder(); } else { @@ -7719,11 +7719,11 @@ public final class SignalServiceProtos { * optional .signalservice.AttachmentPointer image = 3; */ private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder> + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder> getImageFieldBuilder() { if (imageBuilder_ == null) { imageBuilder_ = new com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder>( + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder>( image_, getParentForChildren(), isClean()); @@ -7851,14 +7851,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.DataMessage.LokiProfile.class, SignalServiceProtos.DataMessage.LokiProfile.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile.class, org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -8014,53 +8014,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static SignalServiceProtos.DataMessage.LokiProfile parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.DataMessage.LokiProfile parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.DataMessage.LokiProfile parseFrom(byte[] data) + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.DataMessage.LokiProfile parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.DataMessage.LokiProfile parseFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.DataMessage.LokiProfile parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static SignalServiceProtos.DataMessage.LokiProfile parseDelimitedFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static SignalServiceProtos.DataMessage.LokiProfile parseDelimitedFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static SignalServiceProtos.DataMessage.LokiProfile parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.DataMessage.LokiProfile parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -8069,7 +8069,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(SignalServiceProtos.DataMessage.LokiProfile prototype) { + public static Builder newBuilder(org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -8085,17 +8085,17 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements SignalServiceProtos.DataMessage.LokiProfileOrBuilder { + implements org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfileOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.DataMessage.LokiProfile.class, SignalServiceProtos.DataMessage.LokiProfile.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile.class, org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile.Builder.class); } // Construct using org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile.newBuilder() @@ -8131,23 +8131,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_descriptor; } - public SignalServiceProtos.DataMessage.LokiProfile getDefaultInstanceForType() { - return SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile getDefaultInstanceForType() { + return org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); } - public SignalServiceProtos.DataMessage.LokiProfile build() { - SignalServiceProtos.DataMessage.LokiProfile result = buildPartial(); + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile build() { + org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public SignalServiceProtos.DataMessage.LokiProfile buildPartial() { - SignalServiceProtos.DataMessage.LokiProfile result = new SignalServiceProtos.DataMessage.LokiProfile(this); + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile buildPartial() { + org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile result = new org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -8164,16 +8164,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof SignalServiceProtos.DataMessage.LokiProfile) { - return mergeFrom((SignalServiceProtos.DataMessage.LokiProfile)other); + if (other instanceof org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile) { + return mergeFrom((org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(SignalServiceProtos.DataMessage.LokiProfile other) { - if (other == SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance()) return this; + public Builder mergeFrom(org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile other) { + if (other == org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance()) return this; if (other.hasDisplayName()) { bitField0_ |= 0x00000001; displayName_ = other.displayName_; @@ -8196,11 +8196,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - SignalServiceProtos.DataMessage.LokiProfile parsedMessage = null; + org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (SignalServiceProtos.DataMessage.LokiProfile) e.getUnfinishedMessage(); + parsedMessage = (org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -8502,14 +8502,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.DataMessage.OpenGroupInvitation.class, SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation.class, org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -8697,53 +8697,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom(byte[] data) + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseDelimitedFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseDelimitedFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -8752,7 +8752,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(SignalServiceProtos.DataMessage.OpenGroupInvitation prototype) { + public static Builder newBuilder(org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -8768,17 +8768,17 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder { + implements org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.DataMessage.OpenGroupInvitation.class, SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation.class, org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder.class); } // Construct using org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation.newBuilder() @@ -8814,23 +8814,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_descriptor; } - public SignalServiceProtos.DataMessage.OpenGroupInvitation getDefaultInstanceForType() { - return SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation getDefaultInstanceForType() { + return org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); } - public SignalServiceProtos.DataMessage.OpenGroupInvitation build() { - SignalServiceProtos.DataMessage.OpenGroupInvitation result = buildPartial(); + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation build() { + org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public SignalServiceProtos.DataMessage.OpenGroupInvitation buildPartial() { - SignalServiceProtos.DataMessage.OpenGroupInvitation result = new SignalServiceProtos.DataMessage.OpenGroupInvitation(this); + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation buildPartial() { + org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation result = new org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -8847,16 +8847,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof SignalServiceProtos.DataMessage.OpenGroupInvitation) { - return mergeFrom((SignalServiceProtos.DataMessage.OpenGroupInvitation)other); + if (other instanceof org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation) { + return mergeFrom((org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(SignalServiceProtos.DataMessage.OpenGroupInvitation other) { - if (other == SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance()) return this; + public Builder mergeFrom(org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation other) { + if (other == org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance()) return this; if (other.hasUrl()) { bitField0_ |= 0x00000001; url_ = other.url_; @@ -8887,11 +8887,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - SignalServiceProtos.DataMessage.OpenGroupInvitation parsedMessage = null; + org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (SignalServiceProtos.DataMessage.OpenGroupInvitation) e.getUnfinishedMessage(); + parsedMessage = (org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -9128,7 +9128,7 @@ public final class SignalServiceProtos { * @required * */ - SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type getType(); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type getType(); // optional bytes publicKey = 2; /** @@ -9163,11 +9163,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - SignalServiceProtos.KeyPair getEncryptionKeyPair(); + org.session.libsignal.protos.SignalServiceProtos.KeyPair getEncryptionKeyPair(); /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder(); + org.session.libsignal.protos.SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder(); // repeated bytes members = 5; /** @@ -9201,12 +9201,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - java.util.List + java.util.List getWrappersList(); /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper getWrappers(int index); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper getWrappers(int index); /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ @@ -9214,13 +9214,23 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - java.util.List + java.util.List getWrappersOrBuilderList(); /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder getWrappersOrBuilder( + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder getWrappersOrBuilder( int index); + + // optional uint32 expireTimer = 8; + /** + * optional uint32 expireTimer = 8; + */ + boolean hasExpireTimer(); + /** + * optional uint32 expireTimer = 8; + */ + int getExpireTimer(); } /** * Protobuf type {@code signalservice.DataMessage.ClosedGroupControlMessage} @@ -9275,7 +9285,7 @@ public final class SignalServiceProtos { } case 8: { int rawValue = input.readEnum(); - SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type value = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.valueOf(rawValue); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type value = org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); } else { @@ -9295,11 +9305,11 @@ public final class SignalServiceProtos { break; } case 34: { - SignalServiceProtos.KeyPair.Builder subBuilder = null; + org.session.libsignal.protos.SignalServiceProtos.KeyPair.Builder subBuilder = null; if (((bitField0_ & 0x00000008) == 0x00000008)) { subBuilder = encryptionKeyPair_.toBuilder(); } - encryptionKeyPair_ = input.readMessage(SignalServiceProtos.KeyPair.PARSER, extensionRegistry); + encryptionKeyPair_ = input.readMessage(org.session.libsignal.protos.SignalServiceProtos.KeyPair.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(encryptionKeyPair_); encryptionKeyPair_ = subBuilder.buildPartial(); @@ -9325,10 +9335,15 @@ public final class SignalServiceProtos { } case 58: { if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { - wrappers_ = new java.util.ArrayList(); + wrappers_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000040; } - wrappers_.add(input.readMessage(SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.PARSER, extensionRegistry)); + wrappers_.add(input.readMessage(org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.PARSER, extensionRegistry)); + break; + } + case 64: { + bitField0_ |= 0x00000010; + expireTimer_ = input.readUInt32(); break; } } @@ -9354,14 +9369,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.DataMessage.ClosedGroupControlMessage.class, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.class, org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -9388,7 +9403,7 @@ public final class SignalServiceProtos { * NEW = 1; * * 
-         * publicKey, name, encryptionKeyPair, members, admins
+         * publicKey, name, encryptionKeyPair, members, admins, expireTimer
          *
*/ NEW(0, 1), @@ -9434,7 +9449,7 @@ public final class SignalServiceProtos { * NEW = 1; * * 
-         * publicKey, name, encryptionKeyPair, members, admins
+         * publicKey, name, encryptionKeyPair, members, admins, expireTimer
          *
*/ public static final int NEW_VALUE = 1; @@ -9512,7 +9527,7 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDescriptor().getEnumTypes().get(0); + return org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDescriptor().getEnumTypes().get(0); } private static final Type[] VALUES = values(); @@ -9651,14 +9666,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.class, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.class, org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -9784,53 +9799,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom(byte[] data) + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseDelimitedFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseDelimitedFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -9839,7 +9854,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper prototype) { + public static Builder newBuilder(org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -9855,17 +9870,17 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder { + implements org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.class, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.class, org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder.class); } // Construct using org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.newBuilder() @@ -9901,23 +9916,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_descriptor; } - public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper getDefaultInstanceForType() { - return SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.getDefaultInstance(); + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper getDefaultInstanceForType() { + return org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.getDefaultInstance(); } - public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper build() { - SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper result = buildPartial(); + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper build() { + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper buildPartial() { - SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper result = new SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper(this); + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper buildPartial() { + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper result = new org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -9934,16 +9949,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper) { - return mergeFrom((SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper)other); + if (other instanceof org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper) { + return mergeFrom((org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper other) { - if (other == SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.getDefaultInstance()) return this; + public Builder mergeFrom(org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper other) { + if (other == org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.getDefaultInstance()) return this; if (other.hasPublicKey()) { setPublicKey(other.getPublicKey()); } @@ -9970,11 +9985,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parsedMessage = null; + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper) e.getUnfinishedMessage(); + parsedMessage = (org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -10103,7 +10118,7 @@ public final class SignalServiceProtos { private int bitField0_; // required .signalservice.DataMessage.ClosedGroupControlMessage.Type type = 1; public static final int TYPE_FIELD_NUMBER = 1; - private SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type type_; + private org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type type_; /** * required .signalservice.DataMessage.ClosedGroupControlMessage.Type type = 1; * @@ -10121,7 +10136,7 @@ public final class SignalServiceProtos { * @required * */ - public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type getType() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type getType() { return type_; } @@ -10186,7 +10201,7 @@ public final class SignalServiceProtos { // optional .signalservice.KeyPair encryptionKeyPair = 4; public static final int ENCRYPTIONKEYPAIR_FIELD_NUMBER = 4; - private SignalServiceProtos.KeyPair encryptionKeyPair_; + private org.session.libsignal.protos.SignalServiceProtos.KeyPair encryptionKeyPair_; /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ @@ -10196,13 +10211,13 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - public SignalServiceProtos.KeyPair getEncryptionKeyPair() { + public org.session.libsignal.protos.SignalServiceProtos.KeyPair getEncryptionKeyPair() { return encryptionKeyPair_; } /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - public SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder() { return encryptionKeyPair_; } @@ -10254,17 +10269,17 @@ public final class SignalServiceProtos { // repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; public static final int WRAPPERS_FIELD_NUMBER = 7; - private java.util.List wrappers_; + private java.util.List wrappers_; /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public java.util.List getWrappersList() { + public java.util.List getWrappersList() { return wrappers_; } /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public java.util.List + public java.util.List getWrappersOrBuilderList() { return wrappers_; } @@ -10277,25 +10292,42 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper getWrappers(int index) { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper getWrappers(int index) { return wrappers_.get(index); } /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder getWrappersOrBuilder( + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder getWrappersOrBuilder( int index) { return wrappers_.get(index); } + // optional uint32 expireTimer = 8; + public static final int EXPIRETIMER_FIELD_NUMBER = 8; + private int expireTimer_; + /** + * optional uint32 expireTimer = 8; + */ + public boolean hasExpireTimer() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + * optional uint32 expireTimer = 8; + */ + public int getExpireTimer() { + return expireTimer_; + } + private void initFields() { - type_ = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NEW; + type_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NEW; publicKey_ = com.google.protobuf.ByteString.EMPTY; name_ = ""; - encryptionKeyPair_ = SignalServiceProtos.KeyPair.getDefaultInstance(); + encryptionKeyPair_ = org.session.libsignal.protos.SignalServiceProtos.KeyPair.getDefaultInstance(); members_ = java.util.Collections.emptyList(); admins_ = java.util.Collections.emptyList(); wrappers_ = java.util.Collections.emptyList(); + expireTimer_ = 0; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -10346,6 +10378,9 @@ public final class SignalServiceProtos { for (int i = 0; i < wrappers_.size(); i++) { output.writeMessage(7, wrappers_.get(i)); } + if (((bitField0_ & 0x00000010) == 0x00000010)) { + output.writeUInt32(8, expireTimer_); + } getUnknownFields().writeTo(output); } @@ -10393,6 +10428,10 @@ public final class SignalServiceProtos { size += com.google.protobuf.CodedOutputStream .computeMessageSize(7, wrappers_.get(i)); } + if (((bitField0_ & 0x00000010) == 0x00000010)) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(8, expireTimer_); + } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -10405,53 +10444,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom(byte[] data) + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseDelimitedFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseDelimitedFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -10460,7 +10499,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(SignalServiceProtos.DataMessage.ClosedGroupControlMessage prototype) { + public static Builder newBuilder(org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -10476,17 +10515,17 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder { + implements org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.DataMessage.ClosedGroupControlMessage.class, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.class, org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder.class); } // Construct using org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.newBuilder() @@ -10511,14 +10550,14 @@ public final class SignalServiceProtos { public Builder clear() { super.clear(); - type_ = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NEW; + type_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NEW; bitField0_ = (bitField0_ & ~0x00000001); publicKey_ = com.google.protobuf.ByteString.EMPTY; bitField0_ = (bitField0_ & ~0x00000002); name_ = ""; bitField0_ = (bitField0_ & ~0x00000004); if (encryptionKeyPairBuilder_ == null) { - encryptionKeyPair_ = SignalServiceProtos.KeyPair.getDefaultInstance(); + encryptionKeyPair_ = org.session.libsignal.protos.SignalServiceProtos.KeyPair.getDefaultInstance(); } else { encryptionKeyPairBuilder_.clear(); } @@ -10533,6 +10572,8 @@ public final class SignalServiceProtos { } else { wrappersBuilder_.clear(); } + expireTimer_ = 0; + bitField0_ = (bitField0_ & ~0x00000080); return this; } @@ -10542,23 +10583,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor; } - public SignalServiceProtos.DataMessage.ClosedGroupControlMessage getDefaultInstanceForType() { - return SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage getDefaultInstanceForType() { + return org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); } - public SignalServiceProtos.DataMessage.ClosedGroupControlMessage build() { - SignalServiceProtos.DataMessage.ClosedGroupControlMessage result = buildPartial(); + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage build() { + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public SignalServiceProtos.DataMessage.ClosedGroupControlMessage buildPartial() { - SignalServiceProtos.DataMessage.ClosedGroupControlMessage result = new SignalServiceProtos.DataMessage.ClosedGroupControlMessage(this); + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage buildPartial() { + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage result = new org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -10600,22 +10641,26 @@ public final class SignalServiceProtos { } else { result.wrappers_ = wrappersBuilder_.build(); } + if (((from_bitField0_ & 0x00000080) == 0x00000080)) { + to_bitField0_ |= 0x00000010; + } + result.expireTimer_ = expireTimer_; result.bitField0_ = to_bitField0_; onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof SignalServiceProtos.DataMessage.ClosedGroupControlMessage) { - return mergeFrom((SignalServiceProtos.DataMessage.ClosedGroupControlMessage)other); + if (other instanceof org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage) { + return mergeFrom((org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(SignalServiceProtos.DataMessage.ClosedGroupControlMessage other) { - if (other == SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance()) return this; + public Builder mergeFrom(org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage other) { + if (other == org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance()) return this; if (other.hasType()) { setType(other.getType()); } @@ -10676,6 +10721,9 @@ public final class SignalServiceProtos { } } } + if (other.hasExpireTimer()) { + setExpireTimer(other.getExpireTimer()); + } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -10704,11 +10752,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - SignalServiceProtos.DataMessage.ClosedGroupControlMessage parsedMessage = null; + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (SignalServiceProtos.DataMessage.ClosedGroupControlMessage) e.getUnfinishedMessage(); + parsedMessage = (org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -10720,7 +10768,7 @@ public final class SignalServiceProtos { private int bitField0_; // required .signalservice.DataMessage.ClosedGroupControlMessage.Type type = 1; - private SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type type_ = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NEW; + private org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type type_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NEW; /** * required .signalservice.DataMessage.ClosedGroupControlMessage.Type type = 1; * @@ -10738,7 +10786,7 @@ public final class SignalServiceProtos { * @required * */ - public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type getType() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type getType() { return type_; } /** @@ -10748,7 +10796,7 @@ public final class SignalServiceProtos { * @required * */ - public Builder setType(SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type value) { + public Builder setType(org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type value) { if (value == null) { throw new NullPointerException(); } @@ -10766,7 +10814,7 @@ public final class SignalServiceProtos { */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); - type_ = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NEW; + type_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NEW; onChanged(); return this; } @@ -10882,9 +10930,9 @@ public final class SignalServiceProtos { } // optional .signalservice.KeyPair encryptionKeyPair = 4; - private SignalServiceProtos.KeyPair encryptionKeyPair_ = SignalServiceProtos.KeyPair.getDefaultInstance(); + private org.session.libsignal.protos.SignalServiceProtos.KeyPair encryptionKeyPair_ = org.session.libsignal.protos.SignalServiceProtos.KeyPair.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.KeyPair, SignalServiceProtos.KeyPair.Builder, SignalServiceProtos.KeyPairOrBuilder> encryptionKeyPairBuilder_; + org.session.libsignal.protos.SignalServiceProtos.KeyPair, org.session.libsignal.protos.SignalServiceProtos.KeyPair.Builder, org.session.libsignal.protos.SignalServiceProtos.KeyPairOrBuilder> encryptionKeyPairBuilder_; /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ @@ -10894,7 +10942,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - public SignalServiceProtos.KeyPair getEncryptionKeyPair() { + public org.session.libsignal.protos.SignalServiceProtos.KeyPair getEncryptionKeyPair() { if (encryptionKeyPairBuilder_ == null) { return encryptionKeyPair_; } else { @@ -10904,7 +10952,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - public Builder setEncryptionKeyPair(SignalServiceProtos.KeyPair value) { + public Builder setEncryptionKeyPair(org.session.libsignal.protos.SignalServiceProtos.KeyPair value) { if (encryptionKeyPairBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -10921,7 +10969,7 @@ public final class SignalServiceProtos { * optional .signalservice.KeyPair encryptionKeyPair = 4; */ public Builder setEncryptionKeyPair( - SignalServiceProtos.KeyPair.Builder builderForValue) { + org.session.libsignal.protos.SignalServiceProtos.KeyPair.Builder builderForValue) { if (encryptionKeyPairBuilder_ == null) { encryptionKeyPair_ = builderForValue.build(); onChanged(); @@ -10934,12 +10982,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - public Builder mergeEncryptionKeyPair(SignalServiceProtos.KeyPair value) { + public Builder mergeEncryptionKeyPair(org.session.libsignal.protos.SignalServiceProtos.KeyPair value) { if (encryptionKeyPairBuilder_ == null) { if (((bitField0_ & 0x00000008) == 0x00000008) && - encryptionKeyPair_ != SignalServiceProtos.KeyPair.getDefaultInstance()) { + encryptionKeyPair_ != org.session.libsignal.protos.SignalServiceProtos.KeyPair.getDefaultInstance()) { encryptionKeyPair_ = - SignalServiceProtos.KeyPair.newBuilder(encryptionKeyPair_).mergeFrom(value).buildPartial(); + org.session.libsignal.protos.SignalServiceProtos.KeyPair.newBuilder(encryptionKeyPair_).mergeFrom(value).buildPartial(); } else { encryptionKeyPair_ = value; } @@ -10955,7 +11003,7 @@ public final class SignalServiceProtos { */ public Builder clearEncryptionKeyPair() { if (encryptionKeyPairBuilder_ == null) { - encryptionKeyPair_ = SignalServiceProtos.KeyPair.getDefaultInstance(); + encryptionKeyPair_ = org.session.libsignal.protos.SignalServiceProtos.KeyPair.getDefaultInstance(); onChanged(); } else { encryptionKeyPairBuilder_.clear(); @@ -10966,7 +11014,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - public SignalServiceProtos.KeyPair.Builder getEncryptionKeyPairBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.KeyPair.Builder getEncryptionKeyPairBuilder() { bitField0_ |= 0x00000008; onChanged(); return getEncryptionKeyPairFieldBuilder().getBuilder(); @@ -10974,7 +11022,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - public SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder() { if (encryptionKeyPairBuilder_ != null) { return encryptionKeyPairBuilder_.getMessageOrBuilder(); } else { @@ -10985,11 +11033,11 @@ public final class SignalServiceProtos { * optional .signalservice.KeyPair encryptionKeyPair = 4; */ private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.KeyPair, SignalServiceProtos.KeyPair.Builder, SignalServiceProtos.KeyPairOrBuilder> + org.session.libsignal.protos.SignalServiceProtos.KeyPair, org.session.libsignal.protos.SignalServiceProtos.KeyPair.Builder, org.session.libsignal.protos.SignalServiceProtos.KeyPairOrBuilder> getEncryptionKeyPairFieldBuilder() { if (encryptionKeyPairBuilder_ == null) { encryptionKeyPairBuilder_ = new com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.KeyPair, SignalServiceProtos.KeyPair.Builder, SignalServiceProtos.KeyPairOrBuilder>( + org.session.libsignal.protos.SignalServiceProtos.KeyPair, org.session.libsignal.protos.SignalServiceProtos.KeyPair.Builder, org.session.libsignal.protos.SignalServiceProtos.KeyPairOrBuilder>( encryptionKeyPair_, getParentForChildren(), isClean()); @@ -11143,22 +11191,22 @@ public final class SignalServiceProtos { } // repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; - private java.util.List wrappers_ = + private java.util.List wrappers_ = java.util.Collections.emptyList(); private void ensureWrappersIsMutable() { if (!((bitField0_ & 0x00000040) == 0x00000040)) { - wrappers_ = new java.util.ArrayList(wrappers_); + wrappers_ = new java.util.ArrayList(wrappers_); bitField0_ |= 0x00000040; } } private com.google.protobuf.RepeatedFieldBuilder< - SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder> wrappersBuilder_; + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper, org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder, org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder> wrappersBuilder_; /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public java.util.List getWrappersList() { + public java.util.List getWrappersList() { if (wrappersBuilder_ == null) { return java.util.Collections.unmodifiableList(wrappers_); } else { @@ -11178,7 +11226,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper getWrappers(int index) { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper getWrappers(int index) { if (wrappersBuilder_ == null) { return wrappers_.get(index); } else { @@ -11189,7 +11237,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ public Builder setWrappers( - int index, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper value) { + int index, org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper value) { if (wrappersBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11206,7 +11254,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ public Builder setWrappers( - int index, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder builderForValue) { + int index, org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder builderForValue) { if (wrappersBuilder_ == null) { ensureWrappersIsMutable(); wrappers_.set(index, builderForValue.build()); @@ -11219,7 +11267,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public Builder addWrappers(SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper value) { + public Builder addWrappers(org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper value) { if (wrappersBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11236,7 +11284,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ public Builder addWrappers( - int index, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper value) { + int index, org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper value) { if (wrappersBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11253,7 +11301,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ public Builder addWrappers( - SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder builderForValue) { + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder builderForValue) { if (wrappersBuilder_ == null) { ensureWrappersIsMutable(); wrappers_.add(builderForValue.build()); @@ -11267,7 +11315,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ public Builder addWrappers( - int index, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder builderForValue) { + int index, org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder builderForValue) { if (wrappersBuilder_ == null) { ensureWrappersIsMutable(); wrappers_.add(index, builderForValue.build()); @@ -11281,7 +11329,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ public Builder addAllWrappers( - java.lang.Iterable values) { + java.lang.Iterable values) { if (wrappersBuilder_ == null) { ensureWrappersIsMutable(); super.addAll(values, wrappers_); @@ -11320,14 +11368,14 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder getWrappersBuilder( + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder getWrappersBuilder( int index) { return getWrappersFieldBuilder().getBuilder(index); } /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder getWrappersOrBuilder( + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder getWrappersOrBuilder( int index) { if (wrappersBuilder_ == null) { return wrappers_.get(index); } else { @@ -11337,7 +11385,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public java.util.List + public java.util.List getWrappersOrBuilderList() { if (wrappersBuilder_ != null) { return wrappersBuilder_.getMessageOrBuilderList(); @@ -11348,31 +11396,31 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder addWrappersBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder addWrappersBuilder() { return getWrappersFieldBuilder().addBuilder( - SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.getDefaultInstance()); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.getDefaultInstance()); } /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder addWrappersBuilder( + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder addWrappersBuilder( int index) { return getWrappersFieldBuilder().addBuilder( - index, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.getDefaultInstance()); + index, org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.getDefaultInstance()); } /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public java.util.List + public java.util.List getWrappersBuilderList() { return getWrappersFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder> + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper, org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder, org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder> getWrappersFieldBuilder() { if (wrappersBuilder_ == null) { wrappersBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder>( + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper, org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder, org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder>( wrappers_, ((bitField0_ & 0x00000040) == 0x00000040), getParentForChildren(), @@ -11382,6 +11430,39 @@ public final class SignalServiceProtos { return wrappersBuilder_; } + // optional uint32 expireTimer = 8; + private int expireTimer_ ; + /** + * optional uint32 expireTimer = 8; + */ + public boolean hasExpireTimer() { + return ((bitField0_ & 0x00000080) == 0x00000080); + } + /** + * optional uint32 expireTimer = 8; + */ + public int getExpireTimer() { + return expireTimer_; + } + /** + * optional uint32 expireTimer = 8; + */ + public Builder setExpireTimer(int value) { + bitField0_ |= 0x00000080; + expireTimer_ = value; + onChanged(); + return this; + } + /** + * optional uint32 expireTimer = 8; + */ + public Builder clearExpireTimer() { + bitField0_ = (bitField0_ & ~0x00000080); + expireTimer_ = 0; + onChanged(); + return this; + } + // @@protoc_insertion_point(builder_scope:signalservice.DataMessage.ClosedGroupControlMessage) } @@ -11439,17 +11520,17 @@ public final class SignalServiceProtos { // repeated .signalservice.AttachmentPointer attachments = 2; public static final int ATTACHMENTS_FIELD_NUMBER = 2; - private java.util.List attachments_; + private java.util.List attachments_; /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public java.util.List getAttachmentsList() { + public java.util.List getAttachmentsList() { return attachments_; } /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public java.util.List + public java.util.List getAttachmentsOrBuilderList() { return attachments_; } @@ -11462,20 +11543,20 @@ public final class SignalServiceProtos { /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public SignalServiceProtos.AttachmentPointer getAttachments(int index) { + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer getAttachments(int index) { return attachments_.get(index); } /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public SignalServiceProtos.AttachmentPointerOrBuilder getAttachmentsOrBuilder( + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder getAttachmentsOrBuilder( int index) { return attachments_.get(index); } // optional .signalservice.GroupContext group = 3; public static final int GROUP_FIELD_NUMBER = 3; - private SignalServiceProtos.GroupContext group_; + private org.session.libsignal.protos.SignalServiceProtos.GroupContext group_; /** * optional .signalservice.GroupContext group = 3; */ @@ -11485,13 +11566,13 @@ public final class SignalServiceProtos { /** * optional .signalservice.GroupContext group = 3; */ - public SignalServiceProtos.GroupContext getGroup() { + public org.session.libsignal.protos.SignalServiceProtos.GroupContext getGroup() { return group_; } /** * optional .signalservice.GroupContext group = 3; */ - public SignalServiceProtos.GroupContextOrBuilder getGroupOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.GroupContextOrBuilder getGroupOrBuilder() { return group_; } @@ -11561,7 +11642,7 @@ public final class SignalServiceProtos { // optional .signalservice.DataMessage.Quote quote = 8; public static final int QUOTE_FIELD_NUMBER = 8; - private SignalServiceProtos.DataMessage.Quote quote_; + private org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote quote_; /** * optional .signalservice.DataMessage.Quote quote = 8; */ @@ -11571,29 +11652,29 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.Quote quote = 8; */ - public SignalServiceProtos.DataMessage.Quote getQuote() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote getQuote() { return quote_; } /** * optional .signalservice.DataMessage.Quote quote = 8; */ - public SignalServiceProtos.DataMessage.QuoteOrBuilder getQuoteOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.QuoteOrBuilder getQuoteOrBuilder() { return quote_; } // repeated .signalservice.DataMessage.Preview preview = 10; public static final int PREVIEW_FIELD_NUMBER = 10; - private java.util.List preview_; + private java.util.List preview_; /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public java.util.List getPreviewList() { + public java.util.List getPreviewList() { return preview_; } /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public java.util.List + public java.util.List getPreviewOrBuilderList() { return preview_; } @@ -11606,20 +11687,20 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public SignalServiceProtos.DataMessage.Preview getPreview(int index) { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview getPreview(int index) { return preview_.get(index); } /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public SignalServiceProtos.DataMessage.PreviewOrBuilder getPreviewOrBuilder( + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.PreviewOrBuilder getPreviewOrBuilder( int index) { return preview_.get(index); } // optional .signalservice.DataMessage.LokiProfile profile = 101; public static final int PROFILE_FIELD_NUMBER = 101; - private SignalServiceProtos.DataMessage.LokiProfile profile_; + private org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile profile_; /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ @@ -11629,19 +11710,19 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - public SignalServiceProtos.DataMessage.LokiProfile getProfile() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile getProfile() { return profile_; } /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - public SignalServiceProtos.DataMessage.LokiProfileOrBuilder getProfileOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfileOrBuilder getProfileOrBuilder() { return profile_; } // optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; public static final int OPENGROUPINVITATION_FIELD_NUMBER = 102; - private SignalServiceProtos.DataMessage.OpenGroupInvitation openGroupInvitation_; + private org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation openGroupInvitation_; /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ @@ -11651,19 +11732,19 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - public SignalServiceProtos.DataMessage.OpenGroupInvitation getOpenGroupInvitation() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation getOpenGroupInvitation() { return openGroupInvitation_; } /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - public SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder() { return openGroupInvitation_; } // optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; public static final int CLOSEDGROUPCONTROLMESSAGE_FIELD_NUMBER = 104; - private SignalServiceProtos.DataMessage.ClosedGroupControlMessage closedGroupControlMessage_; + private org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage closedGroupControlMessage_; /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ @@ -11673,13 +11754,13 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - public SignalServiceProtos.DataMessage.ClosedGroupControlMessage getClosedGroupControlMessage() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage getClosedGroupControlMessage() { return closedGroupControlMessage_; } /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - public SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder getClosedGroupControlMessageOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder getClosedGroupControlMessageOrBuilder() { return closedGroupControlMessage_; } @@ -11729,16 +11810,16 @@ public final class SignalServiceProtos { private void initFields() { body_ = ""; attachments_ = java.util.Collections.emptyList(); - group_ = SignalServiceProtos.GroupContext.getDefaultInstance(); + group_ = org.session.libsignal.protos.SignalServiceProtos.GroupContext.getDefaultInstance(); flags_ = 0; expireTimer_ = 0; profileKey_ = com.google.protobuf.ByteString.EMPTY; timestamp_ = 0L; - quote_ = SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); + quote_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); preview_ = java.util.Collections.emptyList(); - profile_ = SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); - openGroupInvitation_ = SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); - closedGroupControlMessage_ = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); + profile_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); + openGroupInvitation_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); + closedGroupControlMessage_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); syncTarget_ = ""; } private byte memoizedIsInitialized = -1; @@ -11901,53 +11982,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static SignalServiceProtos.DataMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.DataMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.DataMessage parseFrom(byte[] data) + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.DataMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.DataMessage parseFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.DataMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static SignalServiceProtos.DataMessage parseDelimitedFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static SignalServiceProtos.DataMessage parseDelimitedFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static SignalServiceProtos.DataMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.DataMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.DataMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -11956,7 +12037,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(SignalServiceProtos.DataMessage prototype) { + public static Builder newBuilder(org.session.libsignal.protos.SignalServiceProtos.DataMessage prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -11972,17 +12053,17 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements SignalServiceProtos.DataMessageOrBuilder { + implements org.session.libsignal.protos.SignalServiceProtos.DataMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.DataMessage.class, SignalServiceProtos.DataMessage.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.class, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Builder.class); } // Construct using org.session.libsignal.protos.SignalServiceProtos.DataMessage.newBuilder() @@ -12021,7 +12102,7 @@ public final class SignalServiceProtos { attachmentsBuilder_.clear(); } if (groupBuilder_ == null) { - group_ = SignalServiceProtos.GroupContext.getDefaultInstance(); + group_ = org.session.libsignal.protos.SignalServiceProtos.GroupContext.getDefaultInstance(); } else { groupBuilder_.clear(); } @@ -12035,7 +12116,7 @@ public final class SignalServiceProtos { timestamp_ = 0L; bitField0_ = (bitField0_ & ~0x00000040); if (quoteBuilder_ == null) { - quote_ = SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); + quote_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); } else { quoteBuilder_.clear(); } @@ -12047,19 +12128,19 @@ public final class SignalServiceProtos { previewBuilder_.clear(); } if (profileBuilder_ == null) { - profile_ = SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); + profile_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); } else { profileBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000200); if (openGroupInvitationBuilder_ == null) { - openGroupInvitation_ = SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); + openGroupInvitation_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); } else { openGroupInvitationBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000400); if (closedGroupControlMessageBuilder_ == null) { - closedGroupControlMessage_ = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); + closedGroupControlMessage_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); } else { closedGroupControlMessageBuilder_.clear(); } @@ -12075,23 +12156,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return SignalServiceProtos.internal_static_signalservice_DataMessage_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_DataMessage_descriptor; } - public SignalServiceProtos.DataMessage getDefaultInstanceForType() { - return SignalServiceProtos.DataMessage.getDefaultInstance(); + public org.session.libsignal.protos.SignalServiceProtos.DataMessage getDefaultInstanceForType() { + return org.session.libsignal.protos.SignalServiceProtos.DataMessage.getDefaultInstance(); } - public SignalServiceProtos.DataMessage build() { - SignalServiceProtos.DataMessage result = buildPartial(); + public org.session.libsignal.protos.SignalServiceProtos.DataMessage build() { + org.session.libsignal.protos.SignalServiceProtos.DataMessage result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public SignalServiceProtos.DataMessage buildPartial() { - SignalServiceProtos.DataMessage result = new SignalServiceProtos.DataMessage(this); + public org.session.libsignal.protos.SignalServiceProtos.DataMessage buildPartial() { + org.session.libsignal.protos.SignalServiceProtos.DataMessage result = new org.session.libsignal.protos.SignalServiceProtos.DataMessage(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -12182,16 +12263,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof SignalServiceProtos.DataMessage) { - return mergeFrom((SignalServiceProtos.DataMessage)other); + if (other instanceof org.session.libsignal.protos.SignalServiceProtos.DataMessage) { + return mergeFrom((org.session.libsignal.protos.SignalServiceProtos.DataMessage)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(SignalServiceProtos.DataMessage other) { - if (other == SignalServiceProtos.DataMessage.getDefaultInstance()) return this; + public Builder mergeFrom(org.session.libsignal.protos.SignalServiceProtos.DataMessage other) { + if (other == org.session.libsignal.protos.SignalServiceProtos.DataMessage.getDefaultInstance()) return this; if (other.hasBody()) { bitField0_ |= 0x00000001; body_ = other.body_; @@ -12329,11 +12410,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - SignalServiceProtos.DataMessage parsedMessage = null; + org.session.libsignal.protos.SignalServiceProtos.DataMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (SignalServiceProtos.DataMessage) e.getUnfinishedMessage(); + parsedMessage = (org.session.libsignal.protos.SignalServiceProtos.DataMessage) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -12419,22 +12500,22 @@ public final class SignalServiceProtos { } // repeated .signalservice.AttachmentPointer attachments = 2; - private java.util.List attachments_ = + private java.util.List attachments_ = java.util.Collections.emptyList(); private void ensureAttachmentsIsMutable() { if (!((bitField0_ & 0x00000002) == 0x00000002)) { - attachments_ = new java.util.ArrayList(attachments_); + attachments_ = new java.util.ArrayList(attachments_); bitField0_ |= 0x00000002; } } private com.google.protobuf.RepeatedFieldBuilder< - SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder> attachmentsBuilder_; + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder> attachmentsBuilder_; /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public java.util.List getAttachmentsList() { + public java.util.List getAttachmentsList() { if (attachmentsBuilder_ == null) { return java.util.Collections.unmodifiableList(attachments_); } else { @@ -12454,7 +12535,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public SignalServiceProtos.AttachmentPointer getAttachments(int index) { + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer getAttachments(int index) { if (attachmentsBuilder_ == null) { return attachments_.get(index); } else { @@ -12465,7 +12546,7 @@ public final class SignalServiceProtos { * repeated .signalservice.AttachmentPointer attachments = 2; */ public Builder setAttachments( - int index, SignalServiceProtos.AttachmentPointer value) { + int index, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer value) { if (attachmentsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12482,7 +12563,7 @@ public final class SignalServiceProtos { * repeated .signalservice.AttachmentPointer attachments = 2; */ public Builder setAttachments( - int index, SignalServiceProtos.AttachmentPointer.Builder builderForValue) { + int index, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder builderForValue) { if (attachmentsBuilder_ == null) { ensureAttachmentsIsMutable(); attachments_.set(index, builderForValue.build()); @@ -12495,7 +12576,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public Builder addAttachments(SignalServiceProtos.AttachmentPointer value) { + public Builder addAttachments(org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer value) { if (attachmentsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12512,7 +12593,7 @@ public final class SignalServiceProtos { * repeated .signalservice.AttachmentPointer attachments = 2; */ public Builder addAttachments( - int index, SignalServiceProtos.AttachmentPointer value) { + int index, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer value) { if (attachmentsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12529,7 +12610,7 @@ public final class SignalServiceProtos { * repeated .signalservice.AttachmentPointer attachments = 2; */ public Builder addAttachments( - SignalServiceProtos.AttachmentPointer.Builder builderForValue) { + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder builderForValue) { if (attachmentsBuilder_ == null) { ensureAttachmentsIsMutable(); attachments_.add(builderForValue.build()); @@ -12543,7 +12624,7 @@ public final class SignalServiceProtos { * repeated .signalservice.AttachmentPointer attachments = 2; */ public Builder addAttachments( - int index, SignalServiceProtos.AttachmentPointer.Builder builderForValue) { + int index, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder builderForValue) { if (attachmentsBuilder_ == null) { ensureAttachmentsIsMutable(); attachments_.add(index, builderForValue.build()); @@ -12557,7 +12638,7 @@ public final class SignalServiceProtos { * repeated .signalservice.AttachmentPointer attachments = 2; */ public Builder addAllAttachments( - java.lang.Iterable values) { + java.lang.Iterable values) { if (attachmentsBuilder_ == null) { ensureAttachmentsIsMutable(); super.addAll(values, attachments_); @@ -12596,14 +12677,14 @@ public final class SignalServiceProtos { /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public SignalServiceProtos.AttachmentPointer.Builder getAttachmentsBuilder( + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder getAttachmentsBuilder( int index) { return getAttachmentsFieldBuilder().getBuilder(index); } /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public SignalServiceProtos.AttachmentPointerOrBuilder getAttachmentsOrBuilder( + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder getAttachmentsOrBuilder( int index) { if (attachmentsBuilder_ == null) { return attachments_.get(index); } else { @@ -12613,7 +12694,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public java.util.List + public java.util.List getAttachmentsOrBuilderList() { if (attachmentsBuilder_ != null) { return attachmentsBuilder_.getMessageOrBuilderList(); @@ -12624,31 +12705,31 @@ public final class SignalServiceProtos { /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public SignalServiceProtos.AttachmentPointer.Builder addAttachmentsBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder addAttachmentsBuilder() { return getAttachmentsFieldBuilder().addBuilder( - SignalServiceProtos.AttachmentPointer.getDefaultInstance()); + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.getDefaultInstance()); } /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public SignalServiceProtos.AttachmentPointer.Builder addAttachmentsBuilder( + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder addAttachmentsBuilder( int index) { return getAttachmentsFieldBuilder().addBuilder( - index, SignalServiceProtos.AttachmentPointer.getDefaultInstance()); + index, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.getDefaultInstance()); } /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public java.util.List + public java.util.List getAttachmentsBuilderList() { return getAttachmentsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder> + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder> getAttachmentsFieldBuilder() { if (attachmentsBuilder_ == null) { attachmentsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder>( + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder>( attachments_, ((bitField0_ & 0x00000002) == 0x00000002), getParentForChildren(), @@ -12659,9 +12740,9 @@ public final class SignalServiceProtos { } // optional .signalservice.GroupContext group = 3; - private SignalServiceProtos.GroupContext group_ = SignalServiceProtos.GroupContext.getDefaultInstance(); + private org.session.libsignal.protos.SignalServiceProtos.GroupContext group_ = org.session.libsignal.protos.SignalServiceProtos.GroupContext.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.GroupContext, SignalServiceProtos.GroupContext.Builder, SignalServiceProtos.GroupContextOrBuilder> groupBuilder_; + org.session.libsignal.protos.SignalServiceProtos.GroupContext, org.session.libsignal.protos.SignalServiceProtos.GroupContext.Builder, org.session.libsignal.protos.SignalServiceProtos.GroupContextOrBuilder> groupBuilder_; /** * optional .signalservice.GroupContext group = 3; */ @@ -12671,7 +12752,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.GroupContext group = 3; */ - public SignalServiceProtos.GroupContext getGroup() { + public org.session.libsignal.protos.SignalServiceProtos.GroupContext getGroup() { if (groupBuilder_ == null) { return group_; } else { @@ -12681,7 +12762,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.GroupContext group = 3; */ - public Builder setGroup(SignalServiceProtos.GroupContext value) { + public Builder setGroup(org.session.libsignal.protos.SignalServiceProtos.GroupContext value) { if (groupBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12698,7 +12779,7 @@ public final class SignalServiceProtos { * optional .signalservice.GroupContext group = 3; */ public Builder setGroup( - SignalServiceProtos.GroupContext.Builder builderForValue) { + org.session.libsignal.protos.SignalServiceProtos.GroupContext.Builder builderForValue) { if (groupBuilder_ == null) { group_ = builderForValue.build(); onChanged(); @@ -12711,12 +12792,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.GroupContext group = 3; */ - public Builder mergeGroup(SignalServiceProtos.GroupContext value) { + public Builder mergeGroup(org.session.libsignal.protos.SignalServiceProtos.GroupContext value) { if (groupBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - group_ != SignalServiceProtos.GroupContext.getDefaultInstance()) { + group_ != org.session.libsignal.protos.SignalServiceProtos.GroupContext.getDefaultInstance()) { group_ = - SignalServiceProtos.GroupContext.newBuilder(group_).mergeFrom(value).buildPartial(); + org.session.libsignal.protos.SignalServiceProtos.GroupContext.newBuilder(group_).mergeFrom(value).buildPartial(); } else { group_ = value; } @@ -12732,7 +12813,7 @@ public final class SignalServiceProtos { */ public Builder clearGroup() { if (groupBuilder_ == null) { - group_ = SignalServiceProtos.GroupContext.getDefaultInstance(); + group_ = org.session.libsignal.protos.SignalServiceProtos.GroupContext.getDefaultInstance(); onChanged(); } else { groupBuilder_.clear(); @@ -12743,7 +12824,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.GroupContext group = 3; */ - public SignalServiceProtos.GroupContext.Builder getGroupBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.GroupContext.Builder getGroupBuilder() { bitField0_ |= 0x00000004; onChanged(); return getGroupFieldBuilder().getBuilder(); @@ -12751,7 +12832,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.GroupContext group = 3; */ - public SignalServiceProtos.GroupContextOrBuilder getGroupOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.GroupContextOrBuilder getGroupOrBuilder() { if (groupBuilder_ != null) { return groupBuilder_.getMessageOrBuilder(); } else { @@ -12762,11 +12843,11 @@ public final class SignalServiceProtos { * optional .signalservice.GroupContext group = 3; */ private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.GroupContext, SignalServiceProtos.GroupContext.Builder, SignalServiceProtos.GroupContextOrBuilder> + org.session.libsignal.protos.SignalServiceProtos.GroupContext, org.session.libsignal.protos.SignalServiceProtos.GroupContext.Builder, org.session.libsignal.protos.SignalServiceProtos.GroupContextOrBuilder> getGroupFieldBuilder() { if (groupBuilder_ == null) { groupBuilder_ = new com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.GroupContext, SignalServiceProtos.GroupContext.Builder, SignalServiceProtos.GroupContextOrBuilder>( + org.session.libsignal.protos.SignalServiceProtos.GroupContext, org.session.libsignal.protos.SignalServiceProtos.GroupContext.Builder, org.session.libsignal.protos.SignalServiceProtos.GroupContextOrBuilder>( group_, getParentForChildren(), isClean()); @@ -12911,9 +12992,9 @@ public final class SignalServiceProtos { } // optional .signalservice.DataMessage.Quote quote = 8; - private SignalServiceProtos.DataMessage.Quote quote_ = SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); + private org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote quote_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.DataMessage.Quote, SignalServiceProtos.DataMessage.Quote.Builder, SignalServiceProtos.DataMessage.QuoteOrBuilder> quoteBuilder_; + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.Builder, org.session.libsignal.protos.SignalServiceProtos.DataMessage.QuoteOrBuilder> quoteBuilder_; /** * optional .signalservice.DataMessage.Quote quote = 8; */ @@ -12923,7 +13004,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.Quote quote = 8; */ - public SignalServiceProtos.DataMessage.Quote getQuote() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote getQuote() { if (quoteBuilder_ == null) { return quote_; } else { @@ -12933,7 +13014,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.Quote quote = 8; */ - public Builder setQuote(SignalServiceProtos.DataMessage.Quote value) { + public Builder setQuote(org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote value) { if (quoteBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12950,7 +13031,7 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.Quote quote = 8; */ public Builder setQuote( - SignalServiceProtos.DataMessage.Quote.Builder builderForValue) { + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.Builder builderForValue) { if (quoteBuilder_ == null) { quote_ = builderForValue.build(); onChanged(); @@ -12963,12 +13044,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.Quote quote = 8; */ - public Builder mergeQuote(SignalServiceProtos.DataMessage.Quote value) { + public Builder mergeQuote(org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote value) { if (quoteBuilder_ == null) { if (((bitField0_ & 0x00000080) == 0x00000080) && - quote_ != SignalServiceProtos.DataMessage.Quote.getDefaultInstance()) { + quote_ != org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.getDefaultInstance()) { quote_ = - SignalServiceProtos.DataMessage.Quote.newBuilder(quote_).mergeFrom(value).buildPartial(); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.newBuilder(quote_).mergeFrom(value).buildPartial(); } else { quote_ = value; } @@ -12984,7 +13065,7 @@ public final class SignalServiceProtos { */ public Builder clearQuote() { if (quoteBuilder_ == null) { - quote_ = SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); + quote_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); onChanged(); } else { quoteBuilder_.clear(); @@ -12995,7 +13076,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.Quote quote = 8; */ - public SignalServiceProtos.DataMessage.Quote.Builder getQuoteBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.Builder getQuoteBuilder() { bitField0_ |= 0x00000080; onChanged(); return getQuoteFieldBuilder().getBuilder(); @@ -13003,7 +13084,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.Quote quote = 8; */ - public SignalServiceProtos.DataMessage.QuoteOrBuilder getQuoteOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.QuoteOrBuilder getQuoteOrBuilder() { if (quoteBuilder_ != null) { return quoteBuilder_.getMessageOrBuilder(); } else { @@ -13014,11 +13095,11 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.Quote quote = 8; */ private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.DataMessage.Quote, SignalServiceProtos.DataMessage.Quote.Builder, SignalServiceProtos.DataMessage.QuoteOrBuilder> + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.Builder, org.session.libsignal.protos.SignalServiceProtos.DataMessage.QuoteOrBuilder> getQuoteFieldBuilder() { if (quoteBuilder_ == null) { quoteBuilder_ = new com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.DataMessage.Quote, SignalServiceProtos.DataMessage.Quote.Builder, SignalServiceProtos.DataMessage.QuoteOrBuilder>( + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.Builder, org.session.libsignal.protos.SignalServiceProtos.DataMessage.QuoteOrBuilder>( quote_, getParentForChildren(), isClean()); @@ -13028,22 +13109,22 @@ public final class SignalServiceProtos { } // repeated .signalservice.DataMessage.Preview preview = 10; - private java.util.List preview_ = + private java.util.List preview_ = java.util.Collections.emptyList(); private void ensurePreviewIsMutable() { if (!((bitField0_ & 0x00000100) == 0x00000100)) { - preview_ = new java.util.ArrayList(preview_); + preview_ = new java.util.ArrayList(preview_); bitField0_ |= 0x00000100; } } private com.google.protobuf.RepeatedFieldBuilder< - SignalServiceProtos.DataMessage.Preview, SignalServiceProtos.DataMessage.Preview.Builder, SignalServiceProtos.DataMessage.PreviewOrBuilder> previewBuilder_; + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview.Builder, org.session.libsignal.protos.SignalServiceProtos.DataMessage.PreviewOrBuilder> previewBuilder_; /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public java.util.List getPreviewList() { + public java.util.List getPreviewList() { if (previewBuilder_ == null) { return java.util.Collections.unmodifiableList(preview_); } else { @@ -13063,7 +13144,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public SignalServiceProtos.DataMessage.Preview getPreview(int index) { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview getPreview(int index) { if (previewBuilder_ == null) { return preview_.get(index); } else { @@ -13074,7 +13155,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Preview preview = 10; */ public Builder setPreview( - int index, SignalServiceProtos.DataMessage.Preview value) { + int index, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview value) { if (previewBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13091,7 +13172,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Preview preview = 10; */ public Builder setPreview( - int index, SignalServiceProtos.DataMessage.Preview.Builder builderForValue) { + int index, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview.Builder builderForValue) { if (previewBuilder_ == null) { ensurePreviewIsMutable(); preview_.set(index, builderForValue.build()); @@ -13104,7 +13185,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public Builder addPreview(SignalServiceProtos.DataMessage.Preview value) { + public Builder addPreview(org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview value) { if (previewBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13121,7 +13202,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Preview preview = 10; */ public Builder addPreview( - int index, SignalServiceProtos.DataMessage.Preview value) { + int index, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview value) { if (previewBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13138,7 +13219,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Preview preview = 10; */ public Builder addPreview( - SignalServiceProtos.DataMessage.Preview.Builder builderForValue) { + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview.Builder builderForValue) { if (previewBuilder_ == null) { ensurePreviewIsMutable(); preview_.add(builderForValue.build()); @@ -13152,7 +13233,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Preview preview = 10; */ public Builder addPreview( - int index, SignalServiceProtos.DataMessage.Preview.Builder builderForValue) { + int index, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview.Builder builderForValue) { if (previewBuilder_ == null) { ensurePreviewIsMutable(); preview_.add(index, builderForValue.build()); @@ -13166,7 +13247,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Preview preview = 10; */ public Builder addAllPreview( - java.lang.Iterable values) { + java.lang.Iterable values) { if (previewBuilder_ == null) { ensurePreviewIsMutable(); super.addAll(values, preview_); @@ -13205,14 +13286,14 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public SignalServiceProtos.DataMessage.Preview.Builder getPreviewBuilder( + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview.Builder getPreviewBuilder( int index) { return getPreviewFieldBuilder().getBuilder(index); } /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public SignalServiceProtos.DataMessage.PreviewOrBuilder getPreviewOrBuilder( + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.PreviewOrBuilder getPreviewOrBuilder( int index) { if (previewBuilder_ == null) { return preview_.get(index); } else { @@ -13222,7 +13303,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public java.util.List + public java.util.List getPreviewOrBuilderList() { if (previewBuilder_ != null) { return previewBuilder_.getMessageOrBuilderList(); @@ -13233,31 +13314,31 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public SignalServiceProtos.DataMessage.Preview.Builder addPreviewBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview.Builder addPreviewBuilder() { return getPreviewFieldBuilder().addBuilder( - SignalServiceProtos.DataMessage.Preview.getDefaultInstance()); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview.getDefaultInstance()); } /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public SignalServiceProtos.DataMessage.Preview.Builder addPreviewBuilder( + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview.Builder addPreviewBuilder( int index) { return getPreviewFieldBuilder().addBuilder( - index, SignalServiceProtos.DataMessage.Preview.getDefaultInstance()); + index, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview.getDefaultInstance()); } /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public java.util.List + public java.util.List getPreviewBuilderList() { return getPreviewFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - SignalServiceProtos.DataMessage.Preview, SignalServiceProtos.DataMessage.Preview.Builder, SignalServiceProtos.DataMessage.PreviewOrBuilder> + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview.Builder, org.session.libsignal.protos.SignalServiceProtos.DataMessage.PreviewOrBuilder> getPreviewFieldBuilder() { if (previewBuilder_ == null) { previewBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - SignalServiceProtos.DataMessage.Preview, SignalServiceProtos.DataMessage.Preview.Builder, SignalServiceProtos.DataMessage.PreviewOrBuilder>( + org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview, org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview.Builder, org.session.libsignal.protos.SignalServiceProtos.DataMessage.PreviewOrBuilder>( preview_, ((bitField0_ & 0x00000100) == 0x00000100), getParentForChildren(), @@ -13268,9 +13349,9 @@ public final class SignalServiceProtos { } // optional .signalservice.DataMessage.LokiProfile profile = 101; - private SignalServiceProtos.DataMessage.LokiProfile profile_ = SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); + private org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile profile_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.DataMessage.LokiProfile, SignalServiceProtos.DataMessage.LokiProfile.Builder, SignalServiceProtos.DataMessage.LokiProfileOrBuilder> profileBuilder_; + org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile, org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile.Builder, org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfileOrBuilder> profileBuilder_; /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ @@ -13280,7 +13361,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - public SignalServiceProtos.DataMessage.LokiProfile getProfile() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile getProfile() { if (profileBuilder_ == null) { return profile_; } else { @@ -13290,7 +13371,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - public Builder setProfile(SignalServiceProtos.DataMessage.LokiProfile value) { + public Builder setProfile(org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile value) { if (profileBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13307,7 +13388,7 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.LokiProfile profile = 101; */ public Builder setProfile( - SignalServiceProtos.DataMessage.LokiProfile.Builder builderForValue) { + org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile.Builder builderForValue) { if (profileBuilder_ == null) { profile_ = builderForValue.build(); onChanged(); @@ -13320,12 +13401,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - public Builder mergeProfile(SignalServiceProtos.DataMessage.LokiProfile value) { + public Builder mergeProfile(org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile value) { if (profileBuilder_ == null) { if (((bitField0_ & 0x00000200) == 0x00000200) && - profile_ != SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance()) { + profile_ != org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance()) { profile_ = - SignalServiceProtos.DataMessage.LokiProfile.newBuilder(profile_).mergeFrom(value).buildPartial(); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile.newBuilder(profile_).mergeFrom(value).buildPartial(); } else { profile_ = value; } @@ -13341,7 +13422,7 @@ public final class SignalServiceProtos { */ public Builder clearProfile() { if (profileBuilder_ == null) { - profile_ = SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); + profile_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); onChanged(); } else { profileBuilder_.clear(); @@ -13352,7 +13433,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - public SignalServiceProtos.DataMessage.LokiProfile.Builder getProfileBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile.Builder getProfileBuilder() { bitField0_ |= 0x00000200; onChanged(); return getProfileFieldBuilder().getBuilder(); @@ -13360,7 +13441,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - public SignalServiceProtos.DataMessage.LokiProfileOrBuilder getProfileOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfileOrBuilder getProfileOrBuilder() { if (profileBuilder_ != null) { return profileBuilder_.getMessageOrBuilder(); } else { @@ -13371,11 +13452,11 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.LokiProfile profile = 101; */ private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.DataMessage.LokiProfile, SignalServiceProtos.DataMessage.LokiProfile.Builder, SignalServiceProtos.DataMessage.LokiProfileOrBuilder> + org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile, org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile.Builder, org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfileOrBuilder> getProfileFieldBuilder() { if (profileBuilder_ == null) { profileBuilder_ = new com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.DataMessage.LokiProfile, SignalServiceProtos.DataMessage.LokiProfile.Builder, SignalServiceProtos.DataMessage.LokiProfileOrBuilder>( + org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile, org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile.Builder, org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfileOrBuilder>( profile_, getParentForChildren(), isClean()); @@ -13385,9 +13466,9 @@ public final class SignalServiceProtos { } // optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; - private SignalServiceProtos.DataMessage.OpenGroupInvitation openGroupInvitation_ = SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); + private org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation openGroupInvitation_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.DataMessage.OpenGroupInvitation, SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder, SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder> openGroupInvitationBuilder_; + org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation, org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder, org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder> openGroupInvitationBuilder_; /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ @@ -13397,7 +13478,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - public SignalServiceProtos.DataMessage.OpenGroupInvitation getOpenGroupInvitation() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation getOpenGroupInvitation() { if (openGroupInvitationBuilder_ == null) { return openGroupInvitation_; } else { @@ -13407,7 +13488,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - public Builder setOpenGroupInvitation(SignalServiceProtos.DataMessage.OpenGroupInvitation value) { + public Builder setOpenGroupInvitation(org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation value) { if (openGroupInvitationBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13424,7 +13505,7 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ public Builder setOpenGroupInvitation( - SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder builderForValue) { + org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder builderForValue) { if (openGroupInvitationBuilder_ == null) { openGroupInvitation_ = builderForValue.build(); onChanged(); @@ -13437,12 +13518,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - public Builder mergeOpenGroupInvitation(SignalServiceProtos.DataMessage.OpenGroupInvitation value) { + public Builder mergeOpenGroupInvitation(org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation value) { if (openGroupInvitationBuilder_ == null) { if (((bitField0_ & 0x00000400) == 0x00000400) && - openGroupInvitation_ != SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance()) { + openGroupInvitation_ != org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance()) { openGroupInvitation_ = - SignalServiceProtos.DataMessage.OpenGroupInvitation.newBuilder(openGroupInvitation_).mergeFrom(value).buildPartial(); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation.newBuilder(openGroupInvitation_).mergeFrom(value).buildPartial(); } else { openGroupInvitation_ = value; } @@ -13458,7 +13539,7 @@ public final class SignalServiceProtos { */ public Builder clearOpenGroupInvitation() { if (openGroupInvitationBuilder_ == null) { - openGroupInvitation_ = SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); + openGroupInvitation_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); onChanged(); } else { openGroupInvitationBuilder_.clear(); @@ -13469,7 +13550,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - public SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder getOpenGroupInvitationBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder getOpenGroupInvitationBuilder() { bitField0_ |= 0x00000400; onChanged(); return getOpenGroupInvitationFieldBuilder().getBuilder(); @@ -13477,7 +13558,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - public SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder() { if (openGroupInvitationBuilder_ != null) { return openGroupInvitationBuilder_.getMessageOrBuilder(); } else { @@ -13488,11 +13569,11 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.DataMessage.OpenGroupInvitation, SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder, SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder> + org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation, org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder, org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder> getOpenGroupInvitationFieldBuilder() { if (openGroupInvitationBuilder_ == null) { openGroupInvitationBuilder_ = new com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.DataMessage.OpenGroupInvitation, SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder, SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder>( + org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation, org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder, org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder>( openGroupInvitation_, getParentForChildren(), isClean()); @@ -13502,9 +13583,9 @@ public final class SignalServiceProtos { } // optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; - private SignalServiceProtos.DataMessage.ClosedGroupControlMessage closedGroupControlMessage_ = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); + private org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage closedGroupControlMessage_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.DataMessage.ClosedGroupControlMessage, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder, SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder> closedGroupControlMessageBuilder_; + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage, org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder, org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder> closedGroupControlMessageBuilder_; /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ @@ -13514,7 +13595,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - public SignalServiceProtos.DataMessage.ClosedGroupControlMessage getClosedGroupControlMessage() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage getClosedGroupControlMessage() { if (closedGroupControlMessageBuilder_ == null) { return closedGroupControlMessage_; } else { @@ -13524,7 +13605,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - public Builder setClosedGroupControlMessage(SignalServiceProtos.DataMessage.ClosedGroupControlMessage value) { + public Builder setClosedGroupControlMessage(org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage value) { if (closedGroupControlMessageBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13541,7 +13622,7 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ public Builder setClosedGroupControlMessage( - SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder builderForValue) { + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder builderForValue) { if (closedGroupControlMessageBuilder_ == null) { closedGroupControlMessage_ = builderForValue.build(); onChanged(); @@ -13554,12 +13635,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - public Builder mergeClosedGroupControlMessage(SignalServiceProtos.DataMessage.ClosedGroupControlMessage value) { + public Builder mergeClosedGroupControlMessage(org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage value) { if (closedGroupControlMessageBuilder_ == null) { if (((bitField0_ & 0x00000800) == 0x00000800) && - closedGroupControlMessage_ != SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance()) { + closedGroupControlMessage_ != org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance()) { closedGroupControlMessage_ = - SignalServiceProtos.DataMessage.ClosedGroupControlMessage.newBuilder(closedGroupControlMessage_).mergeFrom(value).buildPartial(); + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.newBuilder(closedGroupControlMessage_).mergeFrom(value).buildPartial(); } else { closedGroupControlMessage_ = value; } @@ -13575,7 +13656,7 @@ public final class SignalServiceProtos { */ public Builder clearClosedGroupControlMessage() { if (closedGroupControlMessageBuilder_ == null) { - closedGroupControlMessage_ = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); + closedGroupControlMessage_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); onChanged(); } else { closedGroupControlMessageBuilder_.clear(); @@ -13586,7 +13667,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder getClosedGroupControlMessageBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder getClosedGroupControlMessageBuilder() { bitField0_ |= 0x00000800; onChanged(); return getClosedGroupControlMessageFieldBuilder().getBuilder(); @@ -13594,7 +13675,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - public SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder getClosedGroupControlMessageOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder getClosedGroupControlMessageOrBuilder() { if (closedGroupControlMessageBuilder_ != null) { return closedGroupControlMessageBuilder_.getMessageOrBuilder(); } else { @@ -13605,11 +13686,11 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.DataMessage.ClosedGroupControlMessage, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder, SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder> + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage, org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder, org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder> getClosedGroupControlMessageFieldBuilder() { if (closedGroupControlMessageBuilder_ == null) { closedGroupControlMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.DataMessage.ClosedGroupControlMessage, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder, SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder>( + org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage, org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder, org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder>( closedGroupControlMessage_, getParentForChildren(), isClean()); @@ -13710,12 +13791,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - java.util.List + java.util.List getClosedGroupsList(); /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - SignalServiceProtos.ConfigurationMessage.ClosedGroup getClosedGroups(int index); + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup getClosedGroups(int index); /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ @@ -13723,12 +13804,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - java.util.List + java.util.List getClosedGroupsOrBuilderList(); /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder getClosedGroupsOrBuilder( + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder getClosedGroupsOrBuilder( int index); // repeated string openGroups = 2; @@ -13795,12 +13876,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - java.util.List + java.util.List getContactsList(); /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - SignalServiceProtos.ConfigurationMessage.Contact getContacts(int index); + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact getContacts(int index); /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ @@ -13808,12 +13889,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - java.util.List + java.util.List getContactsOrBuilderList(); /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - SignalServiceProtos.ConfigurationMessage.ContactOrBuilder getContactsOrBuilder( + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ContactOrBuilder getContactsOrBuilder( int index); } /** @@ -13869,10 +13950,10 @@ public final class SignalServiceProtos { } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - closedGroups_ = new java.util.ArrayList(); + closedGroups_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - closedGroups_.add(input.readMessage(SignalServiceProtos.ConfigurationMessage.ClosedGroup.PARSER, extensionRegistry)); + closedGroups_.add(input.readMessage(org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup.PARSER, extensionRegistry)); break; } case 18: { @@ -13900,10 +13981,10 @@ public final class SignalServiceProtos { } case 50: { if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { - contacts_ = new java.util.ArrayList(); + contacts_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000020; } - contacts_.add(input.readMessage(SignalServiceProtos.ConfigurationMessage.Contact.PARSER, extensionRegistry)); + contacts_.add(input.readMessage(org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact.PARSER, extensionRegistry)); break; } } @@ -13929,14 +14010,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.ConfigurationMessage.class, SignalServiceProtos.ConfigurationMessage.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.class, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -13990,11 +14071,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - SignalServiceProtos.KeyPair getEncryptionKeyPair(); + org.session.libsignal.protos.SignalServiceProtos.KeyPair getEncryptionKeyPair(); /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder(); + org.session.libsignal.protos.SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder(); // repeated bytes members = 4; /** @@ -14086,11 +14167,11 @@ public final class SignalServiceProtos { break; } case 26: { - SignalServiceProtos.KeyPair.Builder subBuilder = null; + org.session.libsignal.protos.SignalServiceProtos.KeyPair.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = encryptionKeyPair_.toBuilder(); } - encryptionKeyPair_ = input.readMessage(SignalServiceProtos.KeyPair.PARSER, extensionRegistry); + encryptionKeyPair_ = input.readMessage(org.session.libsignal.protos.SignalServiceProtos.KeyPair.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(encryptionKeyPair_); encryptionKeyPair_ = subBuilder.buildPartial(); @@ -14134,14 +14215,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.ConfigurationMessage.ClosedGroup.class, SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup.class, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -14221,7 +14302,7 @@ public final class SignalServiceProtos { // optional .signalservice.KeyPair encryptionKeyPair = 3; public static final int ENCRYPTIONKEYPAIR_FIELD_NUMBER = 3; - private SignalServiceProtos.KeyPair encryptionKeyPair_; + private org.session.libsignal.protos.SignalServiceProtos.KeyPair encryptionKeyPair_; /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ @@ -14231,13 +14312,13 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - public SignalServiceProtos.KeyPair getEncryptionKeyPair() { + public org.session.libsignal.protos.SignalServiceProtos.KeyPair getEncryptionKeyPair() { return encryptionKeyPair_; } /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - public SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder() { return encryptionKeyPair_; } @@ -14290,7 +14371,7 @@ public final class SignalServiceProtos { private void initFields() { publicKey_ = com.google.protobuf.ByteString.EMPTY; name_ = ""; - encryptionKeyPair_ = SignalServiceProtos.KeyPair.getDefaultInstance(); + encryptionKeyPair_ = org.session.libsignal.protos.SignalServiceProtos.KeyPair.getDefaultInstance(); members_ = java.util.Collections.emptyList(); admins_ = java.util.Collections.emptyList(); } @@ -14378,53 +14459,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom(byte[] data) + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseDelimitedFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseDelimitedFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -14433,7 +14514,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(SignalServiceProtos.ConfigurationMessage.ClosedGroup prototype) { + public static Builder newBuilder(org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -14449,17 +14530,17 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder { + implements org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.ConfigurationMessage.ClosedGroup.class, SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup.class, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder.class); } // Construct using org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup.newBuilder() @@ -14488,7 +14569,7 @@ public final class SignalServiceProtos { name_ = ""; bitField0_ = (bitField0_ & ~0x00000002); if (encryptionKeyPairBuilder_ == null) { - encryptionKeyPair_ = SignalServiceProtos.KeyPair.getDefaultInstance(); + encryptionKeyPair_ = org.session.libsignal.protos.SignalServiceProtos.KeyPair.getDefaultInstance(); } else { encryptionKeyPairBuilder_.clear(); } @@ -14506,23 +14587,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_descriptor; } - public SignalServiceProtos.ConfigurationMessage.ClosedGroup getDefaultInstanceForType() { - return SignalServiceProtos.ConfigurationMessage.ClosedGroup.getDefaultInstance(); + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup getDefaultInstanceForType() { + return org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup.getDefaultInstance(); } - public SignalServiceProtos.ConfigurationMessage.ClosedGroup build() { - SignalServiceProtos.ConfigurationMessage.ClosedGroup result = buildPartial(); + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup build() { + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public SignalServiceProtos.ConfigurationMessage.ClosedGroup buildPartial() { - SignalServiceProtos.ConfigurationMessage.ClosedGroup result = new SignalServiceProtos.ConfigurationMessage.ClosedGroup(this); + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup buildPartial() { + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup result = new org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -14557,16 +14638,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof SignalServiceProtos.ConfigurationMessage.ClosedGroup) { - return mergeFrom((SignalServiceProtos.ConfigurationMessage.ClosedGroup)other); + if (other instanceof org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup) { + return mergeFrom((org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(SignalServiceProtos.ConfigurationMessage.ClosedGroup other) { - if (other == SignalServiceProtos.ConfigurationMessage.ClosedGroup.getDefaultInstance()) return this; + public Builder mergeFrom(org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup other) { + if (other == org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup.getDefaultInstance()) return this; if (other.hasPublicKey()) { setPublicKey(other.getPublicKey()); } @@ -14616,11 +14697,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - SignalServiceProtos.ConfigurationMessage.ClosedGroup parsedMessage = null; + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (SignalServiceProtos.ConfigurationMessage.ClosedGroup) e.getUnfinishedMessage(); + parsedMessage = (org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -14742,9 +14823,9 @@ public final class SignalServiceProtos { } // optional .signalservice.KeyPair encryptionKeyPair = 3; - private SignalServiceProtos.KeyPair encryptionKeyPair_ = SignalServiceProtos.KeyPair.getDefaultInstance(); + private org.session.libsignal.protos.SignalServiceProtos.KeyPair encryptionKeyPair_ = org.session.libsignal.protos.SignalServiceProtos.KeyPair.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.KeyPair, SignalServiceProtos.KeyPair.Builder, SignalServiceProtos.KeyPairOrBuilder> encryptionKeyPairBuilder_; + org.session.libsignal.protos.SignalServiceProtos.KeyPair, org.session.libsignal.protos.SignalServiceProtos.KeyPair.Builder, org.session.libsignal.protos.SignalServiceProtos.KeyPairOrBuilder> encryptionKeyPairBuilder_; /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ @@ -14754,7 +14835,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - public SignalServiceProtos.KeyPair getEncryptionKeyPair() { + public org.session.libsignal.protos.SignalServiceProtos.KeyPair getEncryptionKeyPair() { if (encryptionKeyPairBuilder_ == null) { return encryptionKeyPair_; } else { @@ -14764,7 +14845,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - public Builder setEncryptionKeyPair(SignalServiceProtos.KeyPair value) { + public Builder setEncryptionKeyPair(org.session.libsignal.protos.SignalServiceProtos.KeyPair value) { if (encryptionKeyPairBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -14781,7 +14862,7 @@ public final class SignalServiceProtos { * optional .signalservice.KeyPair encryptionKeyPair = 3; */ public Builder setEncryptionKeyPair( - SignalServiceProtos.KeyPair.Builder builderForValue) { + org.session.libsignal.protos.SignalServiceProtos.KeyPair.Builder builderForValue) { if (encryptionKeyPairBuilder_ == null) { encryptionKeyPair_ = builderForValue.build(); onChanged(); @@ -14794,12 +14875,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - public Builder mergeEncryptionKeyPair(SignalServiceProtos.KeyPair value) { + public Builder mergeEncryptionKeyPair(org.session.libsignal.protos.SignalServiceProtos.KeyPair value) { if (encryptionKeyPairBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - encryptionKeyPair_ != SignalServiceProtos.KeyPair.getDefaultInstance()) { + encryptionKeyPair_ != org.session.libsignal.protos.SignalServiceProtos.KeyPair.getDefaultInstance()) { encryptionKeyPair_ = - SignalServiceProtos.KeyPair.newBuilder(encryptionKeyPair_).mergeFrom(value).buildPartial(); + org.session.libsignal.protos.SignalServiceProtos.KeyPair.newBuilder(encryptionKeyPair_).mergeFrom(value).buildPartial(); } else { encryptionKeyPair_ = value; } @@ -14815,7 +14896,7 @@ public final class SignalServiceProtos { */ public Builder clearEncryptionKeyPair() { if (encryptionKeyPairBuilder_ == null) { - encryptionKeyPair_ = SignalServiceProtos.KeyPair.getDefaultInstance(); + encryptionKeyPair_ = org.session.libsignal.protos.SignalServiceProtos.KeyPair.getDefaultInstance(); onChanged(); } else { encryptionKeyPairBuilder_.clear(); @@ -14826,7 +14907,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - public SignalServiceProtos.KeyPair.Builder getEncryptionKeyPairBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.KeyPair.Builder getEncryptionKeyPairBuilder() { bitField0_ |= 0x00000004; onChanged(); return getEncryptionKeyPairFieldBuilder().getBuilder(); @@ -14834,7 +14915,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - public SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder() { if (encryptionKeyPairBuilder_ != null) { return encryptionKeyPairBuilder_.getMessageOrBuilder(); } else { @@ -14845,11 +14926,11 @@ public final class SignalServiceProtos { * optional .signalservice.KeyPair encryptionKeyPair = 3; */ private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.KeyPair, SignalServiceProtos.KeyPair.Builder, SignalServiceProtos.KeyPairOrBuilder> + org.session.libsignal.protos.SignalServiceProtos.KeyPair, org.session.libsignal.protos.SignalServiceProtos.KeyPair.Builder, org.session.libsignal.protos.SignalServiceProtos.KeyPairOrBuilder> getEncryptionKeyPairFieldBuilder() { if (encryptionKeyPairBuilder_ == null) { encryptionKeyPairBuilder_ = new com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.KeyPair, SignalServiceProtos.KeyPair.Builder, SignalServiceProtos.KeyPairOrBuilder>( + org.session.libsignal.protos.SignalServiceProtos.KeyPair, org.session.libsignal.protos.SignalServiceProtos.KeyPair.Builder, org.session.libsignal.protos.SignalServiceProtos.KeyPairOrBuilder>( encryptionKeyPair_, getParentForChildren(), isClean()); @@ -15171,14 +15252,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.ConfigurationMessage.Contact.class, SignalServiceProtos.ConfigurationMessage.Contact.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact.class, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -15410,53 +15491,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static SignalServiceProtos.ConfigurationMessage.Contact parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.ConfigurationMessage.Contact parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.ConfigurationMessage.Contact parseFrom(byte[] data) + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.ConfigurationMessage.Contact parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.ConfigurationMessage.Contact parseFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.ConfigurationMessage.Contact parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static SignalServiceProtos.ConfigurationMessage.Contact parseDelimitedFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static SignalServiceProtos.ConfigurationMessage.Contact parseDelimitedFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static SignalServiceProtos.ConfigurationMessage.Contact parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.ConfigurationMessage.Contact parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -15465,7 +15546,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(SignalServiceProtos.ConfigurationMessage.Contact prototype) { + public static Builder newBuilder(org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -15481,17 +15562,17 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements SignalServiceProtos.ConfigurationMessage.ContactOrBuilder { + implements org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ContactOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.ConfigurationMessage.Contact.class, SignalServiceProtos.ConfigurationMessage.Contact.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact.class, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact.Builder.class); } // Construct using org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact.newBuilder() @@ -15531,23 +15612,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_descriptor; } - public SignalServiceProtos.ConfigurationMessage.Contact getDefaultInstanceForType() { - return SignalServiceProtos.ConfigurationMessage.Contact.getDefaultInstance(); + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact getDefaultInstanceForType() { + return org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact.getDefaultInstance(); } - public SignalServiceProtos.ConfigurationMessage.Contact build() { - SignalServiceProtos.ConfigurationMessage.Contact result = buildPartial(); + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact build() { + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public SignalServiceProtos.ConfigurationMessage.Contact buildPartial() { - SignalServiceProtos.ConfigurationMessage.Contact result = new SignalServiceProtos.ConfigurationMessage.Contact(this); + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact buildPartial() { + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact result = new org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -15572,16 +15653,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof SignalServiceProtos.ConfigurationMessage.Contact) { - return mergeFrom((SignalServiceProtos.ConfigurationMessage.Contact)other); + if (other instanceof org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact) { + return mergeFrom((org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(SignalServiceProtos.ConfigurationMessage.Contact other) { - if (other == SignalServiceProtos.ConfigurationMessage.Contact.getDefaultInstance()) return this; + public Builder mergeFrom(org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact other) { + if (other == org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact.getDefaultInstance()) return this; if (other.hasPublicKey()) { setPublicKey(other.getPublicKey()); } @@ -15618,11 +15699,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - SignalServiceProtos.ConfigurationMessage.Contact parsedMessage = null; + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (SignalServiceProtos.ConfigurationMessage.Contact) e.getUnfinishedMessage(); + parsedMessage = (org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -15907,17 +15988,17 @@ public final class SignalServiceProtos { private int bitField0_; // repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; public static final int CLOSEDGROUPS_FIELD_NUMBER = 1; - private java.util.List closedGroups_; + private java.util.List closedGroups_; /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public java.util.List getClosedGroupsList() { + public java.util.List getClosedGroupsList() { return closedGroups_; } /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public java.util.List + public java.util.List getClosedGroupsOrBuilderList() { return closedGroups_; } @@ -15930,13 +16011,13 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public SignalServiceProtos.ConfigurationMessage.ClosedGroup getClosedGroups(int index) { + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup getClosedGroups(int index) { return closedGroups_.get(index); } /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder getClosedGroupsOrBuilder( + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder getClosedGroupsOrBuilder( int index) { return closedGroups_.get(index); } @@ -16075,17 +16156,17 @@ public final class SignalServiceProtos { // repeated .signalservice.ConfigurationMessage.Contact contacts = 6; public static final int CONTACTS_FIELD_NUMBER = 6; - private java.util.List contacts_; + private java.util.List contacts_; /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public java.util.List getContactsList() { + public java.util.List getContactsList() { return contacts_; } /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public java.util.List + public java.util.List getContactsOrBuilderList() { return contacts_; } @@ -16098,13 +16179,13 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public SignalServiceProtos.ConfigurationMessage.Contact getContacts(int index) { + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact getContacts(int index) { return contacts_.get(index); } /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public SignalServiceProtos.ConfigurationMessage.ContactOrBuilder getContactsOrBuilder( + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ContactOrBuilder getContactsOrBuilder( int index) { return contacts_.get(index); } @@ -16209,53 +16290,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static SignalServiceProtos.ConfigurationMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.ConfigurationMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.ConfigurationMessage parseFrom(byte[] data) + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.ConfigurationMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.ConfigurationMessage parseFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.ConfigurationMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static SignalServiceProtos.ConfigurationMessage parseDelimitedFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static SignalServiceProtos.ConfigurationMessage parseDelimitedFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static SignalServiceProtos.ConfigurationMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.ConfigurationMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -16264,7 +16345,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(SignalServiceProtos.ConfigurationMessage prototype) { + public static Builder newBuilder(org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -16280,17 +16361,17 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements SignalServiceProtos.ConfigurationMessageOrBuilder { + implements org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.ConfigurationMessage.class, SignalServiceProtos.ConfigurationMessage.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.class, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Builder.class); } // Construct using org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.newBuilder() @@ -16344,23 +16425,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_descriptor; } - public SignalServiceProtos.ConfigurationMessage getDefaultInstanceForType() { - return SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage getDefaultInstanceForType() { + return org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); } - public SignalServiceProtos.ConfigurationMessage build() { - SignalServiceProtos.ConfigurationMessage result = buildPartial(); + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage build() { + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public SignalServiceProtos.ConfigurationMessage buildPartial() { - SignalServiceProtos.ConfigurationMessage result = new SignalServiceProtos.ConfigurationMessage(this); + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage buildPartial() { + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage result = new org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (closedGroupsBuilder_ == null) { @@ -16405,16 +16486,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof SignalServiceProtos.ConfigurationMessage) { - return mergeFrom((SignalServiceProtos.ConfigurationMessage)other); + if (other instanceof org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage) { + return mergeFrom((org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(SignalServiceProtos.ConfigurationMessage other) { - if (other == SignalServiceProtos.ConfigurationMessage.getDefaultInstance()) return this; + public Builder mergeFrom(org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage other) { + if (other == org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.getDefaultInstance()) return this; if (closedGroupsBuilder_ == null) { if (!other.closedGroups_.isEmpty()) { if (closedGroups_.isEmpty()) { @@ -16514,11 +16595,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - SignalServiceProtos.ConfigurationMessage parsedMessage = null; + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (SignalServiceProtos.ConfigurationMessage) e.getUnfinishedMessage(); + parsedMessage = (org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -16530,22 +16611,22 @@ public final class SignalServiceProtos { private int bitField0_; // repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; - private java.util.List closedGroups_ = + private java.util.List closedGroups_ = java.util.Collections.emptyList(); private void ensureClosedGroupsIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - closedGroups_ = new java.util.ArrayList(closedGroups_); + closedGroups_ = new java.util.ArrayList(closedGroups_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilder< - SignalServiceProtos.ConfigurationMessage.ClosedGroup, SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder, SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder> closedGroupsBuilder_; + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder> closedGroupsBuilder_; /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public java.util.List getClosedGroupsList() { + public java.util.List getClosedGroupsList() { if (closedGroupsBuilder_ == null) { return java.util.Collections.unmodifiableList(closedGroups_); } else { @@ -16565,7 +16646,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public SignalServiceProtos.ConfigurationMessage.ClosedGroup getClosedGroups(int index) { + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup getClosedGroups(int index) { if (closedGroupsBuilder_ == null) { return closedGroups_.get(index); } else { @@ -16576,7 +16657,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ public Builder setClosedGroups( - int index, SignalServiceProtos.ConfigurationMessage.ClosedGroup value) { + int index, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup value) { if (closedGroupsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -16593,7 +16674,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ public Builder setClosedGroups( - int index, SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder builderForValue) { + int index, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder builderForValue) { if (closedGroupsBuilder_ == null) { ensureClosedGroupsIsMutable(); closedGroups_.set(index, builderForValue.build()); @@ -16606,7 +16687,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public Builder addClosedGroups(SignalServiceProtos.ConfigurationMessage.ClosedGroup value) { + public Builder addClosedGroups(org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup value) { if (closedGroupsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -16623,7 +16704,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ public Builder addClosedGroups( - int index, SignalServiceProtos.ConfigurationMessage.ClosedGroup value) { + int index, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup value) { if (closedGroupsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -16640,7 +16721,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ public Builder addClosedGroups( - SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder builderForValue) { + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder builderForValue) { if (closedGroupsBuilder_ == null) { ensureClosedGroupsIsMutable(); closedGroups_.add(builderForValue.build()); @@ -16654,7 +16735,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ public Builder addClosedGroups( - int index, SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder builderForValue) { + int index, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder builderForValue) { if (closedGroupsBuilder_ == null) { ensureClosedGroupsIsMutable(); closedGroups_.add(index, builderForValue.build()); @@ -16668,7 +16749,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ public Builder addAllClosedGroups( - java.lang.Iterable values) { + java.lang.Iterable values) { if (closedGroupsBuilder_ == null) { ensureClosedGroupsIsMutable(); super.addAll(values, closedGroups_); @@ -16707,14 +16788,14 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder getClosedGroupsBuilder( + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder getClosedGroupsBuilder( int index) { return getClosedGroupsFieldBuilder().getBuilder(index); } /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder getClosedGroupsOrBuilder( + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder getClosedGroupsOrBuilder( int index) { if (closedGroupsBuilder_ == null) { return closedGroups_.get(index); } else { @@ -16724,7 +16805,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public java.util.List + public java.util.List getClosedGroupsOrBuilderList() { if (closedGroupsBuilder_ != null) { return closedGroupsBuilder_.getMessageOrBuilderList(); @@ -16735,31 +16816,31 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder addClosedGroupsBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder addClosedGroupsBuilder() { return getClosedGroupsFieldBuilder().addBuilder( - SignalServiceProtos.ConfigurationMessage.ClosedGroup.getDefaultInstance()); + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup.getDefaultInstance()); } /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder addClosedGroupsBuilder( + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder addClosedGroupsBuilder( int index) { return getClosedGroupsFieldBuilder().addBuilder( - index, SignalServiceProtos.ConfigurationMessage.ClosedGroup.getDefaultInstance()); + index, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup.getDefaultInstance()); } /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public java.util.List + public java.util.List getClosedGroupsBuilderList() { return getClosedGroupsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - SignalServiceProtos.ConfigurationMessage.ClosedGroup, SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder, SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder> + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder> getClosedGroupsFieldBuilder() { if (closedGroupsBuilder_ == null) { closedGroupsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - SignalServiceProtos.ConfigurationMessage.ClosedGroup, SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder, SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder>( + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder>( closedGroups_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), @@ -17047,22 +17128,22 @@ public final class SignalServiceProtos { } // repeated .signalservice.ConfigurationMessage.Contact contacts = 6; - private java.util.List contacts_ = + private java.util.List contacts_ = java.util.Collections.emptyList(); private void ensureContactsIsMutable() { if (!((bitField0_ & 0x00000020) == 0x00000020)) { - contacts_ = new java.util.ArrayList(contacts_); + contacts_ = new java.util.ArrayList(contacts_); bitField0_ |= 0x00000020; } } private com.google.protobuf.RepeatedFieldBuilder< - SignalServiceProtos.ConfigurationMessage.Contact, SignalServiceProtos.ConfigurationMessage.Contact.Builder, SignalServiceProtos.ConfigurationMessage.ContactOrBuilder> contactsBuilder_; + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact.Builder, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ContactOrBuilder> contactsBuilder_; /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public java.util.List getContactsList() { + public java.util.List getContactsList() { if (contactsBuilder_ == null) { return java.util.Collections.unmodifiableList(contacts_); } else { @@ -17082,7 +17163,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public SignalServiceProtos.ConfigurationMessage.Contact getContacts(int index) { + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact getContacts(int index) { if (contactsBuilder_ == null) { return contacts_.get(index); } else { @@ -17093,7 +17174,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ public Builder setContacts( - int index, SignalServiceProtos.ConfigurationMessage.Contact value) { + int index, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact value) { if (contactsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -17110,7 +17191,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ public Builder setContacts( - int index, SignalServiceProtos.ConfigurationMessage.Contact.Builder builderForValue) { + int index, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact.Builder builderForValue) { if (contactsBuilder_ == null) { ensureContactsIsMutable(); contacts_.set(index, builderForValue.build()); @@ -17123,7 +17204,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public Builder addContacts(SignalServiceProtos.ConfigurationMessage.Contact value) { + public Builder addContacts(org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact value) { if (contactsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -17140,7 +17221,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ public Builder addContacts( - int index, SignalServiceProtos.ConfigurationMessage.Contact value) { + int index, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact value) { if (contactsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -17157,7 +17238,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ public Builder addContacts( - SignalServiceProtos.ConfigurationMessage.Contact.Builder builderForValue) { + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact.Builder builderForValue) { if (contactsBuilder_ == null) { ensureContactsIsMutable(); contacts_.add(builderForValue.build()); @@ -17171,7 +17252,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ public Builder addContacts( - int index, SignalServiceProtos.ConfigurationMessage.Contact.Builder builderForValue) { + int index, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact.Builder builderForValue) { if (contactsBuilder_ == null) { ensureContactsIsMutable(); contacts_.add(index, builderForValue.build()); @@ -17185,7 +17266,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ public Builder addAllContacts( - java.lang.Iterable values) { + java.lang.Iterable values) { if (contactsBuilder_ == null) { ensureContactsIsMutable(); super.addAll(values, contacts_); @@ -17224,14 +17305,14 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public SignalServiceProtos.ConfigurationMessage.Contact.Builder getContactsBuilder( + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact.Builder getContactsBuilder( int index) { return getContactsFieldBuilder().getBuilder(index); } /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public SignalServiceProtos.ConfigurationMessage.ContactOrBuilder getContactsOrBuilder( + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ContactOrBuilder getContactsOrBuilder( int index) { if (contactsBuilder_ == null) { return contacts_.get(index); } else { @@ -17241,7 +17322,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public java.util.List + public java.util.List getContactsOrBuilderList() { if (contactsBuilder_ != null) { return contactsBuilder_.getMessageOrBuilderList(); @@ -17252,31 +17333,31 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public SignalServiceProtos.ConfigurationMessage.Contact.Builder addContactsBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact.Builder addContactsBuilder() { return getContactsFieldBuilder().addBuilder( - SignalServiceProtos.ConfigurationMessage.Contact.getDefaultInstance()); + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact.getDefaultInstance()); } /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public SignalServiceProtos.ConfigurationMessage.Contact.Builder addContactsBuilder( + public org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact.Builder addContactsBuilder( int index) { return getContactsFieldBuilder().addBuilder( - index, SignalServiceProtos.ConfigurationMessage.Contact.getDefaultInstance()); + index, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact.getDefaultInstance()); } /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public java.util.List + public java.util.List getContactsBuilderList() { return getContactsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - SignalServiceProtos.ConfigurationMessage.Contact, SignalServiceProtos.ConfigurationMessage.Contact.Builder, SignalServiceProtos.ConfigurationMessage.ContactOrBuilder> + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact.Builder, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ContactOrBuilder> getContactsFieldBuilder() { if (contactsBuilder_ == null) { contactsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - SignalServiceProtos.ConfigurationMessage.Contact, SignalServiceProtos.ConfigurationMessage.Contact.Builder, SignalServiceProtos.ConfigurationMessage.ContactOrBuilder>( + org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact.Builder, org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ContactOrBuilder>( contacts_, ((bitField0_ & 0x00000020) == 0x00000020), getParentForChildren(), @@ -17316,7 +17397,7 @@ public final class SignalServiceProtos { * @required * */ - SignalServiceProtos.ReceiptMessage.Type getType(); + org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.Type getType(); // repeated uint64 timestamp = 2; /** @@ -17385,7 +17466,7 @@ public final class SignalServiceProtos { } case 8: { int rawValue = input.readEnum(); - SignalServiceProtos.ReceiptMessage.Type value = SignalServiceProtos.ReceiptMessage.Type.valueOf(rawValue); + org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.Type value = org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.Type.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); } else { @@ -17432,14 +17513,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_ReceiptMessage_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_ReceiptMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_ReceiptMessage_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_ReceiptMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.ReceiptMessage.class, SignalServiceProtos.ReceiptMessage.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.class, org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -17514,7 +17595,7 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return SignalServiceProtos.ReceiptMessage.getDescriptor().getEnumTypes().get(0); + return org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.getDescriptor().getEnumTypes().get(0); } private static final Type[] VALUES = values(); @@ -17542,7 +17623,7 @@ public final class SignalServiceProtos { private int bitField0_; // required .signalservice.ReceiptMessage.Type type = 1; public static final int TYPE_FIELD_NUMBER = 1; - private SignalServiceProtos.ReceiptMessage.Type type_; + private org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.Type type_; /** * required .signalservice.ReceiptMessage.Type type = 1; * @@ -17560,7 +17641,7 @@ public final class SignalServiceProtos { * @required * */ - public SignalServiceProtos.ReceiptMessage.Type getType() { + public org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.Type getType() { return type_; } @@ -17588,7 +17669,7 @@ public final class SignalServiceProtos { } private void initFields() { - type_ = SignalServiceProtos.ReceiptMessage.Type.DELIVERY; + type_ = org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.Type.DELIVERY; timestamp_ = java.util.Collections.emptyList(); } private byte memoizedIsInitialized = -1; @@ -17647,53 +17728,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static SignalServiceProtos.ReceiptMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.ReceiptMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.ReceiptMessage parseFrom(byte[] data) + public static org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.ReceiptMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.ReceiptMessage parseFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.ReceiptMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static SignalServiceProtos.ReceiptMessage parseDelimitedFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static SignalServiceProtos.ReceiptMessage parseDelimitedFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static SignalServiceProtos.ReceiptMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.ReceiptMessage parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -17702,7 +17783,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(SignalServiceProtos.ReceiptMessage prototype) { + public static Builder newBuilder(org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -17718,17 +17799,17 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements SignalServiceProtos.ReceiptMessageOrBuilder { + implements org.session.libsignal.protos.SignalServiceProtos.ReceiptMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_ReceiptMessage_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_ReceiptMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_ReceiptMessage_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_ReceiptMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.ReceiptMessage.class, SignalServiceProtos.ReceiptMessage.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.class, org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.Builder.class); } // Construct using org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.newBuilder() @@ -17751,7 +17832,7 @@ public final class SignalServiceProtos { public Builder clear() { super.clear(); - type_ = SignalServiceProtos.ReceiptMessage.Type.DELIVERY; + type_ = org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.Type.DELIVERY; bitField0_ = (bitField0_ & ~0x00000001); timestamp_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000002); @@ -17764,23 +17845,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return SignalServiceProtos.internal_static_signalservice_ReceiptMessage_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_ReceiptMessage_descriptor; } - public SignalServiceProtos.ReceiptMessage getDefaultInstanceForType() { - return SignalServiceProtos.ReceiptMessage.getDefaultInstance(); + public org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage getDefaultInstanceForType() { + return org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.getDefaultInstance(); } - public SignalServiceProtos.ReceiptMessage build() { - SignalServiceProtos.ReceiptMessage result = buildPartial(); + public org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage build() { + org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public SignalServiceProtos.ReceiptMessage buildPartial() { - SignalServiceProtos.ReceiptMessage result = new SignalServiceProtos.ReceiptMessage(this); + public org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage buildPartial() { + org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage result = new org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -17798,16 +17879,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof SignalServiceProtos.ReceiptMessage) { - return mergeFrom((SignalServiceProtos.ReceiptMessage)other); + if (other instanceof org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage) { + return mergeFrom((org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(SignalServiceProtos.ReceiptMessage other) { - if (other == SignalServiceProtos.ReceiptMessage.getDefaultInstance()) return this; + public Builder mergeFrom(org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage other) { + if (other == org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.getDefaultInstance()) return this; if (other.hasType()) { setType(other.getType()); } @@ -17837,11 +17918,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - SignalServiceProtos.ReceiptMessage parsedMessage = null; + org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (SignalServiceProtos.ReceiptMessage) e.getUnfinishedMessage(); + parsedMessage = (org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -17853,7 +17934,7 @@ public final class SignalServiceProtos { private int bitField0_; // required .signalservice.ReceiptMessage.Type type = 1; - private SignalServiceProtos.ReceiptMessage.Type type_ = SignalServiceProtos.ReceiptMessage.Type.DELIVERY; + private org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.Type type_ = org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.Type.DELIVERY; /** * required .signalservice.ReceiptMessage.Type type = 1; * @@ -17871,7 +17952,7 @@ public final class SignalServiceProtos { * @required * */ - public SignalServiceProtos.ReceiptMessage.Type getType() { + public org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.Type getType() { return type_; } /** @@ -17881,7 +17962,7 @@ public final class SignalServiceProtos { * @required * */ - public Builder setType(SignalServiceProtos.ReceiptMessage.Type value) { + public Builder setType(org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.Type value) { if (value == null) { throw new NullPointerException(); } @@ -17899,7 +17980,7 @@ public final class SignalServiceProtos { */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); - type_ = SignalServiceProtos.ReceiptMessage.Type.DELIVERY; + type_ = org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.Type.DELIVERY; onChanged(); return this; } @@ -18257,14 +18338,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_AttachmentPointer_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_AttachmentPointer_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_AttachmentPointer_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_AttachmentPointer_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.AttachmentPointer.class, SignalServiceProtos.AttachmentPointer.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.class, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -18330,7 +18411,7 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return SignalServiceProtos.AttachmentPointer.getDescriptor().getEnumTypes().get(0); + return org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.getDescriptor().getEnumTypes().get(0); } private static final Flags[] VALUES = values(); @@ -18799,53 +18880,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static SignalServiceProtos.AttachmentPointer parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.AttachmentPointer parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.AttachmentPointer parseFrom(byte[] data) + public static org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.AttachmentPointer parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.AttachmentPointer parseFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.AttachmentPointer parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static SignalServiceProtos.AttachmentPointer parseDelimitedFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static SignalServiceProtos.AttachmentPointer parseDelimitedFrom( + public static org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static SignalServiceProtos.AttachmentPointer parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.AttachmentPointer parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -18854,7 +18935,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(SignalServiceProtos.AttachmentPointer prototype) { + public static Builder newBuilder(org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -18870,17 +18951,17 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements SignalServiceProtos.AttachmentPointerOrBuilder { + implements org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_AttachmentPointer_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_AttachmentPointer_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_AttachmentPointer_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_AttachmentPointer_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.AttachmentPointer.class, SignalServiceProtos.AttachmentPointer.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.class, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder.class); } // Construct using org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.newBuilder() @@ -18936,23 +19017,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return SignalServiceProtos.internal_static_signalservice_AttachmentPointer_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_AttachmentPointer_descriptor; } - public SignalServiceProtos.AttachmentPointer getDefaultInstanceForType() { - return SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer getDefaultInstanceForType() { + return org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); } - public SignalServiceProtos.AttachmentPointer build() { - SignalServiceProtos.AttachmentPointer result = buildPartial(); + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer build() { + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public SignalServiceProtos.AttachmentPointer buildPartial() { - SignalServiceProtos.AttachmentPointer result = new SignalServiceProtos.AttachmentPointer(this); + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer buildPartial() { + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer result = new org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -19009,16 +19090,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof SignalServiceProtos.AttachmentPointer) { - return mergeFrom((SignalServiceProtos.AttachmentPointer)other); + if (other instanceof org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer) { + return mergeFrom((org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(SignalServiceProtos.AttachmentPointer other) { - if (other == SignalServiceProtos.AttachmentPointer.getDefaultInstance()) return this; + public Builder mergeFrom(org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer other) { + if (other == org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.getDefaultInstance()) return this; if (other.hasId()) { setId(other.getId()); } @@ -19079,11 +19160,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - SignalServiceProtos.AttachmentPointer parsedMessage = null; + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (SignalServiceProtos.AttachmentPointer) e.getUnfinishedMessage(); + parsedMessage = (org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -19727,7 +19808,7 @@ public final class SignalServiceProtos { * @required * */ - SignalServiceProtos.GroupContext.Type getType(); + org.session.libsignal.protos.SignalServiceProtos.GroupContext.Type getType(); // optional string name = 3; /** @@ -19772,11 +19853,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer avatar = 5; */ - SignalServiceProtos.AttachmentPointer getAvatar(); + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer getAvatar(); /** * optional .signalservice.AttachmentPointer avatar = 5; */ - SignalServiceProtos.AttachmentPointerOrBuilder getAvatarOrBuilder(); + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder getAvatarOrBuilder(); // repeated string admins = 6; /** @@ -19856,7 +19937,7 @@ public final class SignalServiceProtos { } case 16: { int rawValue = input.readEnum(); - SignalServiceProtos.GroupContext.Type value = SignalServiceProtos.GroupContext.Type.valueOf(rawValue); + org.session.libsignal.protos.SignalServiceProtos.GroupContext.Type value = org.session.libsignal.protos.SignalServiceProtos.GroupContext.Type.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(2, rawValue); } else { @@ -19879,11 +19960,11 @@ public final class SignalServiceProtos { break; } case 42: { - SignalServiceProtos.AttachmentPointer.Builder subBuilder = null; + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder subBuilder = null; if (((bitField0_ & 0x00000008) == 0x00000008)) { subBuilder = avatar_.toBuilder(); } - avatar_ = input.readMessage(SignalServiceProtos.AttachmentPointer.PARSER, extensionRegistry); + avatar_ = input.readMessage(org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(avatar_); avatar_ = subBuilder.buildPartial(); @@ -19919,14 +20000,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_GroupContext_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_GroupContext_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_GroupContext_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_GroupContext_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.GroupContext.class, SignalServiceProtos.GroupContext.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.GroupContext.class, org.session.libsignal.protos.SignalServiceProtos.GroupContext.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -20028,7 +20109,7 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return SignalServiceProtos.GroupContext.getDescriptor().getEnumTypes().get(0); + return org.session.libsignal.protos.SignalServiceProtos.GroupContext.getDescriptor().getEnumTypes().get(0); } private static final Type[] VALUES = values(); @@ -20080,7 +20161,7 @@ public final class SignalServiceProtos { // optional .signalservice.GroupContext.Type type = 2; public static final int TYPE_FIELD_NUMBER = 2; - private SignalServiceProtos.GroupContext.Type type_; + private org.session.libsignal.protos.SignalServiceProtos.GroupContext.Type type_; /** * optional .signalservice.GroupContext.Type type = 2; * @@ -20098,7 +20179,7 @@ public final class SignalServiceProtos { * @required * */ - public SignalServiceProtos.GroupContext.Type getType() { + public org.session.libsignal.protos.SignalServiceProtos.GroupContext.Type getType() { return type_; } @@ -20177,7 +20258,7 @@ public final class SignalServiceProtos { // optional .signalservice.AttachmentPointer avatar = 5; public static final int AVATAR_FIELD_NUMBER = 5; - private SignalServiceProtos.AttachmentPointer avatar_; + private org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer avatar_; /** * optional .signalservice.AttachmentPointer avatar = 5; */ @@ -20187,13 +20268,13 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer avatar = 5; */ - public SignalServiceProtos.AttachmentPointer getAvatar() { + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer getAvatar() { return avatar_; } /** * optional .signalservice.AttachmentPointer avatar = 5; */ - public SignalServiceProtos.AttachmentPointerOrBuilder getAvatarOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder getAvatarOrBuilder() { return avatar_; } @@ -20229,10 +20310,10 @@ public final class SignalServiceProtos { private void initFields() { id_ = com.google.protobuf.ByteString.EMPTY; - type_ = SignalServiceProtos.GroupContext.Type.UNKNOWN; + type_ = org.session.libsignal.protos.SignalServiceProtos.GroupContext.Type.UNKNOWN; name_ = ""; members_ = com.google.protobuf.LazyStringArrayList.EMPTY; - avatar_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + avatar_ = org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); admins_ = com.google.protobuf.LazyStringArrayList.EMPTY; } private byte memoizedIsInitialized = -1; @@ -20326,53 +20407,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static SignalServiceProtos.GroupContext parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.GroupContext parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.GroupContext parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.GroupContext parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.GroupContext parseFrom(byte[] data) + public static org.session.libsignal.protos.SignalServiceProtos.GroupContext parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static SignalServiceProtos.GroupContext parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.GroupContext parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static SignalServiceProtos.GroupContext parseFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.GroupContext parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.GroupContext parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.GroupContext parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static SignalServiceProtos.GroupContext parseDelimitedFrom(java.io.InputStream input) + public static org.session.libsignal.protos.SignalServiceProtos.GroupContext parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static SignalServiceProtos.GroupContext parseDelimitedFrom( + public static org.session.libsignal.protos.SignalServiceProtos.GroupContext parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static SignalServiceProtos.GroupContext parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.GroupContext parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static SignalServiceProtos.GroupContext parseFrom( + public static org.session.libsignal.protos.SignalServiceProtos.GroupContext parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -20381,7 +20462,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(SignalServiceProtos.GroupContext prototype) { + public static Builder newBuilder(org.session.libsignal.protos.SignalServiceProtos.GroupContext prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -20397,17 +20478,17 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements SignalServiceProtos.GroupContextOrBuilder { + implements org.session.libsignal.protos.SignalServiceProtos.GroupContextOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return SignalServiceProtos.internal_static_signalservice_GroupContext_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_GroupContext_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return SignalServiceProtos.internal_static_signalservice_GroupContext_fieldAccessorTable + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_GroupContext_fieldAccessorTable .ensureFieldAccessorsInitialized( - SignalServiceProtos.GroupContext.class, SignalServiceProtos.GroupContext.Builder.class); + org.session.libsignal.protos.SignalServiceProtos.GroupContext.class, org.session.libsignal.protos.SignalServiceProtos.GroupContext.Builder.class); } // Construct using org.session.libsignal.protos.SignalServiceProtos.GroupContext.newBuilder() @@ -20433,14 +20514,14 @@ public final class SignalServiceProtos { super.clear(); id_ = com.google.protobuf.ByteString.EMPTY; bitField0_ = (bitField0_ & ~0x00000001); - type_ = SignalServiceProtos.GroupContext.Type.UNKNOWN; + type_ = org.session.libsignal.protos.SignalServiceProtos.GroupContext.Type.UNKNOWN; bitField0_ = (bitField0_ & ~0x00000002); name_ = ""; bitField0_ = (bitField0_ & ~0x00000004); members_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000008); if (avatarBuilder_ == null) { - avatar_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + avatar_ = org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); } else { avatarBuilder_.clear(); } @@ -20456,23 +20537,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return SignalServiceProtos.internal_static_signalservice_GroupContext_descriptor; + return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_GroupContext_descriptor; } - public SignalServiceProtos.GroupContext getDefaultInstanceForType() { - return SignalServiceProtos.GroupContext.getDefaultInstance(); + public org.session.libsignal.protos.SignalServiceProtos.GroupContext getDefaultInstanceForType() { + return org.session.libsignal.protos.SignalServiceProtos.GroupContext.getDefaultInstance(); } - public SignalServiceProtos.GroupContext build() { - SignalServiceProtos.GroupContext result = buildPartial(); + public org.session.libsignal.protos.SignalServiceProtos.GroupContext build() { + org.session.libsignal.protos.SignalServiceProtos.GroupContext result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public SignalServiceProtos.GroupContext buildPartial() { - SignalServiceProtos.GroupContext result = new SignalServiceProtos.GroupContext(this); + public org.session.libsignal.protos.SignalServiceProtos.GroupContext buildPartial() { + org.session.libsignal.protos.SignalServiceProtos.GroupContext result = new org.session.libsignal.protos.SignalServiceProtos.GroupContext(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -20513,16 +20594,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof SignalServiceProtos.GroupContext) { - return mergeFrom((SignalServiceProtos.GroupContext)other); + if (other instanceof org.session.libsignal.protos.SignalServiceProtos.GroupContext) { + return mergeFrom((org.session.libsignal.protos.SignalServiceProtos.GroupContext)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(SignalServiceProtos.GroupContext other) { - if (other == SignalServiceProtos.GroupContext.getDefaultInstance()) return this; + public Builder mergeFrom(org.session.libsignal.protos.SignalServiceProtos.GroupContext other) { + if (other == org.session.libsignal.protos.SignalServiceProtos.GroupContext.getDefaultInstance()) return this; if (other.hasId()) { setId(other.getId()); } @@ -20575,11 +20656,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - SignalServiceProtos.GroupContext parsedMessage = null; + org.session.libsignal.protos.SignalServiceProtos.GroupContext parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (SignalServiceProtos.GroupContext) e.getUnfinishedMessage(); + parsedMessage = (org.session.libsignal.protos.SignalServiceProtos.GroupContext) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -20643,7 +20724,7 @@ public final class SignalServiceProtos { } // optional .signalservice.GroupContext.Type type = 2; - private SignalServiceProtos.GroupContext.Type type_ = SignalServiceProtos.GroupContext.Type.UNKNOWN; + private org.session.libsignal.protos.SignalServiceProtos.GroupContext.Type type_ = org.session.libsignal.protos.SignalServiceProtos.GroupContext.Type.UNKNOWN; /** * optional .signalservice.GroupContext.Type type = 2; * @@ -20661,7 +20742,7 @@ public final class SignalServiceProtos { * @required * */ - public SignalServiceProtos.GroupContext.Type getType() { + public org.session.libsignal.protos.SignalServiceProtos.GroupContext.Type getType() { return type_; } /** @@ -20671,7 +20752,7 @@ public final class SignalServiceProtos { * @required * */ - public Builder setType(SignalServiceProtos.GroupContext.Type value) { + public Builder setType(org.session.libsignal.protos.SignalServiceProtos.GroupContext.Type value) { if (value == null) { throw new NullPointerException(); } @@ -20689,7 +20770,7 @@ public final class SignalServiceProtos { */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000002); - type_ = SignalServiceProtos.GroupContext.Type.UNKNOWN; + type_ = org.session.libsignal.protos.SignalServiceProtos.GroupContext.Type.UNKNOWN; onChanged(); return this; } @@ -20862,9 +20943,9 @@ public final class SignalServiceProtos { } // optional .signalservice.AttachmentPointer avatar = 5; - private SignalServiceProtos.AttachmentPointer avatar_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + private org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer avatar_ = org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder> avatarBuilder_; + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder> avatarBuilder_; /** * optional .signalservice.AttachmentPointer avatar = 5; */ @@ -20874,7 +20955,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer avatar = 5; */ - public SignalServiceProtos.AttachmentPointer getAvatar() { + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer getAvatar() { if (avatarBuilder_ == null) { return avatar_; } else { @@ -20884,7 +20965,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer avatar = 5; */ - public Builder setAvatar(SignalServiceProtos.AttachmentPointer value) { + public Builder setAvatar(org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer value) { if (avatarBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -20901,7 +20982,7 @@ public final class SignalServiceProtos { * optional .signalservice.AttachmentPointer avatar = 5; */ public Builder setAvatar( - SignalServiceProtos.AttachmentPointer.Builder builderForValue) { + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder builderForValue) { if (avatarBuilder_ == null) { avatar_ = builderForValue.build(); onChanged(); @@ -20914,12 +20995,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer avatar = 5; */ - public Builder mergeAvatar(SignalServiceProtos.AttachmentPointer value) { + public Builder mergeAvatar(org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer value) { if (avatarBuilder_ == null) { if (((bitField0_ & 0x00000010) == 0x00000010) && - avatar_ != SignalServiceProtos.AttachmentPointer.getDefaultInstance()) { + avatar_ != org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.getDefaultInstance()) { avatar_ = - SignalServiceProtos.AttachmentPointer.newBuilder(avatar_).mergeFrom(value).buildPartial(); + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.newBuilder(avatar_).mergeFrom(value).buildPartial(); } else { avatar_ = value; } @@ -20935,7 +21016,7 @@ public final class SignalServiceProtos { */ public Builder clearAvatar() { if (avatarBuilder_ == null) { - avatar_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + avatar_ = org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); onChanged(); } else { avatarBuilder_.clear(); @@ -20946,7 +21027,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer avatar = 5; */ - public SignalServiceProtos.AttachmentPointer.Builder getAvatarBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder getAvatarBuilder() { bitField0_ |= 0x00000010; onChanged(); return getAvatarFieldBuilder().getBuilder(); @@ -20954,7 +21035,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer avatar = 5; */ - public SignalServiceProtos.AttachmentPointerOrBuilder getAvatarOrBuilder() { + public org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder getAvatarOrBuilder() { if (avatarBuilder_ != null) { return avatarBuilder_.getMessageOrBuilder(); } else { @@ -20965,11 +21046,11 @@ public final class SignalServiceProtos { * optional .signalservice.AttachmentPointer avatar = 5; */ private com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder> + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder> getAvatarFieldBuilder() { if (avatarBuilder_ == null) { avatarBuilder_ = new com.google.protobuf.SingleFieldBuilder< - SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder>( + org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.protos.SignalServiceProtos.AttachmentPointerOrBuilder>( avatar_, getParentForChildren(), isClean()); @@ -21208,7 +21289,7 @@ public final class SignalServiceProtos { "fication\022<\n\004type\030\001 \002(\0162..signalservice.D", "ataExtractionNotification.Type\022\021\n\ttimest" + "amp\030\002 \001(\004\"\'\n\004Type\022\016\n\nSCREENSHOT\020\001\022\017\n\013MED" + - "IA_SAVED\020\002\"\214\014\n\013DataMessage\022\014\n\004body\030\001 \001(\t" + + "IA_SAVED\020\002\"\241\014\n\013DataMessage\022\014\n\004body\030\001 \001(\t" + "\0225\n\013attachments\030\002 \003(\0132 .signalservice.At" + "tachmentPointer\022*\n\005group\030\003 \001(\0132\033.signals" + "ervice.GroupContext\022\r\n\005flags\030\004 \001(\r\022\023\n\013ex" + @@ -21233,7 +21314,7 @@ public final class SignalServiceProtos { "\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\343\003" + + "Invitation\022\013\n\003url\030\001 \002(\t\022\014\n\004name\030\003 \002(\t\032\370\003" + "\n\031ClosedGroupControlMessage\022G\n\004type\030\001 \002(" + "\01629.signalservice.DataMessage.ClosedGrou", "pControlMessage.Type\022\021\n\tpublicKey\030\002 \001(\014\022" + @@ -21241,41 +21322,41 @@ public final class SignalServiceProtos { "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\032=\n\016KeyPairWrapp" + - "er\022\021\n\tpublicKey\030\001 \002(\014\022\030\n\020encryptedKeyPai" + - "r\030\002 \002(\014\"r\n\004Type\022\007\n\003NEW\020\001\022\027\n\023ENCRYPTION_K" + - "EY_PAIR\020\003\022\017\n\013NAME_CHANGE\020\004\022\021\n\rMEMBERS_AD" + - "DED\020\005\022\023\n\017MEMBERS_REMOVED\020\006\022\017\n\013MEMBER_LEF", - "T\020\007\"$\n\005Flags\022\033\n\027EXPIRATION_TIMER_UPDATE\020" + - "\002\"\316\003\n\024ConfigurationMessage\022E\n\014closedGrou" + - "ps\030\001 \003(\0132/.signalservice.ConfigurationMe" + - "ssage.ClosedGroup\022\022\n\nopenGroups\030\002 \003(\t\022\023\n" + - "\013displayName\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(\013" + - "2+.signalservice.ConfigurationMessage.Co" + - "ntact\032\202\001\n\013ClosedGroup\022\021\n\tpublicKey\030\001 \001(\014" + - "\022\014\n\004name\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\032V\n\007Contact\022\021\n\tpublicK" + - "ey\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\"u\n\016ReceiptMes" + - "sage\0220\n\004type\030\001 \002(\0162\".signalservice.Recei" + - "ptMessage.Type\022\021\n\ttimestamp\030\002 \003(\004\"\036\n\004Typ" + - "e\022\014\n\010DELIVERY\020\000\022\010\n\004READ\020\001\"\354\001\n\021Attachment" + - "Pointer\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\004size\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\005" + - "Flags\022\021\n\rVOICE_MESSAGE\020\001\"\365\001\n\014GroupContex" + - "t\022\n\n\002id\030\001 \001(\014\022.\n\004type\030\002 \001(\0162 .signalserv" + - "ice.GroupContext.Type\022\014\n\004name\030\003 \001(\t\022\017\n\007m" + - "embers\030\004 \003(\t\0220\n\006avatar\030\005 \001(\0132 .signalser" + - "vice.AttachmentPointer\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\007DELIV" + - "ER\020\002\022\010\n\004QUIT\020\003\022\020\n\014REQUEST_INFO\020\004BB\n+org." + - "session.libsignal.service.internal.pushB" + - "\023SignalServiceProtos" + "olMessage.KeyPairWrapper\022\023\n\013expireTimer\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\003" + + "NEW\020\001\022\027\n\023ENCRYPTION_KEY_PAIR\020\003\022\017\n\013NAME_C" + + "HANGE\020\004\022\021\n\rMEMBERS_ADDED\020\005\022\023\n\017MEMBERS_RE", + "MOVED\020\006\022\017\n\013MEMBER_LEFT\020\007\"$\n\005Flags\022\033\n\027EXP" + + "IRATION_TIMER_UPDATE\020\002\"\316\003\n\024Configuration" + + "Message\022E\n\014closedGroups\030\001 \003(\0132/.signalse" + + "rvice.ConfigurationMessage.ClosedGroup\022\022" + + "\n\nopenGroups\030\002 \003(\t\022\023\n\013displayName\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+.signalservice.Co" + + "nfigurationMessage.Contact\032\202\001\n\013ClosedGro" + + "up\022\021\n\tpublicKey\030\001 \001(\014\022\014\n\004name\030\002 \001(\t\0221\n\021e" + + "ncryptionKeyPair\030\003 \001(\0132\026.signalservice.K", + "eyPair\022\017\n\007members\030\004 \003(\014\022\016\n\006admins\030\005 \003(\014\032" + + "V\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\nprofileKe" + + "y\030\004 \001(\014\"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() { @@ -21353,7 +21434,7 @@ public final class SignalServiceProtos { internal_static_signalservice_DataMessage_ClosedGroupControlMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor, - new java.lang.String[] { "Type", "PublicKey", "Name", "EncryptionKeyPair", "Members", "Admins", "Wrappers", }); + new java.lang.String[] { "Type", "PublicKey", "Name", "EncryptionKeyPair", "Members", "Admins", "Wrappers", "ExpireTimer", }); internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_descriptor = internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor.getNestedTypes().get(0); internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_fieldAccessorTable = new diff --git a/libsignal/src/main/java/org/session/libsignal/protos/WebSocketProtos.java b/libsignal/src/main/java/org/session/libsignal/protos/WebSocketProtos.java index 471ab603d0..541d6898df 100644 --- a/libsignal/src/main/java/org/session/libsignal/protos/WebSocketProtos.java +++ b/libsignal/src/main/java/org/session/libsignal/protos/WebSocketProtos.java @@ -177,14 +177,14 @@ public final class WebSocketProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return WebSocketProtos.internal_static_signalservice_WebSocketRequestMessage_descriptor; + return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketRequestMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return WebSocketProtos.internal_static_signalservice_WebSocketRequestMessage_fieldAccessorTable + return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketRequestMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - WebSocketProtos.WebSocketRequestMessage.class, WebSocketProtos.WebSocketRequestMessage.Builder.class); + org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.class, org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -431,53 +431,53 @@ public final class WebSocketProtos { return super.writeReplace(); } - public static WebSocketProtos.WebSocketRequestMessage parseFrom( + public static org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static WebSocketProtos.WebSocketRequestMessage parseFrom( + public static org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static WebSocketProtos.WebSocketRequestMessage parseFrom(byte[] data) + public static org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static WebSocketProtos.WebSocketRequestMessage parseFrom( + public static org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static WebSocketProtos.WebSocketRequestMessage parseFrom(java.io.InputStream input) + public static org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static WebSocketProtos.WebSocketRequestMessage parseFrom( + public static org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static WebSocketProtos.WebSocketRequestMessage parseDelimitedFrom(java.io.InputStream input) + public static org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static WebSocketProtos.WebSocketRequestMessage parseDelimitedFrom( + public static org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static WebSocketProtos.WebSocketRequestMessage parseFrom( + public static org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static WebSocketProtos.WebSocketRequestMessage parseFrom( + public static org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -486,7 +486,7 @@ public final class WebSocketProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(WebSocketProtos.WebSocketRequestMessage prototype) { + public static Builder newBuilder(org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -502,17 +502,17 @@ public final class WebSocketProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements WebSocketProtos.WebSocketRequestMessageOrBuilder { + implements org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return WebSocketProtos.internal_static_signalservice_WebSocketRequestMessage_descriptor; + return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketRequestMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return WebSocketProtos.internal_static_signalservice_WebSocketRequestMessage_fieldAccessorTable + return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketRequestMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - WebSocketProtos.WebSocketRequestMessage.class, WebSocketProtos.WebSocketRequestMessage.Builder.class); + org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.class, org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.Builder.class); } // Construct using org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.newBuilder() @@ -554,23 +554,23 @@ public final class WebSocketProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return WebSocketProtos.internal_static_signalservice_WebSocketRequestMessage_descriptor; + return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketRequestMessage_descriptor; } - public WebSocketProtos.WebSocketRequestMessage getDefaultInstanceForType() { - return WebSocketProtos.WebSocketRequestMessage.getDefaultInstance(); + public org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage getDefaultInstanceForType() { + return org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.getDefaultInstance(); } - public WebSocketProtos.WebSocketRequestMessage build() { - WebSocketProtos.WebSocketRequestMessage result = buildPartial(); + public org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage build() { + org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public WebSocketProtos.WebSocketRequestMessage buildPartial() { - WebSocketProtos.WebSocketRequestMessage result = new WebSocketProtos.WebSocketRequestMessage(this); + public org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage buildPartial() { + org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage result = new org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -601,16 +601,16 @@ public final class WebSocketProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof WebSocketProtos.WebSocketRequestMessage) { - return mergeFrom((WebSocketProtos.WebSocketRequestMessage)other); + if (other instanceof org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage) { + return mergeFrom((org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(WebSocketProtos.WebSocketRequestMessage other) { - if (other == WebSocketProtos.WebSocketRequestMessage.getDefaultInstance()) return this; + public Builder mergeFrom(org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage other) { + if (other == org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.getDefaultInstance()) return this; if (other.hasVerb()) { bitField0_ |= 0x00000001; verb_ = other.verb_; @@ -649,11 +649,11 @@ public final class WebSocketProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - WebSocketProtos.WebSocketRequestMessage parsedMessage = null; + org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (WebSocketProtos.WebSocketRequestMessage) e.getUnfinishedMessage(); + parsedMessage = (org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1149,14 +1149,14 @@ public final class WebSocketProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return WebSocketProtos.internal_static_signalservice_WebSocketResponseMessage_descriptor; + return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketResponseMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return WebSocketProtos.internal_static_signalservice_WebSocketResponseMessage_fieldAccessorTable + return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketResponseMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - WebSocketProtos.WebSocketResponseMessage.class, WebSocketProtos.WebSocketResponseMessage.Builder.class); + org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.class, org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1376,53 +1376,53 @@ public final class WebSocketProtos { return super.writeReplace(); } - public static WebSocketProtos.WebSocketResponseMessage parseFrom( + public static org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static WebSocketProtos.WebSocketResponseMessage parseFrom( + public static org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static WebSocketProtos.WebSocketResponseMessage parseFrom(byte[] data) + public static org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static WebSocketProtos.WebSocketResponseMessage parseFrom( + public static org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static WebSocketProtos.WebSocketResponseMessage parseFrom(java.io.InputStream input) + public static org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static WebSocketProtos.WebSocketResponseMessage parseFrom( + public static org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static WebSocketProtos.WebSocketResponseMessage parseDelimitedFrom(java.io.InputStream input) + public static org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static WebSocketProtos.WebSocketResponseMessage parseDelimitedFrom( + public static org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static WebSocketProtos.WebSocketResponseMessage parseFrom( + public static org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static WebSocketProtos.WebSocketResponseMessage parseFrom( + public static org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1431,7 +1431,7 @@ public final class WebSocketProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(WebSocketProtos.WebSocketResponseMessage prototype) { + public static Builder newBuilder(org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1447,17 +1447,17 @@ public final class WebSocketProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements WebSocketProtos.WebSocketResponseMessageOrBuilder { + implements org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return WebSocketProtos.internal_static_signalservice_WebSocketResponseMessage_descriptor; + return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketResponseMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return WebSocketProtos.internal_static_signalservice_WebSocketResponseMessage_fieldAccessorTable + return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketResponseMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - WebSocketProtos.WebSocketResponseMessage.class, WebSocketProtos.WebSocketResponseMessage.Builder.class); + org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.class, org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.Builder.class); } // Construct using org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.newBuilder() @@ -1499,23 +1499,23 @@ public final class WebSocketProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return WebSocketProtos.internal_static_signalservice_WebSocketResponseMessage_descriptor; + return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketResponseMessage_descriptor; } - public WebSocketProtos.WebSocketResponseMessage getDefaultInstanceForType() { - return WebSocketProtos.WebSocketResponseMessage.getDefaultInstance(); + public org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage getDefaultInstanceForType() { + return org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.getDefaultInstance(); } - public WebSocketProtos.WebSocketResponseMessage build() { - WebSocketProtos.WebSocketResponseMessage result = buildPartial(); + public org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage build() { + org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public WebSocketProtos.WebSocketResponseMessage buildPartial() { - WebSocketProtos.WebSocketResponseMessage result = new WebSocketProtos.WebSocketResponseMessage(this); + public org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage buildPartial() { + org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage result = new org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -1546,16 +1546,16 @@ public final class WebSocketProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof WebSocketProtos.WebSocketResponseMessage) { - return mergeFrom((WebSocketProtos.WebSocketResponseMessage)other); + if (other instanceof org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage) { + return mergeFrom((org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(WebSocketProtos.WebSocketResponseMessage other) { - if (other == WebSocketProtos.WebSocketResponseMessage.getDefaultInstance()) return this; + public Builder mergeFrom(org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage other) { + if (other == org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.getDefaultInstance()) return this; if (other.hasId()) { setId(other.getId()); } @@ -1592,11 +1592,11 @@ public final class WebSocketProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - WebSocketProtos.WebSocketResponseMessage parsedMessage = null; + org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (WebSocketProtos.WebSocketResponseMessage) e.getUnfinishedMessage(); + parsedMessage = (org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1898,7 +1898,7 @@ public final class WebSocketProtos { /** * optional .signalservice.WebSocketMessage.Type type = 1; */ - WebSocketProtos.WebSocketMessage.Type getType(); + org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Type getType(); // optional .signalservice.WebSocketRequestMessage request = 2; /** @@ -1908,11 +1908,11 @@ public final class WebSocketProtos { /** * optional .signalservice.WebSocketRequestMessage request = 2; */ - WebSocketProtos.WebSocketRequestMessage getRequest(); + org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage getRequest(); /** * optional .signalservice.WebSocketRequestMessage request = 2; */ - WebSocketProtos.WebSocketRequestMessageOrBuilder getRequestOrBuilder(); + org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessageOrBuilder getRequestOrBuilder(); // optional .signalservice.WebSocketResponseMessage response = 3; /** @@ -1922,11 +1922,11 @@ public final class WebSocketProtos { /** * optional .signalservice.WebSocketResponseMessage response = 3; */ - WebSocketProtos.WebSocketResponseMessage getResponse(); + org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage getResponse(); /** * optional .signalservice.WebSocketResponseMessage response = 3; */ - WebSocketProtos.WebSocketResponseMessageOrBuilder getResponseOrBuilder(); + org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessageOrBuilder getResponseOrBuilder(); } /** * Protobuf type {@code signalservice.WebSocketMessage} @@ -1981,7 +1981,7 @@ public final class WebSocketProtos { } case 8: { int rawValue = input.readEnum(); - WebSocketProtos.WebSocketMessage.Type value = WebSocketProtos.WebSocketMessage.Type.valueOf(rawValue); + org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Type value = org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Type.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); } else { @@ -1991,11 +1991,11 @@ public final class WebSocketProtos { break; } case 18: { - WebSocketProtos.WebSocketRequestMessage.Builder subBuilder = null; + org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = request_.toBuilder(); } - request_ = input.readMessage(WebSocketProtos.WebSocketRequestMessage.PARSER, extensionRegistry); + request_ = input.readMessage(org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(request_); request_ = subBuilder.buildPartial(); @@ -2004,11 +2004,11 @@ public final class WebSocketProtos { break; } case 26: { - WebSocketProtos.WebSocketResponseMessage.Builder subBuilder = null; + org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = response_.toBuilder(); } - response_ = input.readMessage(WebSocketProtos.WebSocketResponseMessage.PARSER, extensionRegistry); + response_ = input.readMessage(org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(response_); response_ = subBuilder.buildPartial(); @@ -2030,14 +2030,14 @@ public final class WebSocketProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return WebSocketProtos.internal_static_signalservice_WebSocketMessage_descriptor; + return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return WebSocketProtos.internal_static_signalservice_WebSocketMessage_fieldAccessorTable + return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - WebSocketProtos.WebSocketMessage.class, WebSocketProtos.WebSocketMessage.Builder.class); + org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.class, org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -2121,7 +2121,7 @@ public final class WebSocketProtos { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return WebSocketProtos.WebSocketMessage.getDescriptor().getEnumTypes().get(0); + return org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.getDescriptor().getEnumTypes().get(0); } private static final Type[] VALUES = values(); @@ -2149,7 +2149,7 @@ public final class WebSocketProtos { private int bitField0_; // optional .signalservice.WebSocketMessage.Type type = 1; public static final int TYPE_FIELD_NUMBER = 1; - private WebSocketProtos.WebSocketMessage.Type type_; + private org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Type type_; /** * optional .signalservice.WebSocketMessage.Type type = 1; */ @@ -2159,13 +2159,13 @@ public final class WebSocketProtos { /** * optional .signalservice.WebSocketMessage.Type type = 1; */ - public WebSocketProtos.WebSocketMessage.Type getType() { + public org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Type getType() { return type_; } // optional .signalservice.WebSocketRequestMessage request = 2; public static final int REQUEST_FIELD_NUMBER = 2; - private WebSocketProtos.WebSocketRequestMessage request_; + private org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage request_; /** * optional .signalservice.WebSocketRequestMessage request = 2; */ @@ -2175,19 +2175,19 @@ public final class WebSocketProtos { /** * optional .signalservice.WebSocketRequestMessage request = 2; */ - public WebSocketProtos.WebSocketRequestMessage getRequest() { + public org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage getRequest() { return request_; } /** * optional .signalservice.WebSocketRequestMessage request = 2; */ - public WebSocketProtos.WebSocketRequestMessageOrBuilder getRequestOrBuilder() { + public org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessageOrBuilder getRequestOrBuilder() { return request_; } // optional .signalservice.WebSocketResponseMessage response = 3; public static final int RESPONSE_FIELD_NUMBER = 3; - private WebSocketProtos.WebSocketResponseMessage response_; + private org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage response_; /** * optional .signalservice.WebSocketResponseMessage response = 3; */ @@ -2197,20 +2197,20 @@ public final class WebSocketProtos { /** * optional .signalservice.WebSocketResponseMessage response = 3; */ - public WebSocketProtos.WebSocketResponseMessage getResponse() { + public org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage getResponse() { return response_; } /** * optional .signalservice.WebSocketResponseMessage response = 3; */ - public WebSocketProtos.WebSocketResponseMessageOrBuilder getResponseOrBuilder() { + public org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessageOrBuilder getResponseOrBuilder() { return response_; } private void initFields() { - type_ = WebSocketProtos.WebSocketMessage.Type.UNKNOWN; - request_ = WebSocketProtos.WebSocketRequestMessage.getDefaultInstance(); - response_ = WebSocketProtos.WebSocketResponseMessage.getDefaultInstance(); + type_ = org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Type.UNKNOWN; + request_ = org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.getDefaultInstance(); + response_ = org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -2266,53 +2266,53 @@ public final class WebSocketProtos { return super.writeReplace(); } - public static WebSocketProtos.WebSocketMessage parseFrom( + public static org.session.libsignal.protos.WebSocketProtos.WebSocketMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static WebSocketProtos.WebSocketMessage parseFrom( + public static org.session.libsignal.protos.WebSocketProtos.WebSocketMessage parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static WebSocketProtos.WebSocketMessage parseFrom(byte[] data) + public static org.session.libsignal.protos.WebSocketProtos.WebSocketMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static WebSocketProtos.WebSocketMessage parseFrom( + public static org.session.libsignal.protos.WebSocketProtos.WebSocketMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static WebSocketProtos.WebSocketMessage parseFrom(java.io.InputStream input) + public static org.session.libsignal.protos.WebSocketProtos.WebSocketMessage parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static WebSocketProtos.WebSocketMessage parseFrom( + public static org.session.libsignal.protos.WebSocketProtos.WebSocketMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static WebSocketProtos.WebSocketMessage parseDelimitedFrom(java.io.InputStream input) + public static org.session.libsignal.protos.WebSocketProtos.WebSocketMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static WebSocketProtos.WebSocketMessage parseDelimitedFrom( + public static org.session.libsignal.protos.WebSocketProtos.WebSocketMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static WebSocketProtos.WebSocketMessage parseFrom( + public static org.session.libsignal.protos.WebSocketProtos.WebSocketMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static WebSocketProtos.WebSocketMessage parseFrom( + public static org.session.libsignal.protos.WebSocketProtos.WebSocketMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2321,7 +2321,7 @@ public final class WebSocketProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(WebSocketProtos.WebSocketMessage prototype) { + public static Builder newBuilder(org.session.libsignal.protos.WebSocketProtos.WebSocketMessage prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -2337,17 +2337,17 @@ public final class WebSocketProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements WebSocketProtos.WebSocketMessageOrBuilder { + implements org.session.libsignal.protos.WebSocketProtos.WebSocketMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return WebSocketProtos.internal_static_signalservice_WebSocketMessage_descriptor; + return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return WebSocketProtos.internal_static_signalservice_WebSocketMessage_fieldAccessorTable + return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - WebSocketProtos.WebSocketMessage.class, WebSocketProtos.WebSocketMessage.Builder.class); + org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.class, org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Builder.class); } // Construct using org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.newBuilder() @@ -2372,16 +2372,16 @@ public final class WebSocketProtos { public Builder clear() { super.clear(); - type_ = WebSocketProtos.WebSocketMessage.Type.UNKNOWN; + type_ = org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Type.UNKNOWN; bitField0_ = (bitField0_ & ~0x00000001); if (requestBuilder_ == null) { - request_ = WebSocketProtos.WebSocketRequestMessage.getDefaultInstance(); + request_ = org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.getDefaultInstance(); } else { requestBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000002); if (responseBuilder_ == null) { - response_ = WebSocketProtos.WebSocketResponseMessage.getDefaultInstance(); + response_ = org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.getDefaultInstance(); } else { responseBuilder_.clear(); } @@ -2395,23 +2395,23 @@ public final class WebSocketProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return WebSocketProtos.internal_static_signalservice_WebSocketMessage_descriptor; + return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketMessage_descriptor; } - public WebSocketProtos.WebSocketMessage getDefaultInstanceForType() { - return WebSocketProtos.WebSocketMessage.getDefaultInstance(); + public org.session.libsignal.protos.WebSocketProtos.WebSocketMessage getDefaultInstanceForType() { + return org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.getDefaultInstance(); } - public WebSocketProtos.WebSocketMessage build() { - WebSocketProtos.WebSocketMessage result = buildPartial(); + public org.session.libsignal.protos.WebSocketProtos.WebSocketMessage build() { + org.session.libsignal.protos.WebSocketProtos.WebSocketMessage result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public WebSocketProtos.WebSocketMessage buildPartial() { - WebSocketProtos.WebSocketMessage result = new WebSocketProtos.WebSocketMessage(this); + public org.session.libsignal.protos.WebSocketProtos.WebSocketMessage buildPartial() { + org.session.libsignal.protos.WebSocketProtos.WebSocketMessage result = new org.session.libsignal.protos.WebSocketProtos.WebSocketMessage(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -2440,16 +2440,16 @@ public final class WebSocketProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof WebSocketProtos.WebSocketMessage) { - return mergeFrom((WebSocketProtos.WebSocketMessage)other); + if (other instanceof org.session.libsignal.protos.WebSocketProtos.WebSocketMessage) { + return mergeFrom((org.session.libsignal.protos.WebSocketProtos.WebSocketMessage)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(WebSocketProtos.WebSocketMessage other) { - if (other == WebSocketProtos.WebSocketMessage.getDefaultInstance()) return this; + public Builder mergeFrom(org.session.libsignal.protos.WebSocketProtos.WebSocketMessage other) { + if (other == org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.getDefaultInstance()) return this; if (other.hasType()) { setType(other.getType()); } @@ -2471,11 +2471,11 @@ public final class WebSocketProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - WebSocketProtos.WebSocketMessage parsedMessage = null; + org.session.libsignal.protos.WebSocketProtos.WebSocketMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (WebSocketProtos.WebSocketMessage) e.getUnfinishedMessage(); + parsedMessage = (org.session.libsignal.protos.WebSocketProtos.WebSocketMessage) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -2487,7 +2487,7 @@ public final class WebSocketProtos { private int bitField0_; // optional .signalservice.WebSocketMessage.Type type = 1; - private WebSocketProtos.WebSocketMessage.Type type_ = WebSocketProtos.WebSocketMessage.Type.UNKNOWN; + private org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Type type_ = org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Type.UNKNOWN; /** * optional .signalservice.WebSocketMessage.Type type = 1; */ @@ -2497,13 +2497,13 @@ public final class WebSocketProtos { /** * optional .signalservice.WebSocketMessage.Type type = 1; */ - public WebSocketProtos.WebSocketMessage.Type getType() { + public org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Type getType() { return type_; } /** * optional .signalservice.WebSocketMessage.Type type = 1; */ - public Builder setType(WebSocketProtos.WebSocketMessage.Type value) { + public Builder setType(org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Type value) { if (value == null) { throw new NullPointerException(); } @@ -2517,15 +2517,15 @@ public final class WebSocketProtos { */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); - type_ = WebSocketProtos.WebSocketMessage.Type.UNKNOWN; + type_ = org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Type.UNKNOWN; onChanged(); return this; } // optional .signalservice.WebSocketRequestMessage request = 2; - private WebSocketProtos.WebSocketRequestMessage request_ = WebSocketProtos.WebSocketRequestMessage.getDefaultInstance(); + private org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage request_ = org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - WebSocketProtos.WebSocketRequestMessage, WebSocketProtos.WebSocketRequestMessage.Builder, WebSocketProtos.WebSocketRequestMessageOrBuilder> requestBuilder_; + org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage, org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.Builder, org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessageOrBuilder> requestBuilder_; /** * optional .signalservice.WebSocketRequestMessage request = 2; */ @@ -2535,7 +2535,7 @@ public final class WebSocketProtos { /** * optional .signalservice.WebSocketRequestMessage request = 2; */ - public WebSocketProtos.WebSocketRequestMessage getRequest() { + public org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage getRequest() { if (requestBuilder_ == null) { return request_; } else { @@ -2545,7 +2545,7 @@ public final class WebSocketProtos { /** * optional .signalservice.WebSocketRequestMessage request = 2; */ - public Builder setRequest(WebSocketProtos.WebSocketRequestMessage value) { + public Builder setRequest(org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage value) { if (requestBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2562,7 +2562,7 @@ public final class WebSocketProtos { * optional .signalservice.WebSocketRequestMessage request = 2; */ public Builder setRequest( - WebSocketProtos.WebSocketRequestMessage.Builder builderForValue) { + org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.Builder builderForValue) { if (requestBuilder_ == null) { request_ = builderForValue.build(); onChanged(); @@ -2575,12 +2575,12 @@ public final class WebSocketProtos { /** * optional .signalservice.WebSocketRequestMessage request = 2; */ - public Builder mergeRequest(WebSocketProtos.WebSocketRequestMessage value) { + public Builder mergeRequest(org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage value) { if (requestBuilder_ == null) { if (((bitField0_ & 0x00000002) == 0x00000002) && - request_ != WebSocketProtos.WebSocketRequestMessage.getDefaultInstance()) { + request_ != org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.getDefaultInstance()) { request_ = - WebSocketProtos.WebSocketRequestMessage.newBuilder(request_).mergeFrom(value).buildPartial(); + org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.newBuilder(request_).mergeFrom(value).buildPartial(); } else { request_ = value; } @@ -2596,7 +2596,7 @@ public final class WebSocketProtos { */ public Builder clearRequest() { if (requestBuilder_ == null) { - request_ = WebSocketProtos.WebSocketRequestMessage.getDefaultInstance(); + request_ = org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.getDefaultInstance(); onChanged(); } else { requestBuilder_.clear(); @@ -2607,7 +2607,7 @@ public final class WebSocketProtos { /** * optional .signalservice.WebSocketRequestMessage request = 2; */ - public WebSocketProtos.WebSocketRequestMessage.Builder getRequestBuilder() { + public org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.Builder getRequestBuilder() { bitField0_ |= 0x00000002; onChanged(); return getRequestFieldBuilder().getBuilder(); @@ -2615,7 +2615,7 @@ public final class WebSocketProtos { /** * optional .signalservice.WebSocketRequestMessage request = 2; */ - public WebSocketProtos.WebSocketRequestMessageOrBuilder getRequestOrBuilder() { + public org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessageOrBuilder getRequestOrBuilder() { if (requestBuilder_ != null) { return requestBuilder_.getMessageOrBuilder(); } else { @@ -2626,11 +2626,11 @@ public final class WebSocketProtos { * optional .signalservice.WebSocketRequestMessage request = 2; */ private com.google.protobuf.SingleFieldBuilder< - WebSocketProtos.WebSocketRequestMessage, WebSocketProtos.WebSocketRequestMessage.Builder, WebSocketProtos.WebSocketRequestMessageOrBuilder> + org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage, org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.Builder, org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessageOrBuilder> getRequestFieldBuilder() { if (requestBuilder_ == null) { requestBuilder_ = new com.google.protobuf.SingleFieldBuilder< - WebSocketProtos.WebSocketRequestMessage, WebSocketProtos.WebSocketRequestMessage.Builder, WebSocketProtos.WebSocketRequestMessageOrBuilder>( + org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage, org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.Builder, org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessageOrBuilder>( request_, getParentForChildren(), isClean()); @@ -2640,9 +2640,9 @@ public final class WebSocketProtos { } // optional .signalservice.WebSocketResponseMessage response = 3; - private WebSocketProtos.WebSocketResponseMessage response_ = WebSocketProtos.WebSocketResponseMessage.getDefaultInstance(); + private org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage response_ = org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - WebSocketProtos.WebSocketResponseMessage, WebSocketProtos.WebSocketResponseMessage.Builder, WebSocketProtos.WebSocketResponseMessageOrBuilder> responseBuilder_; + org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage, org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.Builder, org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessageOrBuilder> responseBuilder_; /** * optional .signalservice.WebSocketResponseMessage response = 3; */ @@ -2652,7 +2652,7 @@ public final class WebSocketProtos { /** * optional .signalservice.WebSocketResponseMessage response = 3; */ - public WebSocketProtos.WebSocketResponseMessage getResponse() { + public org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage getResponse() { if (responseBuilder_ == null) { return response_; } else { @@ -2662,7 +2662,7 @@ public final class WebSocketProtos { /** * optional .signalservice.WebSocketResponseMessage response = 3; */ - public Builder setResponse(WebSocketProtos.WebSocketResponseMessage value) { + public Builder setResponse(org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage value) { if (responseBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2679,7 +2679,7 @@ public final class WebSocketProtos { * optional .signalservice.WebSocketResponseMessage response = 3; */ public Builder setResponse( - WebSocketProtos.WebSocketResponseMessage.Builder builderForValue) { + org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.Builder builderForValue) { if (responseBuilder_ == null) { response_ = builderForValue.build(); onChanged(); @@ -2692,12 +2692,12 @@ public final class WebSocketProtos { /** * optional .signalservice.WebSocketResponseMessage response = 3; */ - public Builder mergeResponse(WebSocketProtos.WebSocketResponseMessage value) { + public Builder mergeResponse(org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage value) { if (responseBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - response_ != WebSocketProtos.WebSocketResponseMessage.getDefaultInstance()) { + response_ != org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.getDefaultInstance()) { response_ = - WebSocketProtos.WebSocketResponseMessage.newBuilder(response_).mergeFrom(value).buildPartial(); + org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.newBuilder(response_).mergeFrom(value).buildPartial(); } else { response_ = value; } @@ -2713,7 +2713,7 @@ public final class WebSocketProtos { */ public Builder clearResponse() { if (responseBuilder_ == null) { - response_ = WebSocketProtos.WebSocketResponseMessage.getDefaultInstance(); + response_ = org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.getDefaultInstance(); onChanged(); } else { responseBuilder_.clear(); @@ -2724,7 +2724,7 @@ public final class WebSocketProtos { /** * optional .signalservice.WebSocketResponseMessage response = 3; */ - public WebSocketProtos.WebSocketResponseMessage.Builder getResponseBuilder() { + public org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.Builder getResponseBuilder() { bitField0_ |= 0x00000004; onChanged(); return getResponseFieldBuilder().getBuilder(); @@ -2732,7 +2732,7 @@ public final class WebSocketProtos { /** * optional .signalservice.WebSocketResponseMessage response = 3; */ - public WebSocketProtos.WebSocketResponseMessageOrBuilder getResponseOrBuilder() { + public org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessageOrBuilder getResponseOrBuilder() { if (responseBuilder_ != null) { return responseBuilder_.getMessageOrBuilder(); } else { @@ -2743,11 +2743,11 @@ public final class WebSocketProtos { * optional .signalservice.WebSocketResponseMessage response = 3; */ private com.google.protobuf.SingleFieldBuilder< - WebSocketProtos.WebSocketResponseMessage, WebSocketProtos.WebSocketResponseMessage.Builder, WebSocketProtos.WebSocketResponseMessageOrBuilder> + org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage, org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.Builder, org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessageOrBuilder> getResponseFieldBuilder() { if (responseBuilder_ == null) { responseBuilder_ = new com.google.protobuf.SingleFieldBuilder< - WebSocketProtos.WebSocketResponseMessage, WebSocketProtos.WebSocketResponseMessage.Builder, WebSocketProtos.WebSocketResponseMessageOrBuilder>( + org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage, org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.Builder, org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessageOrBuilder>( response_, getParentForChildren(), isClean()); @@ -2803,8 +2803,8 @@ public final class WebSocketProtos { "equestMessage\0229\n\010response\030\003 \001(\0132\'.signal", "service.WebSocketResponseMessage\".\n\004Type" + "\022\013\n\007UNKNOWN\020\000\022\013\n\007REQUEST\020\001\022\014\n\010RESPONSE\020\002" + - "BC\n0org.session.libsignal.service.intern" + - "al.websocketB\017WebSocketProtos" + "B/\n\034org.session.libsignal.protosB\017WebSoc" + + "ketProtos" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { From 3b03aef80f996458099ab7851d5b232e1b7c2fa7 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Wed, 9 Jun 2021 14:31:05 +1000 Subject: [PATCH 11/12] handle expiration timer with NEW group update type --- .../org/thoughtcrime/securesms/database/Storage.kt | 5 +++++ .../session/libsession/database/StorageProtocol.kt | 1 + .../messages/control/ClosedGroupControlMessage.kt | 11 +++++++---- .../MessageSenderClosedGroupHandler.kt | 9 +++++++-- .../sending_receiving/ReceivedMessageHandler.kt | 9 ++++++--- 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt index 66b4fd5004..a09866b265 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt @@ -428,6 +428,11 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context, DatabaseFactory.getLokiAPIDatabase(context).removeAllClosedGroupEncryptionKeyPairs(groupPublicKey) } + override fun setExpirationTimer(groupID: String, duration: Int) { + val recipient = Recipient.from(context, fromSerialized(groupID), false) + DatabaseFactory.getRecipientDatabase(context).setExpireMessages(recipient, duration); + } + override fun getAllV2OpenGroups(): Map { return DatabaseFactory.getLokiThreadDatabase(context).getAllV2OpenGroups() } diff --git a/libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt b/libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt index 9d42a2a2f8..dc557d337d 100644 --- a/libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt +++ b/libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt @@ -115,6 +115,7 @@ interface StorageProtocol { fun isClosedGroup(publicKey: String): Boolean fun getClosedGroupEncryptionKeyPairs(groupPublicKey: String): MutableList fun getLatestClosedGroupEncryptionKeyPair(groupPublicKey: String): ECKeyPair? + fun setExpirationTimer(groupID: String, duration: Int) // Groups fun getAllGroups(): List diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt index 6503582f89..e7e5196671 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt @@ -34,6 +34,7 @@ class ClosedGroupControlMessage() : ControlMessage() { is Kind.New -> { !kind.publicKey.isEmpty && kind.name.isNotEmpty() && kind.encryptionKeyPair?.publicKey != null && kind.encryptionKeyPair?.privateKey != null && kind.members.isNotEmpty() && kind.admins.isNotEmpty() + && kind.expireTimer >= 0 } is Kind.EncryptionKeyPair -> true is Kind.NameChange -> kind.name.isNotEmpty() @@ -44,8 +45,8 @@ class ClosedGroupControlMessage() : ControlMessage() { } sealed class Kind { - class New(var publicKey: ByteString, var name: String, var encryptionKeyPair: ECKeyPair?, var members: List, var admins: List) : Kind() { - internal constructor() : this(ByteString.EMPTY, "", null, listOf(), listOf()) + class New(var publicKey: ByteString, var name: String, var encryptionKeyPair: ECKeyPair?, var members: List, var admins: List, var expireTimer: Int) : Kind() { + internal constructor() : this(ByteString.EMPTY, "", null, listOf(), listOf(), 0) } /** An encryption key pair encrypted for each member individually. * @@ -88,10 +89,11 @@ class ClosedGroupControlMessage() : ControlMessage() { val publicKey = closedGroupControlMessageProto.publicKey ?: return null val name = closedGroupControlMessageProto.name ?: return null val encryptionKeyPairAsProto = closedGroupControlMessageProto.encryptionKeyPair ?: return null + val expireTimer = closedGroupControlMessageProto.expireTimer try { val encryptionKeyPair = ECKeyPair(DjbECPublicKey(encryptionKeyPairAsProto.publicKey.toByteArray()), DjbECPrivateKey(encryptionKeyPairAsProto.privateKey.toByteArray())) - kind = Kind.New(publicKey, name, encryptionKeyPair, closedGroupControlMessageProto.membersList, closedGroupControlMessageProto.adminsList) + kind = Kind.New(publicKey, name, encryptionKeyPair, closedGroupControlMessageProto.membersList, closedGroupControlMessageProto.adminsList, expireTimer) } catch (e: Exception) { Log.w(TAG, "Couldn't parse key pair from proto: $encryptionKeyPairAsProto.") return null @@ -140,9 +142,10 @@ class ClosedGroupControlMessage() : ControlMessage() { val encryptionKeyPair = SignalServiceProtos.KeyPair.newBuilder() encryptionKeyPair.publicKey = ByteString.copyFrom(kind.encryptionKeyPair!!.publicKey.serialize().removing05PrefixIfNeeded()) encryptionKeyPair.privateKey = ByteString.copyFrom(kind.encryptionKeyPair!!.privateKey.serialize()) - closedGroupControlMessage.encryptionKeyPair = encryptionKeyPair.build() + closedGroupControlMessage.encryptionKeyPair = encryptionKeyPair.build() closedGroupControlMessage.addAllMembers(kind.members) closedGroupControlMessage.addAllAdmins(kind.admins) + closedGroupControlMessage.expireTimer = kind.expireTimer } is Kind.EncryptionKeyPair -> { closedGroupControlMessage.type = DataMessage.ClosedGroupControlMessage.Type.ENCRYPTION_KEY_PAIR diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt index 6f8b0a6647..c7dec83d19 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt @@ -11,8 +11,10 @@ import org.session.libsession.messaging.sending_receiving.MessageSender.Error import org.session.libsession.messaging.sending_receiving.notifications.PushNotificationAPI import org.session.libsession.messaging.sending_receiving.pollers.ClosedGroupPollerV2 import org.session.libsession.utilities.Address +import org.session.libsession.utilities.Address.Companion.fromSerialized import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.TextSecurePreferences +import org.session.libsession.utilities.recipients.Recipient import org.session.libsignal.crypto.ecc.Curve import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.utilities.guava.Optional @@ -50,7 +52,7 @@ fun MessageSender.create(name: String, members: Collection): Promise) Log.d("Loki", "Can't add members to nonexistent closed group.") throw Error.NoThread } + // Get expiration timer value for the group + val recipient = Recipient.from(context, fromSerialized(groupID), false) + val expireTimer = recipient.expireMessages if (membersToAdd.isEmpty()) { Log.d("Loki", "Invalid closed group update.") throw Error.InvalidClosedGroupUpdate @@ -155,7 +160,7 @@ fun MessageSender.addMembers(groupPublicKey: String, membersToAdd: List) send(closedGroupControlMessage, Address.fromSerialized(groupID)) // Send closed group update messages to any new members individually for (member in membersToAdd) { - val closedGroupNewKind = ClosedGroupControlMessage.Kind.New(ByteString.copyFrom(Hex.fromStringCondensed(groupPublicKey)), name, encryptionKeyPair, membersAsData, adminsAsData) + val closedGroupNewKind = ClosedGroupControlMessage.Kind.New(ByteString.copyFrom(Hex.fromStringCondensed(groupPublicKey)), name, encryptionKeyPair, membersAsData, adminsAsData, expireTimer) val closedGroupControlMessage = ClosedGroupControlMessage(closedGroupNewKind) closedGroupControlMessage.sentTimestamp = sentTime send(closedGroupControlMessage, Address.fromSerialized(member)) diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt index 653492138e..bb6b5ada67 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt @@ -121,7 +121,7 @@ private fun handleConfigurationMessage(message: ConfigurationMessage) { for (closedGroup in message.closedGroups) { if (allClosedGroupPublicKeys.contains(closedGroup.publicKey)) continue handleNewClosedGroup(message.sender!!, message.sentTimestamp!!, closedGroup.publicKey, closedGroup.name, - closedGroup.encryptionKeyPair!!, closedGroup.members, closedGroup.admins, message.sentTimestamp!!) + closedGroup.encryptionKeyPair!!, closedGroup.members, closedGroup.admins, message.sentTimestamp!!, 0) } val allV2OpenGroups = storage.getAllV2OpenGroups().map { it.value.joinURL } for (openGroup in message.openGroups) { @@ -256,10 +256,11 @@ private fun MessageReceiver.handleNewClosedGroup(message: ClosedGroupControlMess val groupPublicKey = kind.publicKey.toByteArray().toHexString() val members = kind.members.map { it.toByteArray().toHexString() } val admins = kind.admins.map { it.toByteArray().toHexString() } - handleNewClosedGroup(message.sender!!, message.sentTimestamp!!, groupPublicKey, kind.name, kind.encryptionKeyPair!!, members, admins, message.sentTimestamp!!) + val expireTimer = kind.expireTimer + handleNewClosedGroup(message.sender!!, message.sentTimestamp!!, groupPublicKey, kind.name, kind.encryptionKeyPair!!, members, admins, message.sentTimestamp!!, expireTimer) } -private fun handleNewClosedGroup(sender: String, sentTimestamp: Long, groupPublicKey: String, name: String, encryptionKeyPair: ECKeyPair, members: List, admins: List, formationTimestamp: Long) { +private fun handleNewClosedGroup(sender: String, sentTimestamp: Long, groupPublicKey: String, name: String, encryptionKeyPair: ECKeyPair, members: List, admins: List, formationTimestamp: Long, expireTimer: Int) { val context = MessagingModuleConfiguration.shared.context val storage = MessagingModuleConfiguration.shared.storage // Create the group @@ -289,6 +290,8 @@ private fun handleNewClosedGroup(sender: String, sentTimestamp: Long, groupPubli storage.addClosedGroupPublicKey(groupPublicKey) // Store the encryption key pair storage.addClosedGroupEncryptionKeyPair(encryptionKeyPair, groupPublicKey) + // Set expiration timer + storage.setExpirationTimer(groupID, expireTimer) // Notify the PN server PushNotificationAPI.performOperation(PushNotificationAPI.ClosedGroupOperation.Subscribe, groupPublicKey, storage.getUserPublicKey()!!) // Start polling From f4ae16239e21524a60dd0ce4fbf1cbe085c59840 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Fri, 11 Jun 2021 11:27:15 +1000 Subject: [PATCH 12/12] Clean --- .../messaging/messages/control/ClosedGroupControlMessage.kt | 2 +- .../sending_receiving/MessageSenderClosedGroupHandler.kt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt index e7e5196671..bd20346f99 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt @@ -34,7 +34,7 @@ class ClosedGroupControlMessage() : ControlMessage() { is Kind.New -> { !kind.publicKey.isEmpty && kind.name.isNotEmpty() && kind.encryptionKeyPair?.publicKey != null && kind.encryptionKeyPair?.privateKey != null && kind.members.isNotEmpty() && kind.admins.isNotEmpty() - && kind.expireTimer >= 0 + && kind.expireTimer >= 0 } is Kind.EncryptionKeyPair -> true is Kind.NameChange -> kind.name.isNotEmpty() diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt index c7dec83d19..521d043170 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt @@ -133,7 +133,6 @@ fun MessageSender.addMembers(groupPublicKey: String, membersToAdd: List) Log.d("Loki", "Can't add members to nonexistent closed group.") throw Error.NoThread } - // Get expiration timer value for the group val recipient = Recipient.from(context, fromSerialized(groupID), false) val expireTimer = recipient.expireMessages if (membersToAdd.isEmpty()) {