diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java index e9d417de5d..70db382976 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java @@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; import org.session.libsignal.utilities.Base64; import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.messages.SignalServiceEnvelope; -import org.session.libsignal.service.internal.util.Util; +import org.session.libsignal.utilities.Util; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt index 9e867bbe61..646d2ac8c3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt @@ -8,8 +8,8 @@ import org.session.libsignal.crypto.ecc.DjbECPrivateKey import org.session.libsignal.crypto.ecc.DjbECPublicKey import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.service.api.messages.SignalServiceGroup -import org.session.libsignal.service.internal.push.SignalServiceProtos -import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage +import org.session.libsignal.protos.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos.DataMessage import org.session.libsignal.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.toHexString import org.thoughtcrime.securesms.database.DatabaseFactory diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java index 000327b351..a0770d2d7c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java @@ -44,7 +44,7 @@ import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact; import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.utilities.ServiceUtil; import org.session.libsession.utilities.TextSecurePreferences; -import org.session.libsignal.service.internal.util.Util; +import org.session.libsignal.utilities.Util; import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.contactshare.ContactUtil; diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt index a89831a140..d4622f9031 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt @@ -17,9 +17,9 @@ import org.session.libsignal.streams.AttachmentCipherOutputStream import org.session.libsignal.service.api.messages.SignalServiceAttachmentStream import org.session.libsignal.streams.PaddingInputStream import org.session.libsignal.service.internal.push.PushAttachmentData -import org.session.libsignal.service.internal.push.http.AttachmentCipherOutputStreamFactory -import org.session.libsignal.service.internal.push.http.DigestingRequestBody -import org.session.libsignal.service.internal.util.Util +import org.session.libsignal.streams.AttachmentCipherOutputStreamFactory +import org.session.libsignal.streams.DigestingRequestBody +import org.session.libsignal.utilities.Util import org.session.libsignal.streams.PlaintextOutputStreamFactory import org.session.libsignal.utilities.Log diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt index 323c3fd263..56779795ea 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt @@ -2,7 +2,7 @@ package org.session.libsession.messaging.messages import com.google.protobuf.ByteString import org.session.libsession.utilities.GroupUtil -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos abstract class Message { var id: Long? = null 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 ee396c7069..0a393608fc 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 @@ -8,8 +8,8 @@ import org.session.libsession.utilities.GroupUtil import org.session.libsignal.crypto.ecc.DjbECPrivateKey import org.session.libsignal.crypto.ecc.DjbECPublicKey import org.session.libsignal.crypto.ecc.ECKeyPair -import org.session.libsignal.service.internal.push.SignalServiceProtos -import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage +import org.session.libsignal.protos.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos.DataMessage import org.session.libsignal.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.toHexString import org.session.libsignal.utilities.Hex diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ConfigurationMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ConfigurationMessage.kt index b8371ebaa1..79fd100a8b 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ConfigurationMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ConfigurationMessage.kt @@ -9,7 +9,7 @@ import org.session.libsession.utilities.preferences.ProfileKeyUtil import org.session.libsignal.crypto.ecc.DjbECPrivateKey import org.session.libsignal.crypto.ecc.DjbECPublicKey import org.session.libsignal.crypto.ecc.ECKeyPair -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.toHexString import org.session.libsignal.utilities.Hex diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/DataExtractionNotification.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/DataExtractionNotification.kt index a58cb8166b..9789a33af3 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/DataExtractionNotification.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/DataExtractionNotification.kt @@ -1,6 +1,6 @@ package org.session.libsession.messaging.messages.control -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.Log class DataExtractionNotification() : ControlMessage() { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt index 5ce55ed832..97233d6a23 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt @@ -3,7 +3,7 @@ package org.session.libsession.messaging.messages.control import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.messages.visible.VisibleMessage import org.session.libsignal.utilities.Log -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos class ExpirationTimerUpdate() : ControlMessage() { /** In the case of a sync message, the public key of the person the message was targeted at. diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ReadReceipt.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ReadReceipt.kt index d27dc1f732..e0c7b690bc 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ReadReceipt.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ReadReceipt.kt @@ -1,6 +1,6 @@ package org.session.libsession.messaging.messages.control -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.Log class ReadReceipt() : ControlMessage() { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/TypingIndicator.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/TypingIndicator.kt index 649a93308e..c755751ba6 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/TypingIndicator.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/TypingIndicator.kt @@ -1,6 +1,6 @@ package org.session.libsession.messaging.messages.control -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.Log class TypingIndicator() : ControlMessage() { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt index ecfc3feb52..ee5a7f3fe3 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt @@ -7,7 +7,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.Attachment import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import java.io.File class Attachment { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/LinkPreview.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/LinkPreview.kt index 91c68779c6..6187c9a9e3 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/LinkPreview.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/LinkPreview.kt @@ -3,7 +3,7 @@ package org.session.libsession.messaging.messages.visible import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview as SignalLinkPreiview import org.session.libsignal.utilities.Log -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos class LinkPreview() { var title: String? = null diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt index f26ce81dde..71faa53769 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt @@ -1,6 +1,6 @@ package org.session.libsession.messaging.messages.visible -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.Log class OpenGroupInvitation() { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt index bc79381ebc..cf792e6a84 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt @@ -2,7 +2,7 @@ package org.session.libsession.messaging.messages.visible import com.google.protobuf.ByteString import org.session.libsignal.utilities.Log -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos class Profile() { var displayName: String? = null diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Quote.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Quote.kt index 69f2300a01..21b9200d64 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Quote.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Quote.kt @@ -5,7 +5,7 @@ import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel as SignalQuote import org.session.libsignal.utilities.Log -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos class Quote() { var timestamp: Long? = 0 diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt index 298ccdf006..08451f9c39 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt @@ -7,7 +7,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAt import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.threads.recipients.Recipient import org.session.libsession.utilities.GroupUtil -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.Log import org.session.libsession.messaging.sending_receiving.attachments.Attachment as SignalAttachment diff --git a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt index 49fa9c76b5..0a606ad3fd 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt @@ -2,7 +2,7 @@ package org.session.libsession.messaging.open_groups import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsignal.service.internal.push.PushTransportDetails -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Base64.decode import org.session.libsignal.utilities.Log diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt index 6335bd92f8..2052de4f6d 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt @@ -6,7 +6,7 @@ import org.session.libsession.messaging.messages.control.* import org.session.libsession.messaging.messages.visible.VisibleMessage import org.session.libsession.utilities.GroupUtil import org.session.libsignal.service.internal.push.PushTransportDetails -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos object MessageReceiver { diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt index cdd11d8581..28b778c5fa 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt @@ -22,7 +22,7 @@ import org.session.libsession.snode.SnodeMessage import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.SSKEnvironment import org.session.libsignal.service.internal.push.PushTransportDetails -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.hexEncodedPublicKey import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Log 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 1beaf47229..207b0bedd1 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 @@ -16,7 +16,7 @@ import org.session.libsignal.crypto.ecc.Curve import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.service.api.messages.SignalServiceGroup -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.hexEncodedPublicKey import org.session.libsignal.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.Hex 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 3435247695..12aef6120f 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 @@ -25,7 +25,7 @@ import org.session.libsignal.crypto.ecc.DjbECPublicKey import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.service.api.messages.SignalServiceGroup -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.toHexString import org.session.libsignal.utilities.Base64 diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java index 2f038f913f..d6ba340dc0 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java @@ -9,7 +9,7 @@ import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.messages.SignalServiceAttachment; import org.session.libsignal.service.api.messages.SignalServiceDataMessage; import org.session.libsignal.utilities.Base64; -import org.session.libsignal.service.internal.push.SignalServiceProtos; +import org.session.libsignal.protos.SignalServiceProtos; import java.util.LinkedList; import java.util.List; diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt index 634557eddd..6f20657a58 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt @@ -8,7 +8,7 @@ package org.session.libsession.messaging.sending_receiving.attachments import android.util.Size import com.google.protobuf.ByteString import org.session.libsignal.utilities.guava.Optional -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.service.api.messages.SignalServiceAttachment as SAttachment import java.io.InputStream import kotlin.math.round diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/MessageNotifier.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/MessageNotifier.kt index 7243415247..4a7889b75d 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/MessageNotifier.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/MessageNotifier.kt @@ -2,8 +2,6 @@ package org.session.libsession.messaging.sending_receiving.notifications import android.content.Context import org.session.libsession.messaging.threads.recipients.Recipient -import org.session.libsignal.service.api.messages.SignalServiceGroup -import org.session.libsignal.service.internal.push.SignalServiceProtos interface MessageNotifier { fun setVisibleThread(threadId: Long) diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt index 9c3b3f582f..9c37e1e8b9 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt @@ -11,7 +11,7 @@ import org.session.libsession.messaging.open_groups.OpenGroupAPI import org.session.libsession.messaging.open_groups.OpenGroupMessage import org.session.libsession.messaging.threads.Address import org.session.libsession.utilities.GroupUtil -import org.session.libsignal.service.internal.push.SignalServiceProtos.* +import org.session.libsignal.protos.SignalServiceProtos.* import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.successBackground import java.util.* diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupV2Poller.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupV2Poller.kt index ab84252805..35d1624231 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupV2Poller.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupV2Poller.kt @@ -9,7 +9,7 @@ import org.session.libsession.messaging.open_groups.OpenGroupMessageV2 import org.session.libsession.messaging.open_groups.OpenGroupV2 import org.session.libsession.messaging.threads.Address import org.session.libsession.utilities.GroupUtil -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.successBackground import java.util.concurrent.ScheduledExecutorService diff --git a/libsession/src/main/java/org/session/libsession/messaging/threads/Address.kt b/libsession/src/main/java/org/session/libsession/messaging/threads/Address.kt index 33c83b036d..ca2f803ff5 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/threads/Address.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/threads/Address.kt @@ -8,7 +8,7 @@ import androidx.annotation.VisibleForTesting import org.session.libsession.utilities.DelimiterUtil import org.session.libsession.utilities.GroupUtil import org.session.libsignal.utilities.guava.Optional -import org.session.libsignal.service.internal.util.Util +import org.session.libsignal.utilities.Util import java.util.* import java.util.concurrent.atomic.AtomicReference import java.util.regex.Matcher diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt index 222efae16a..0567f73c4f 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt @@ -17,13 +17,12 @@ import org.session.libsignal.service.api.push.exceptions.PushNetworkException import org.session.libsignal.service.api.util.StreamDetails import org.session.libsignal.service.internal.push.ProfileAvatarData import org.session.libsignal.service.internal.push.PushAttachmentData -import org.session.libsignal.service.internal.push.http.DigestingRequestBody -import org.session.libsignal.service.internal.push.http.ProfileCipherOutputStreamFactory +import org.session.libsignal.streams.DigestingRequestBody +import org.session.libsignal.streams.ProfileCipherOutputStreamFactory import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.JsonUtil import org.session.libsignal.utilities.HTTP import org.session.libsignal.utilities.* -import org.session.libsignal.utilities.* import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Log import java.util.* @@ -210,7 +209,7 @@ open class DotNetAPI { fun uploadProfilePicture(server: String, key: ByteArray, profilePicture: StreamDetails, setLastProfilePictureUpload: () -> Unit): UploadResult { val profilePictureUploadData = ProfileAvatarData(profilePicture.stream, ProfileCipherOutputStream.getCiphertextLength(profilePicture.length), profilePicture.contentType, ProfileCipherOutputStreamFactory(key)) val file = DigestingRequestBody(profilePictureUploadData.data, profilePictureUploadData.outputStreamFactory, - profilePictureUploadData.contentType, profilePictureUploadData.dataLength, null) + profilePictureUploadData.contentType, profilePictureUploadData.dataLength, null) val body = MultipartBody.Builder() .setType(MultipartBody.FORM) .addFormDataPart("type", "network.loki") diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/MessageWrapper.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/MessageWrapper.kt index d84195752b..569b9c62c1 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/utilities/MessageWrapper.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/MessageWrapper.kt @@ -2,7 +2,7 @@ package org.session.libsession.messaging.utilities import com.google.protobuf.ByteString import org.session.libsignal.utilities.Log -import org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope +import org.session.libsignal.protos.SignalServiceProtos.Envelope import org.session.libsignal.protos.WebSocketProtos.WebSocketMessage import org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage import java.security.SecureRandom diff --git a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt index a355dbaa29..21581d255f 100644 --- a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt +++ b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt @@ -8,7 +8,7 @@ import nl.komponents.kovenant.functional.bind import nl.komponents.kovenant.functional.map import org.session.libsession.messaging.utilities.MessageWrapper import org.session.libsession.snode.utilities.getRandomElement -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.service.loki.Snode import org.session.libsignal.utilities.HTTP import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol diff --git a/libsession/src/main/java/org/session/libsession/utilities/AESGCM.kt b/libsession/src/main/java/org/session/libsession/utilities/AESGCM.kt index 4de7266a41..225900b096 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/AESGCM.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/AESGCM.kt @@ -2,7 +2,7 @@ package org.session.libsession.utilities import androidx.annotation.WorkerThread import org.session.libsignal.utilities.ByteUtil -import org.session.libsignal.service.internal.util.Util +import org.session.libsignal.utilities.Util import org.session.libsignal.utilities.Hex import org.whispersystems.curve25519.Curve25519 import javax.crypto.Cipher diff --git a/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt b/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt index 93f21054e9..ddffb2cc2c 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt @@ -8,8 +8,8 @@ import org.session.libsession.messaging.file_server.FileServerAPIV2 import org.session.libsession.utilities.preferences.ProfileKeyUtil import org.session.libsignal.streams.ProfileCipherOutputStream import org.session.libsignal.service.internal.push.ProfileAvatarData -import org.session.libsignal.service.internal.push.http.DigestingRequestBody -import org.session.libsignal.service.internal.push.http.ProfileCipherOutputStreamFactory +import org.session.libsignal.streams.DigestingRequestBody +import org.session.libsignal.streams.ProfileCipherOutputStreamFactory import org.session.libsignal.utilities.retryIfNeeded import org.session.libsignal.utilities.ThreadUtils import java.io.ByteArrayInputStream diff --git a/libsession/src/main/java/org/session/libsession/utilities/SSKEnvironment.kt b/libsession/src/main/java/org/session/libsession/utilities/SSKEnvironment.kt index 2e2bf37de4..f3a130e847 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/SSKEnvironment.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/SSKEnvironment.kt @@ -5,7 +5,6 @@ import org.session.libsession.messaging.messages.control.ExpirationTimerUpdate import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.threads.recipients.Recipient -import org.session.libsignal.service.internal.push.SignalServiceProtos class SSKEnvironment( val typingIndicators: TypingIndicatorsProtocol, diff --git a/libsignal/src/main/java/org/session/libsignal/crypto/DiffieHellman.kt b/libsignal/src/main/java/org/session/libsignal/crypto/DiffieHellman.kt index 8e009334ad..2b613247bf 100644 --- a/libsignal/src/main/java/org/session/libsignal/crypto/DiffieHellman.kt +++ b/libsignal/src/main/java/org/session/libsignal/crypto/DiffieHellman.kt @@ -1,7 +1,7 @@ package org.session.libsignal.crypto import org.whispersystems.curve25519.Curve25519 -import org.session.libsignal.service.internal.util.Util +import org.session.libsignal.utilities.Util import javax.crypto.Cipher import javax.crypto.spec.IvParameterSpec import javax.crypto.spec.SecretKeySpec diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java b/libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java similarity index 78% rename from libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java rename to libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java index 773b46f092..5bd3d84d51 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java +++ b/libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: SignalService.proto -package org.session.libsignal.service.internal.push; +package org.session.libsignal.protos; public final class SignalServiceProtos { private SignalServiceProtos() {} @@ -27,7 +27,7 @@ public final class SignalServiceProtos { * @required * */ - org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Type getType(); + SignalServiceProtos.Envelope.Type getType(); // optional string source = 2; /** @@ -145,7 +145,7 @@ public final class SignalServiceProtos { } case 8: { int rawValue = input.readEnum(); - org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Type value = org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Type.valueOf(rawValue); + SignalServiceProtos.Envelope.Type value = 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 org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_Envelope_descriptor; + return SignalServiceProtos.internal_static_signalservice_Envelope_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_Envelope_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_Envelope_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.class, org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Builder.class); + SignalServiceProtos.Envelope.class, 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 org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.getDescriptor().getEnumTypes().get(0); + return 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 org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Type type_; + private SignalServiceProtos.Envelope.Type type_; /** * required .signalservice.Envelope.Type type = 1; * @@ -321,7 +321,7 @@ public final class SignalServiceProtos { * @required * */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Type getType() { + public SignalServiceProtos.Envelope.Type getType() { return type_; } @@ -441,7 +441,7 @@ public final class SignalServiceProtos { } private void initFields() { - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Type.SESSION_MESSAGE; + type_ = SignalServiceProtos.Envelope.Type.SESSION_MESSAGE; source_ = ""; sourceDevice_ = 0; timestamp_ = 0L; @@ -531,53 +531,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope parseFrom( + public static SignalServiceProtos.Envelope parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope parseFrom( + public static 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 org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope parseFrom(byte[] data) + public static SignalServiceProtos.Envelope parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope parseFrom( + public static SignalServiceProtos.Envelope parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope parseFrom(java.io.InputStream input) + public static SignalServiceProtos.Envelope parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope parseFrom( + public static SignalServiceProtos.Envelope parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.Envelope parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope parseDelimitedFrom( + public static SignalServiceProtos.Envelope parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope parseFrom( + public static SignalServiceProtos.Envelope parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope parseFrom( + public static 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(org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope prototype) { + public static Builder newBuilder(SignalServiceProtos.Envelope prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -602,20 +602,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.EnvelopeOrBuilder { + implements SignalServiceProtos.EnvelopeOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_Envelope_descriptor; + return SignalServiceProtos.internal_static_signalservice_Envelope_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_Envelope_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_Envelope_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.class, org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Builder.class); + SignalServiceProtos.Envelope.class, SignalServiceProtos.Envelope.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.Envelope.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -635,7 +635,7 @@ public final class SignalServiceProtos { public Builder clear() { super.clear(); - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Type.SESSION_MESSAGE; + type_ = 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 org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_Envelope_descriptor; + return SignalServiceProtos.internal_static_signalservice_Envelope_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.getDefaultInstance(); + public SignalServiceProtos.Envelope getDefaultInstanceForType() { + return SignalServiceProtos.Envelope.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope result = buildPartial(); + public SignalServiceProtos.Envelope build() { + SignalServiceProtos.Envelope result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope result = new org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope(this); + public SignalServiceProtos.Envelope buildPartial() { + SignalServiceProtos.Envelope result = new 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 org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope)other); + if (other instanceof SignalServiceProtos.Envelope) { + return mergeFrom((SignalServiceProtos.Envelope)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.Envelope other) { + if (other == 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 { - org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope parsedMessage = null; + SignalServiceProtos.Envelope parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope) e.getUnfinishedMessage(); + parsedMessage = (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 org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Type type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Type.SESSION_MESSAGE; + private SignalServiceProtos.Envelope.Type type_ = SignalServiceProtos.Envelope.Type.SESSION_MESSAGE; /** * required .signalservice.Envelope.Type type = 1; * @@ -789,7 +789,7 @@ public final class SignalServiceProtos { * @required * */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Type getType() { + public SignalServiceProtos.Envelope.Type getType() { return type_; } /** @@ -799,7 +799,7 @@ public final class SignalServiceProtos { * @required * */ - public Builder setType(org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Type value) { + public Builder setType(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_ = org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Type.SESSION_MESSAGE; + type_ = SignalServiceProtos.Envelope.Type.SESSION_MESSAGE; onChanged(); return this; } @@ -1095,7 +1095,7 @@ public final class SignalServiceProtos { * @required * */ - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Action getAction(); + SignalServiceProtos.TypingMessage.Action getAction(); } /** * Protobuf type {@code signalservice.TypingMessage} @@ -1155,7 +1155,7 @@ public final class SignalServiceProtos { } case 16: { int rawValue = input.readEnum(); - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Action value = org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Action.valueOf(rawValue); + SignalServiceProtos.TypingMessage.Action value = 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 org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_TypingMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_TypingMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_TypingMessage_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_TypingMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.class, org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Builder.class); + SignalServiceProtos.TypingMessage.class, 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 org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.getDescriptor().getEnumTypes().get(0); + return 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 org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Action action_; + private SignalServiceProtos.TypingMessage.Action action_; /** * required .signalservice.TypingMessage.Action action = 2; * @@ -1330,13 +1330,13 @@ public final class SignalServiceProtos { * @required * */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Action getAction() { + public SignalServiceProtos.TypingMessage.Action getAction() { return action_; } private void initFields() { timestamp_ = 0L; - action_ = org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Action.STARTED; + action_ = 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 org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage parseFrom( + public static SignalServiceProtos.TypingMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage parseFrom( + public static 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 org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage parseFrom(byte[] data) + public static SignalServiceProtos.TypingMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage parseFrom( + public static SignalServiceProtos.TypingMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage parseFrom(java.io.InputStream input) + public static SignalServiceProtos.TypingMessage parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage parseFrom( + public static SignalServiceProtos.TypingMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.TypingMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage parseDelimitedFrom( + public static SignalServiceProtos.TypingMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage parseFrom( + public static SignalServiceProtos.TypingMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage parseFrom( + public static 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(org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage prototype) { + public static Builder newBuilder(SignalServiceProtos.TypingMessage prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1464,20 +1464,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessageOrBuilder { + implements SignalServiceProtos.TypingMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_TypingMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_TypingMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_TypingMessage_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_TypingMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.class, org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Builder.class); + SignalServiceProtos.TypingMessage.class, SignalServiceProtos.TypingMessage.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.TypingMessage.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -1499,7 +1499,7 @@ public final class SignalServiceProtos { super.clear(); timestamp_ = 0L; bitField0_ = (bitField0_ & ~0x00000001); - action_ = org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Action.STARTED; + action_ = 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 org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_TypingMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_TypingMessage_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.getDefaultInstance(); + public SignalServiceProtos.TypingMessage getDefaultInstanceForType() { + return SignalServiceProtos.TypingMessage.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage result = buildPartial(); + public SignalServiceProtos.TypingMessage build() { + SignalServiceProtos.TypingMessage result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage result = new org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage(this); + public SignalServiceProtos.TypingMessage buildPartial() { + SignalServiceProtos.TypingMessage result = new 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 org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage)other); + if (other instanceof SignalServiceProtos.TypingMessage) { + return mergeFrom((SignalServiceProtos.TypingMessage)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.TypingMessage other) { + if (other == 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 { - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage parsedMessage = null; + SignalServiceProtos.TypingMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage) e.getUnfinishedMessage(); + parsedMessage = (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 org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Action action_ = org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Action.STARTED; + private SignalServiceProtos.TypingMessage.Action action_ = SignalServiceProtos.TypingMessage.Action.STARTED; /** * required .signalservice.TypingMessage.Action action = 2; * @@ -1662,7 +1662,7 @@ public final class SignalServiceProtos { * @required * */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Action getAction() { + public SignalServiceProtos.TypingMessage.Action getAction() { return action_; } /** @@ -1672,7 +1672,7 @@ public final class SignalServiceProtos { * @required * */ - public Builder setAction(org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Action value) { + public Builder setAction(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_ = org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Action.STARTED; + action_ = SignalServiceProtos.TypingMessage.Action.STARTED; onChanged(); return this; } @@ -1717,11 +1717,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage dataMessage = 1; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage getDataMessage(); + SignalServiceProtos.DataMessage getDataMessage(); /** * optional .signalservice.DataMessage dataMessage = 1; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessageOrBuilder getDataMessageOrBuilder(); + SignalServiceProtos.DataMessageOrBuilder getDataMessageOrBuilder(); // optional .signalservice.ReceiptMessage receiptMessage = 5; /** @@ -1731,11 +1731,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage getReceiptMessage(); + SignalServiceProtos.ReceiptMessage getReceiptMessage(); /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessageOrBuilder getReceiptMessageOrBuilder(); + SignalServiceProtos.ReceiptMessageOrBuilder getReceiptMessageOrBuilder(); // optional .signalservice.TypingMessage typingMessage = 6; /** @@ -1745,11 +1745,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.TypingMessage typingMessage = 6; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage getTypingMessage(); + SignalServiceProtos.TypingMessage getTypingMessage(); /** * optional .signalservice.TypingMessage typingMessage = 6; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessageOrBuilder getTypingMessageOrBuilder(); + SignalServiceProtos.TypingMessageOrBuilder getTypingMessageOrBuilder(); // optional .signalservice.ConfigurationMessage configurationMessage = 7; /** @@ -1759,11 +1759,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage getConfigurationMessage(); + SignalServiceProtos.ConfigurationMessage getConfigurationMessage(); /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessageOrBuilder getConfigurationMessageOrBuilder(); + SignalServiceProtos.ConfigurationMessageOrBuilder getConfigurationMessageOrBuilder(); // optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; /** @@ -1773,11 +1773,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification getDataExtractionNotification(); + SignalServiceProtos.DataExtractionNotification getDataExtractionNotification(); /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotificationOrBuilder getDataExtractionNotificationOrBuilder(); + SignalServiceProtos.DataExtractionNotificationOrBuilder getDataExtractionNotificationOrBuilder(); } /** * Protobuf type {@code signalservice.Content} @@ -1831,11 +1831,11 @@ public final class SignalServiceProtos { break; } case 10: { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Builder subBuilder = null; + SignalServiceProtos.DataMessage.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { subBuilder = dataMessage_.toBuilder(); } - dataMessage_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.PARSER, extensionRegistry); + dataMessage_ = input.readMessage(SignalServiceProtos.DataMessage.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(dataMessage_); dataMessage_ = subBuilder.buildPartial(); @@ -1844,11 +1844,11 @@ public final class SignalServiceProtos { break; } case 42: { - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Builder subBuilder = null; + SignalServiceProtos.ReceiptMessage.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = receiptMessage_.toBuilder(); } - receiptMessage_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.PARSER, extensionRegistry); + receiptMessage_ = input.readMessage(SignalServiceProtos.ReceiptMessage.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(receiptMessage_); receiptMessage_ = subBuilder.buildPartial(); @@ -1857,11 +1857,11 @@ public final class SignalServiceProtos { break; } case 50: { - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Builder subBuilder = null; + SignalServiceProtos.TypingMessage.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = typingMessage_.toBuilder(); } - typingMessage_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.PARSER, extensionRegistry); + typingMessage_ = input.readMessage(SignalServiceProtos.TypingMessage.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(typingMessage_); typingMessage_ = subBuilder.buildPartial(); @@ -1870,11 +1870,11 @@ public final class SignalServiceProtos { break; } case 58: { - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Builder subBuilder = null; + SignalServiceProtos.ConfigurationMessage.Builder subBuilder = null; if (((bitField0_ & 0x00000008) == 0x00000008)) { subBuilder = configurationMessage_.toBuilder(); } - configurationMessage_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.PARSER, extensionRegistry); + configurationMessage_ = input.readMessage(SignalServiceProtos.ConfigurationMessage.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(configurationMessage_); configurationMessage_ = subBuilder.buildPartial(); @@ -1883,11 +1883,11 @@ public final class SignalServiceProtos { break; } case 66: { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Builder subBuilder = null; + SignalServiceProtos.DataExtractionNotification.Builder subBuilder = null; if (((bitField0_ & 0x00000010) == 0x00000010)) { subBuilder = dataExtractionNotification_.toBuilder(); } - dataExtractionNotification_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.PARSER, extensionRegistry); + dataExtractionNotification_ = input.readMessage(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 org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_Content_descriptor; + return SignalServiceProtos.internal_static_signalservice_Content_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_Content_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_Content_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.Content.class, org.session.libsignal.service.internal.push.SignalServiceProtos.Content.Builder.class); + SignalServiceProtos.Content.class, 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage dataMessage_; + private SignalServiceProtos.DataMessage dataMessage_; /** * optional .signalservice.DataMessage dataMessage = 1; */ @@ -1947,19 +1947,19 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage dataMessage = 1; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage getDataMessage() { + public SignalServiceProtos.DataMessage getDataMessage() { return dataMessage_; } /** * optional .signalservice.DataMessage dataMessage = 1; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessageOrBuilder getDataMessageOrBuilder() { + public SignalServiceProtos.DataMessageOrBuilder getDataMessageOrBuilder() { return dataMessage_; } // optional .signalservice.ReceiptMessage receiptMessage = 5; public static final int RECEIPTMESSAGE_FIELD_NUMBER = 5; - private org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage receiptMessage_; + private SignalServiceProtos.ReceiptMessage receiptMessage_; /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ @@ -1969,19 +1969,19 @@ public final class SignalServiceProtos { /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage getReceiptMessage() { + public SignalServiceProtos.ReceiptMessage getReceiptMessage() { return receiptMessage_; } /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessageOrBuilder getReceiptMessageOrBuilder() { + public SignalServiceProtos.ReceiptMessageOrBuilder getReceiptMessageOrBuilder() { return receiptMessage_; } // optional .signalservice.TypingMessage typingMessage = 6; public static final int TYPINGMESSAGE_FIELD_NUMBER = 6; - private org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage typingMessage_; + private SignalServiceProtos.TypingMessage typingMessage_; /** * optional .signalservice.TypingMessage typingMessage = 6; */ @@ -1991,19 +1991,19 @@ public final class SignalServiceProtos { /** * optional .signalservice.TypingMessage typingMessage = 6; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage getTypingMessage() { + public SignalServiceProtos.TypingMessage getTypingMessage() { return typingMessage_; } /** * optional .signalservice.TypingMessage typingMessage = 6; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessageOrBuilder getTypingMessageOrBuilder() { + public SignalServiceProtos.TypingMessageOrBuilder getTypingMessageOrBuilder() { return typingMessage_; } // optional .signalservice.ConfigurationMessage configurationMessage = 7; public static final int CONFIGURATIONMESSAGE_FIELD_NUMBER = 7; - private org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage configurationMessage_; + private SignalServiceProtos.ConfigurationMessage configurationMessage_; /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ @@ -2013,19 +2013,19 @@ public final class SignalServiceProtos { /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage getConfigurationMessage() { + public SignalServiceProtos.ConfigurationMessage getConfigurationMessage() { return configurationMessage_; } /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessageOrBuilder getConfigurationMessageOrBuilder() { + public SignalServiceProtos.ConfigurationMessageOrBuilder getConfigurationMessageOrBuilder() { return configurationMessage_; } // optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; public static final int DATAEXTRACTIONNOTIFICATION_FIELD_NUMBER = 8; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification dataExtractionNotification_; + private SignalServiceProtos.DataExtractionNotification dataExtractionNotification_; /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ @@ -2035,22 +2035,22 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification getDataExtractionNotification() { + public SignalServiceProtos.DataExtractionNotification getDataExtractionNotification() { return dataExtractionNotification_; } /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotificationOrBuilder getDataExtractionNotificationOrBuilder() { + public SignalServiceProtos.DataExtractionNotificationOrBuilder getDataExtractionNotificationOrBuilder() { return dataExtractionNotification_; } private void initFields() { - dataMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.getDefaultInstance(); - receiptMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.getDefaultInstance(); - typingMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.getDefaultInstance(); - configurationMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); - dataExtractionNotification_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); + dataMessage_ = SignalServiceProtos.DataMessage.getDefaultInstance(); + receiptMessage_ = SignalServiceProtos.ReceiptMessage.getDefaultInstance(); + typingMessage_ = SignalServiceProtos.TypingMessage.getDefaultInstance(); + configurationMessage_ = SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); + dataExtractionNotification_ = SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -2150,53 +2150,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Content parseFrom( + public static SignalServiceProtos.Content parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Content parseFrom( + public static 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 org.session.libsignal.service.internal.push.SignalServiceProtos.Content parseFrom(byte[] data) + public static SignalServiceProtos.Content parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Content parseFrom( + public static SignalServiceProtos.Content parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Content parseFrom(java.io.InputStream input) + public static SignalServiceProtos.Content parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Content parseFrom( + public static SignalServiceProtos.Content parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Content parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.Content parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Content parseDelimitedFrom( + public static SignalServiceProtos.Content parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Content parseFrom( + public static SignalServiceProtos.Content parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Content parseFrom( + public static 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(org.session.libsignal.service.internal.push.SignalServiceProtos.Content prototype) { + public static Builder newBuilder(SignalServiceProtos.Content prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -2221,20 +2221,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.ContentOrBuilder { + implements SignalServiceProtos.ContentOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_Content_descriptor; + return SignalServiceProtos.internal_static_signalservice_Content_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_Content_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_Content_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.Content.class, org.session.libsignal.service.internal.push.SignalServiceProtos.Content.Builder.class); + SignalServiceProtos.Content.class, SignalServiceProtos.Content.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.Content.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.Content.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -2260,31 +2260,31 @@ public final class SignalServiceProtos { public Builder clear() { super.clear(); if (dataMessageBuilder_ == null) { - dataMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.getDefaultInstance(); + dataMessage_ = SignalServiceProtos.DataMessage.getDefaultInstance(); } else { dataMessageBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000001); if (receiptMessageBuilder_ == null) { - receiptMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.getDefaultInstance(); + receiptMessage_ = SignalServiceProtos.ReceiptMessage.getDefaultInstance(); } else { receiptMessageBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000002); if (typingMessageBuilder_ == null) { - typingMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.getDefaultInstance(); + typingMessage_ = SignalServiceProtos.TypingMessage.getDefaultInstance(); } else { typingMessageBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000004); if (configurationMessageBuilder_ == null) { - configurationMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); + configurationMessage_ = SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); } else { configurationMessageBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000008); if (dataExtractionNotificationBuilder_ == null) { - dataExtractionNotification_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); + dataExtractionNotification_ = SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); } else { dataExtractionNotificationBuilder_.clear(); } @@ -2298,23 +2298,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_Content_descriptor; + return SignalServiceProtos.internal_static_signalservice_Content_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.Content getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.Content.getDefaultInstance(); + public SignalServiceProtos.Content getDefaultInstanceForType() { + return SignalServiceProtos.Content.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.Content build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.Content result = buildPartial(); + public SignalServiceProtos.Content build() { + SignalServiceProtos.Content result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.Content buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.Content result = new org.session.libsignal.service.internal.push.SignalServiceProtos.Content(this); + public SignalServiceProtos.Content buildPartial() { + SignalServiceProtos.Content result = new 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 org.session.libsignal.service.internal.push.SignalServiceProtos.Content) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.Content)other); + if (other instanceof SignalServiceProtos.Content) { + return mergeFrom((SignalServiceProtos.Content)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.Content other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.Content.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.Content other) { + if (other == 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 { - org.session.libsignal.service.internal.push.SignalServiceProtos.Content parsedMessage = null; + SignalServiceProtos.Content parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.Content) e.getUnfinishedMessage(); + parsedMessage = (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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage dataMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.getDefaultInstance(); + private SignalServiceProtos.DataMessage dataMessage_ = SignalServiceProtos.DataMessage.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessageOrBuilder> dataMessageBuilder_; + SignalServiceProtos.DataMessage, SignalServiceProtos.DataMessage.Builder, SignalServiceProtos.DataMessageOrBuilder> dataMessageBuilder_; /** * optional .signalservice.DataMessage dataMessage = 1; */ @@ -2458,7 +2458,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage dataMessage = 1; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage getDataMessage() { + public 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(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage value) { + public Builder setDataMessage(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( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Builder builderForValue) { + 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(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage value) { + public Builder mergeDataMessage(SignalServiceProtos.DataMessage value) { if (dataMessageBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001) && - dataMessage_ != org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.getDefaultInstance()) { + dataMessage_ != SignalServiceProtos.DataMessage.getDefaultInstance()) { dataMessage_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.newBuilder(dataMessage_).mergeFrom(value).buildPartial(); + 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_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.getDefaultInstance(); + dataMessage_ = SignalServiceProtos.DataMessage.getDefaultInstance(); onChanged(); } else { dataMessageBuilder_.clear(); @@ -2530,7 +2530,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage dataMessage = 1; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Builder getDataMessageBuilder() { + public SignalServiceProtos.DataMessage.Builder getDataMessageBuilder() { bitField0_ |= 0x00000001; onChanged(); return getDataMessageFieldBuilder().getBuilder(); @@ -2538,7 +2538,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage dataMessage = 1; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessageOrBuilder getDataMessageOrBuilder() { + public 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< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessageOrBuilder> + SignalServiceProtos.DataMessage, SignalServiceProtos.DataMessage.Builder, SignalServiceProtos.DataMessageOrBuilder> getDataMessageFieldBuilder() { if (dataMessageBuilder_ == null) { dataMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessageOrBuilder>( + SignalServiceProtos.DataMessage, SignalServiceProtos.DataMessage.Builder, SignalServiceProtos.DataMessageOrBuilder>( dataMessage_, getParentForChildren(), isClean()); @@ -2563,9 +2563,9 @@ public final class SignalServiceProtos { } // optional .signalservice.ReceiptMessage receiptMessage = 5; - private org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage receiptMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.getDefaultInstance(); + private SignalServiceProtos.ReceiptMessage receiptMessage_ = SignalServiceProtos.ReceiptMessage.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessageOrBuilder> receiptMessageBuilder_; + SignalServiceProtos.ReceiptMessage, SignalServiceProtos.ReceiptMessage.Builder, SignalServiceProtos.ReceiptMessageOrBuilder> receiptMessageBuilder_; /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ @@ -2575,7 +2575,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage getReceiptMessage() { + public 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(org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage value) { + public Builder setReceiptMessage(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( - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Builder builderForValue) { + 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(org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage value) { + public Builder mergeReceiptMessage(SignalServiceProtos.ReceiptMessage value) { if (receiptMessageBuilder_ == null) { if (((bitField0_ & 0x00000002) == 0x00000002) && - receiptMessage_ != org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.getDefaultInstance()) { + receiptMessage_ != SignalServiceProtos.ReceiptMessage.getDefaultInstance()) { receiptMessage_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.newBuilder(receiptMessage_).mergeFrom(value).buildPartial(); + 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_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.getDefaultInstance(); + receiptMessage_ = SignalServiceProtos.ReceiptMessage.getDefaultInstance(); onChanged(); } else { receiptMessageBuilder_.clear(); @@ -2647,7 +2647,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Builder getReceiptMessageBuilder() { + public SignalServiceProtos.ReceiptMessage.Builder getReceiptMessageBuilder() { bitField0_ |= 0x00000002; onChanged(); return getReceiptMessageFieldBuilder().getBuilder(); @@ -2655,7 +2655,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessageOrBuilder getReceiptMessageOrBuilder() { + public 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< - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessageOrBuilder> + SignalServiceProtos.ReceiptMessage, SignalServiceProtos.ReceiptMessage.Builder, SignalServiceProtos.ReceiptMessageOrBuilder> getReceiptMessageFieldBuilder() { if (receiptMessageBuilder_ == null) { receiptMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessageOrBuilder>( + SignalServiceProtos.ReceiptMessage, SignalServiceProtos.ReceiptMessage.Builder, SignalServiceProtos.ReceiptMessageOrBuilder>( receiptMessage_, getParentForChildren(), isClean()); @@ -2680,9 +2680,9 @@ public final class SignalServiceProtos { } // optional .signalservice.TypingMessage typingMessage = 6; - private org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage typingMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.getDefaultInstance(); + private SignalServiceProtos.TypingMessage typingMessage_ = SignalServiceProtos.TypingMessage.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessageOrBuilder> typingMessageBuilder_; + SignalServiceProtos.TypingMessage, SignalServiceProtos.TypingMessage.Builder, SignalServiceProtos.TypingMessageOrBuilder> typingMessageBuilder_; /** * optional .signalservice.TypingMessage typingMessage = 6; */ @@ -2692,7 +2692,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.TypingMessage typingMessage = 6; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage getTypingMessage() { + public 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(org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage value) { + public Builder setTypingMessage(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( - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Builder builderForValue) { + 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(org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage value) { + public Builder mergeTypingMessage(SignalServiceProtos.TypingMessage value) { if (typingMessageBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - typingMessage_ != org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.getDefaultInstance()) { + typingMessage_ != SignalServiceProtos.TypingMessage.getDefaultInstance()) { typingMessage_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.newBuilder(typingMessage_).mergeFrom(value).buildPartial(); + 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_ = org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.getDefaultInstance(); + typingMessage_ = SignalServiceProtos.TypingMessage.getDefaultInstance(); onChanged(); } else { typingMessageBuilder_.clear(); @@ -2764,7 +2764,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.TypingMessage typingMessage = 6; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Builder getTypingMessageBuilder() { + public SignalServiceProtos.TypingMessage.Builder getTypingMessageBuilder() { bitField0_ |= 0x00000004; onChanged(); return getTypingMessageFieldBuilder().getBuilder(); @@ -2772,7 +2772,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.TypingMessage typingMessage = 6; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessageOrBuilder getTypingMessageOrBuilder() { + public 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< - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessageOrBuilder> + SignalServiceProtos.TypingMessage, SignalServiceProtos.TypingMessage.Builder, SignalServiceProtos.TypingMessageOrBuilder> getTypingMessageFieldBuilder() { if (typingMessageBuilder_ == null) { typingMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessageOrBuilder>( + SignalServiceProtos.TypingMessage, SignalServiceProtos.TypingMessage.Builder, SignalServiceProtos.TypingMessageOrBuilder>( typingMessage_, getParentForChildren(), isClean()); @@ -2797,9 +2797,9 @@ public final class SignalServiceProtos { } // optional .signalservice.ConfigurationMessage configurationMessage = 7; - private org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage configurationMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); + private SignalServiceProtos.ConfigurationMessage configurationMessage_ = SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessageOrBuilder> configurationMessageBuilder_; + SignalServiceProtos.ConfigurationMessage, SignalServiceProtos.ConfigurationMessage.Builder, SignalServiceProtos.ConfigurationMessageOrBuilder> configurationMessageBuilder_; /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ @@ -2809,7 +2809,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage getConfigurationMessage() { + public 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(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage value) { + public Builder setConfigurationMessage(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( - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Builder builderForValue) { + 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(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage value) { + public Builder mergeConfigurationMessage(SignalServiceProtos.ConfigurationMessage value) { if (configurationMessageBuilder_ == null) { if (((bitField0_ & 0x00000008) == 0x00000008) && - configurationMessage_ != org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.getDefaultInstance()) { + configurationMessage_ != SignalServiceProtos.ConfigurationMessage.getDefaultInstance()) { configurationMessage_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.newBuilder(configurationMessage_).mergeFrom(value).buildPartial(); + 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_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); + configurationMessage_ = SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); onChanged(); } else { configurationMessageBuilder_.clear(); @@ -2881,7 +2881,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Builder getConfigurationMessageBuilder() { + public SignalServiceProtos.ConfigurationMessage.Builder getConfigurationMessageBuilder() { bitField0_ |= 0x00000008; onChanged(); return getConfigurationMessageFieldBuilder().getBuilder(); @@ -2889,7 +2889,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessageOrBuilder getConfigurationMessageOrBuilder() { + public 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< - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessageOrBuilder> + SignalServiceProtos.ConfigurationMessage, SignalServiceProtos.ConfigurationMessage.Builder, SignalServiceProtos.ConfigurationMessageOrBuilder> getConfigurationMessageFieldBuilder() { if (configurationMessageBuilder_ == null) { configurationMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessageOrBuilder>( + SignalServiceProtos.ConfigurationMessage, SignalServiceProtos.ConfigurationMessage.Builder, SignalServiceProtos.ConfigurationMessageOrBuilder>( configurationMessage_, getParentForChildren(), isClean()); @@ -2914,9 +2914,9 @@ public final class SignalServiceProtos { } // optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification dataExtractionNotification_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); + private SignalServiceProtos.DataExtractionNotification dataExtractionNotification_ = SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification, org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotificationOrBuilder> dataExtractionNotificationBuilder_; + SignalServiceProtos.DataExtractionNotification, SignalServiceProtos.DataExtractionNotification.Builder, SignalServiceProtos.DataExtractionNotificationOrBuilder> dataExtractionNotificationBuilder_; /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ @@ -2926,7 +2926,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification getDataExtractionNotification() { + public 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(org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification value) { + public Builder setDataExtractionNotification(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( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Builder builderForValue) { + 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(org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification value) { + public Builder mergeDataExtractionNotification(SignalServiceProtos.DataExtractionNotification value) { if (dataExtractionNotificationBuilder_ == null) { if (((bitField0_ & 0x00000010) == 0x00000010) && - dataExtractionNotification_ != org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.getDefaultInstance()) { + dataExtractionNotification_ != SignalServiceProtos.DataExtractionNotification.getDefaultInstance()) { dataExtractionNotification_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.newBuilder(dataExtractionNotification_).mergeFrom(value).buildPartial(); + 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_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); + dataExtractionNotification_ = SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); onChanged(); } else { dataExtractionNotificationBuilder_.clear(); @@ -2998,7 +2998,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Builder getDataExtractionNotificationBuilder() { + public SignalServiceProtos.DataExtractionNotification.Builder getDataExtractionNotificationBuilder() { bitField0_ |= 0x00000010; onChanged(); return getDataExtractionNotificationFieldBuilder().getBuilder(); @@ -3006,7 +3006,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotificationOrBuilder getDataExtractionNotificationOrBuilder() { + public 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< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification, org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotificationOrBuilder> + SignalServiceProtos.DataExtractionNotification, SignalServiceProtos.DataExtractionNotification.Builder, SignalServiceProtos.DataExtractionNotificationOrBuilder> getDataExtractionNotificationFieldBuilder() { if (dataExtractionNotificationBuilder_ == null) { dataExtractionNotificationBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification, org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotificationOrBuilder>( + SignalServiceProtos.DataExtractionNotification, SignalServiceProtos.DataExtractionNotification.Builder, SignalServiceProtos.DataExtractionNotificationOrBuilder>( dataExtractionNotification_, getParentForChildren(), isClean()); @@ -3155,14 +3155,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_KeyPair_descriptor; + return SignalServiceProtos.internal_static_signalservice_KeyPair_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_KeyPair_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_KeyPair_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.class, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder.class); + SignalServiceProtos.KeyPair.class, SignalServiceProtos.KeyPair.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -3288,53 +3288,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair parseFrom( + public static SignalServiceProtos.KeyPair parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair parseFrom( + public static 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 org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair parseFrom(byte[] data) + public static SignalServiceProtos.KeyPair parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair parseFrom( + public static SignalServiceProtos.KeyPair parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair parseFrom(java.io.InputStream input) + public static SignalServiceProtos.KeyPair parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair parseFrom( + public static SignalServiceProtos.KeyPair parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.KeyPair parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair parseDelimitedFrom( + public static SignalServiceProtos.KeyPair parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair parseFrom( + public static SignalServiceProtos.KeyPair parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair parseFrom( + public static 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(org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair prototype) { + public static Builder newBuilder(SignalServiceProtos.KeyPair prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -3359,20 +3359,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder { + implements SignalServiceProtos.KeyPairOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_KeyPair_descriptor; + return SignalServiceProtos.internal_static_signalservice_KeyPair_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_KeyPair_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_KeyPair_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.class, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder.class); + SignalServiceProtos.KeyPair.class, SignalServiceProtos.KeyPair.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.KeyPair.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -3405,23 +3405,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_KeyPair_descriptor; + return SignalServiceProtos.internal_static_signalservice_KeyPair_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.getDefaultInstance(); + public SignalServiceProtos.KeyPair getDefaultInstanceForType() { + return SignalServiceProtos.KeyPair.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair result = buildPartial(); + public SignalServiceProtos.KeyPair build() { + SignalServiceProtos.KeyPair result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair result = new org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair(this); + public SignalServiceProtos.KeyPair buildPartial() { + SignalServiceProtos.KeyPair result = new 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 org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair)other); + if (other instanceof SignalServiceProtos.KeyPair) { + return mergeFrom((SignalServiceProtos.KeyPair)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.KeyPair other) { + if (other == 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 { - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair parsedMessage = null; + SignalServiceProtos.KeyPair parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.KeyPair) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -3623,7 +3623,7 @@ public final class SignalServiceProtos { * @required * */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Type getType(); + SignalServiceProtos.DataExtractionNotification.Type getType(); // optional uint64 timestamp = 2; /** @@ -3688,7 +3688,7 @@ public final class SignalServiceProtos { } case 8: { int rawValue = input.readEnum(); - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Type value = org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Type.valueOf(rawValue); + SignalServiceProtos.DataExtractionNotification.Type value = 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 org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Builder.class); + SignalServiceProtos.DataExtractionNotification.class, 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.getDescriptor().getEnumTypes().get(0); + return 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Type type_; + private SignalServiceProtos.DataExtractionNotification.Type type_; /** * required .signalservice.DataExtractionNotification.Type type = 1; * @@ -3852,7 +3852,7 @@ public final class SignalServiceProtos { * @required * */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Type getType() { + public SignalServiceProtos.DataExtractionNotification.Type getType() { return type_; } @@ -3873,7 +3873,7 @@ public final class SignalServiceProtos { } private void initFields() { - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Type.SCREENSHOT; + type_ = SignalServiceProtos.DataExtractionNotification.Type.SCREENSHOT; timestamp_ = 0L; } private byte memoizedIsInitialized = -1; @@ -3927,53 +3927,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification parseFrom( + public static SignalServiceProtos.DataExtractionNotification parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification parseFrom( + public static 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification parseFrom(byte[] data) + public static SignalServiceProtos.DataExtractionNotification parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification parseFrom( + public static SignalServiceProtos.DataExtractionNotification parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification parseFrom(java.io.InputStream input) + public static SignalServiceProtos.DataExtractionNotification parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification parseFrom( + public static SignalServiceProtos.DataExtractionNotification parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.DataExtractionNotification parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification parseDelimitedFrom( + public static SignalServiceProtos.DataExtractionNotification parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification parseFrom( + public static SignalServiceProtos.DataExtractionNotification parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification parseFrom( + public static 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(org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification prototype) { + public static Builder newBuilder(SignalServiceProtos.DataExtractionNotification prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -3998,20 +3998,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotificationOrBuilder { + implements SignalServiceProtos.DataExtractionNotificationOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Builder.class); + SignalServiceProtos.DataExtractionNotification.class, SignalServiceProtos.DataExtractionNotification.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -4031,7 +4031,7 @@ public final class SignalServiceProtos { public Builder clear() { super.clear(); - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Type.SCREENSHOT; + type_ = 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 org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); + public SignalServiceProtos.DataExtractionNotification getDefaultInstanceForType() { + return SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification result = buildPartial(); + public SignalServiceProtos.DataExtractionNotification build() { + SignalServiceProtos.DataExtractionNotification result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification result = new org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification(this); + public SignalServiceProtos.DataExtractionNotification buildPartial() { + SignalServiceProtos.DataExtractionNotification result = new 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification)other); + if (other instanceof SignalServiceProtos.DataExtractionNotification) { + return mergeFrom((SignalServiceProtos.DataExtractionNotification)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.DataExtractionNotification other) { + if (other == 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 { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification parsedMessage = null; + SignalServiceProtos.DataExtractionNotification parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification) e.getUnfinishedMessage(); + parsedMessage = (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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Type type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Type.SCREENSHOT; + private SignalServiceProtos.DataExtractionNotification.Type type_ = SignalServiceProtos.DataExtractionNotification.Type.SCREENSHOT; /** * required .signalservice.DataExtractionNotification.Type type = 1; * @@ -4143,7 +4143,7 @@ public final class SignalServiceProtos { * @required * */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Type getType() { + public SignalServiceProtos.DataExtractionNotification.Type getType() { return type_; } /** @@ -4153,7 +4153,7 @@ public final class SignalServiceProtos { * @required * */ - public Builder setType(org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Type value) { + public Builder setType(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_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Type.SCREENSHOT; + type_ = 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; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getAttachments(int index); + 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; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder getAttachmentsOrBuilder( + SignalServiceProtos.AttachmentPointerOrBuilder getAttachmentsOrBuilder( int index); // optional .signalservice.GroupContext group = 3; @@ -4271,11 +4271,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.GroupContext group = 3; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext getGroup(); + SignalServiceProtos.GroupContext getGroup(); /** * optional .signalservice.GroupContext group = 3; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContextOrBuilder getGroupOrBuilder(); + SignalServiceProtos.GroupContextOrBuilder getGroupOrBuilder(); // optional uint32 flags = 4; /** @@ -4325,22 +4325,22 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.Quote quote = 8; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote getQuote(); + SignalServiceProtos.DataMessage.Quote getQuote(); /** * optional .signalservice.DataMessage.Quote quote = 8; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.QuoteOrBuilder getQuoteOrBuilder(); + 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; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview getPreview(int index); + 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; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.PreviewOrBuilder getPreviewOrBuilder( + 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; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile getProfile(); + SignalServiceProtos.DataMessage.LokiProfile getProfile(); /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfileOrBuilder getProfileOrBuilder(); + SignalServiceProtos.DataMessage.LokiProfileOrBuilder getProfileOrBuilder(); // optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; /** @@ -4378,11 +4378,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation getOpenGroupInvitation(); + SignalServiceProtos.DataMessage.OpenGroupInvitation getOpenGroupInvitation(); /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder(); + SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder(); // optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; /** @@ -4392,11 +4392,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage getClosedGroupControlMessage(); + SignalServiceProtos.DataMessage.ClosedGroupControlMessage getClosedGroupControlMessage(); /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder getClosedGroupControlMessageOrBuilder(); + 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(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.PARSER, extensionRegistry)); + attachments_.add(input.readMessage(SignalServiceProtos.AttachmentPointer.PARSER, extensionRegistry)); break; } case 26: { - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Builder subBuilder = null; + SignalServiceProtos.GroupContext.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = group_.toBuilder(); } - group_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.PARSER, extensionRegistry); + group_ = input.readMessage(SignalServiceProtos.GroupContext.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(group_); group_ = subBuilder.buildPartial(); @@ -4511,11 +4511,11 @@ public final class SignalServiceProtos { break; } case 66: { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.Builder subBuilder = null; + SignalServiceProtos.DataMessage.Quote.Builder subBuilder = null; if (((bitField0_ & 0x00000040) == 0x00000040)) { subBuilder = quote_.toBuilder(); } - quote_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.PARSER, extensionRegistry); + quote_ = input.readMessage(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(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.PARSER, extensionRegistry)); + preview_.add(input.readMessage(SignalServiceProtos.DataMessage.Preview.PARSER, extensionRegistry)); break; } case 810: { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.Builder subBuilder = null; + SignalServiceProtos.DataMessage.LokiProfile.Builder subBuilder = null; if (((bitField0_ & 0x00000080) == 0x00000080)) { subBuilder = profile_.toBuilder(); } - profile_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.PARSER, extensionRegistry); + profile_ = input.readMessage(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: { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder subBuilder = null; + SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder subBuilder = null; if (((bitField0_ & 0x00000100) == 0x00000100)) { subBuilder = openGroupInvitation_.toBuilder(); } - openGroupInvitation_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.PARSER, extensionRegistry); + openGroupInvitation_ = input.readMessage(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: { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder subBuilder = null; + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder subBuilder = null; if (((bitField0_ & 0x00000200) == 0x00000200)) { subBuilder = closedGroupControlMessage_.toBuilder(); } - closedGroupControlMessage_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.PARSER, extensionRegistry); + closedGroupControlMessage_ = input.readMessage(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 org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Builder.class); + SignalServiceProtos.DataMessage.class, 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.getDescriptor().getEnumTypes().get(0); + return 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; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment getAttachments(int index); + 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; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder getAttachmentsOrBuilder( + 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(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.PARSER, extensionRegistry)); + attachments_.add(input.readMessage(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 org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.Builder.class); + SignalServiceProtos.DataMessage.Quote.class, 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; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getThumbnail(); + SignalServiceProtos.AttachmentPointer getThumbnail(); /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder getThumbnailOrBuilder(); + SignalServiceProtos.AttachmentPointerOrBuilder getThumbnailOrBuilder(); // optional uint32 flags = 4; /** @@ -5016,11 +5016,11 @@ public final class SignalServiceProtos { break; } case 26: { - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder subBuilder = null; + SignalServiceProtos.AttachmentPointer.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = thumbnail_.toBuilder(); } - thumbnail_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.PARSER, extensionRegistry); + thumbnail_ = input.readMessage(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 org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder.class); + SignalServiceProtos.DataMessage.Quote.QuotedAttachment.class, 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDescriptor().getEnumTypes().get(0); + return 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 org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer thumbnail_; + private SignalServiceProtos.AttachmentPointer thumbnail_; /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ @@ -5244,13 +5244,13 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getThumbnail() { + public SignalServiceProtos.AttachmentPointer getThumbnail() { return thumbnail_; } /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder getThumbnailOrBuilder() { + public SignalServiceProtos.AttachmentPointerOrBuilder getThumbnailOrBuilder() { return thumbnail_; } @@ -5273,7 +5273,7 @@ public final class SignalServiceProtos { private void initFields() { contentType_ = ""; fileName_ = ""; - thumbnail_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + thumbnail_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); flags_ = 0; } private byte memoizedIsInitialized = -1; @@ -5343,53 +5343,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( + public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( + public static 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom(byte[] data) + public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( + public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( + public static 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseDelimitedFrom( + public static 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( + public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( + public static 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(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment prototype) { + public static Builder newBuilder(SignalServiceProtos.DataMessage.Quote.QuotedAttachment prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -5414,20 +5414,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder { + implements SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder.class); + SignalServiceProtos.DataMessage.Quote.QuotedAttachment.class, SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -5453,7 +5453,7 @@ public final class SignalServiceProtos { fileName_ = ""; bitField0_ = (bitField0_ & ~0x00000002); if (thumbnailBuilder_ == null) { - thumbnail_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + thumbnail_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); } else { thumbnailBuilder_.clear(); } @@ -5469,23 +5469,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDefaultInstance(); + public SignalServiceProtos.DataMessage.Quote.QuotedAttachment getDefaultInstanceForType() { + return SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment result = buildPartial(); + public SignalServiceProtos.DataMessage.Quote.QuotedAttachment build() { + SignalServiceProtos.DataMessage.Quote.QuotedAttachment result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment result = new org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment(this); + public SignalServiceProtos.DataMessage.Quote.QuotedAttachment buildPartial() { + SignalServiceProtos.DataMessage.Quote.QuotedAttachment result = new 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment)other); + if (other instanceof SignalServiceProtos.DataMessage.Quote.QuotedAttachment) { + return mergeFrom((SignalServiceProtos.DataMessage.Quote.QuotedAttachment)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.DataMessage.Quote.QuotedAttachment other) { + if (other == 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 { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parsedMessage = null; + SignalServiceProtos.DataMessage.Quote.QuotedAttachment parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment) e.getUnfinishedMessage(); + parsedMessage = (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 org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer thumbnail_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + private SignalServiceProtos.AttachmentPointer thumbnail_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder> thumbnailBuilder_; + SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder> thumbnailBuilder_; /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ @@ -5734,7 +5734,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getThumbnail() { + public 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(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer value) { + public Builder setThumbnail(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( - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder builderForValue) { + 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(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer value) { + public Builder mergeThumbnail(SignalServiceProtos.AttachmentPointer value) { if (thumbnailBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - thumbnail_ != org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance()) { + thumbnail_ != SignalServiceProtos.AttachmentPointer.getDefaultInstance()) { thumbnail_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.newBuilder(thumbnail_).mergeFrom(value).buildPartial(); + 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_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + thumbnail_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); onChanged(); } else { thumbnailBuilder_.clear(); @@ -5806,7 +5806,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder getThumbnailBuilder() { + public SignalServiceProtos.AttachmentPointer.Builder getThumbnailBuilder() { bitField0_ |= 0x00000004; onChanged(); return getThumbnailFieldBuilder().getBuilder(); @@ -5814,7 +5814,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder getThumbnailOrBuilder() { + public 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< - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder> + SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder> getThumbnailFieldBuilder() { if (thumbnailBuilder_ == null) { thumbnailBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder>( + SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment getAttachments(int index) { + public SignalServiceProtos.DataMessage.Quote.QuotedAttachment getAttachments(int index) { return attachments_.get(index); } /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder getAttachmentsOrBuilder( + public SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder getAttachmentsOrBuilder( int index) { return attachments_.get(index); } @@ -6122,53 +6122,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote parseFrom( + public static SignalServiceProtos.DataMessage.Quote parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote parseFrom( + public static 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote parseFrom(byte[] data) + public static SignalServiceProtos.DataMessage.Quote parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote parseFrom( + public static SignalServiceProtos.DataMessage.Quote parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote parseFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.Quote parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote parseFrom( + public static SignalServiceProtos.DataMessage.Quote parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.Quote parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote parseDelimitedFrom( + public static SignalServiceProtos.DataMessage.Quote parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote parseFrom( + public static SignalServiceProtos.DataMessage.Quote parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote parseFrom( + public static 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(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote prototype) { + public static Builder newBuilder(SignalServiceProtos.DataMessage.Quote prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -6193,20 +6193,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.QuoteOrBuilder { + implements SignalServiceProtos.DataMessage.QuoteOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.Builder.class); + SignalServiceProtos.DataMessage.Quote.class, SignalServiceProtos.DataMessage.Quote.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -6248,23 +6248,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); + public SignalServiceProtos.DataMessage.Quote getDefaultInstanceForType() { + return SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote result = buildPartial(); + public SignalServiceProtos.DataMessage.Quote build() { + SignalServiceProtos.DataMessage.Quote result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote result = new org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote(this); + public SignalServiceProtos.DataMessage.Quote buildPartial() { + SignalServiceProtos.DataMessage.Quote result = new 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote)other); + if (other instanceof SignalServiceProtos.DataMessage.Quote) { + return mergeFrom((SignalServiceProtos.DataMessage.Quote)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.DataMessage.Quote other) { + if (other == 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 { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote parsedMessage = null; + SignalServiceProtos.DataMessage.Quote parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote) e.getUnfinishedMessage(); + parsedMessage = (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< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder> attachmentsBuilder_; + SignalServiceProtos.DataMessage.Quote.QuotedAttachment, SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder, 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment getAttachments(int index) { + public 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, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment value) { + int index, 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, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder builderForValue) { + int index, 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(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment value) { + public Builder addAttachments(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, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment value) { + int index, 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( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder builderForValue) { + 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, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder builderForValue) { + int index, 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder getAttachmentsBuilder( + public SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder getAttachmentsBuilder( int index) { return getAttachmentsFieldBuilder().getBuilder(index); } /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder getAttachmentsOrBuilder( + public 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder addAttachmentsBuilder() { + public SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder addAttachmentsBuilder() { return getAttachmentsFieldBuilder().addBuilder( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDefaultInstance()); + SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDefaultInstance()); } /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder addAttachmentsBuilder( + public SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder addAttachmentsBuilder( int index) { return getAttachmentsFieldBuilder().addBuilder( - index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDefaultInstance()); + index, 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< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder> + SignalServiceProtos.DataMessage.Quote.QuotedAttachment, SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder, SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder> getAttachmentsFieldBuilder() { if (attachmentsBuilder_ == null) { attachmentsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder>( + SignalServiceProtos.DataMessage.Quote.QuotedAttachment, SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder, SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder>( attachments_, ((bitField0_ & 0x00000008) == 0x00000008), getParentForChildren(), @@ -6909,11 +6909,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer image = 3; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getImage(); + SignalServiceProtos.AttachmentPointer getImage(); /** * optional .signalservice.AttachmentPointer image = 3; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder getImageOrBuilder(); + SignalServiceProtos.AttachmentPointerOrBuilder getImageOrBuilder(); } /** * Protobuf type {@code signalservice.DataMessage.Preview} @@ -6977,11 +6977,11 @@ public final class SignalServiceProtos { break; } case 26: { - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder subBuilder = null; + SignalServiceProtos.AttachmentPointer.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = image_.toBuilder(); } - image_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.PARSER, extensionRegistry); + image_ = input.readMessage(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 org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.Builder.class); + SignalServiceProtos.DataMessage.Preview.class, 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 org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer image_; + private SignalServiceProtos.AttachmentPointer image_; /** * optional .signalservice.AttachmentPointer image = 3; */ @@ -7139,20 +7139,20 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer image = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getImage() { + public SignalServiceProtos.AttachmentPointer getImage() { return image_; } /** * optional .signalservice.AttachmentPointer image = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder getImageOrBuilder() { + public SignalServiceProtos.AttachmentPointerOrBuilder getImageOrBuilder() { return image_; } private void initFields() { url_ = ""; title_ = ""; - image_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + image_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -7218,53 +7218,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview parseFrom( + public static SignalServiceProtos.DataMessage.Preview parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview parseFrom( + public static 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview parseFrom(byte[] data) + public static SignalServiceProtos.DataMessage.Preview parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview parseFrom( + public static SignalServiceProtos.DataMessage.Preview parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview parseFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.Preview parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview parseFrom( + public static SignalServiceProtos.DataMessage.Preview parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.Preview parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview parseDelimitedFrom( + public static SignalServiceProtos.DataMessage.Preview parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview parseFrom( + public static SignalServiceProtos.DataMessage.Preview parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview parseFrom( + public static 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(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview prototype) { + public static Builder newBuilder(SignalServiceProtos.DataMessage.Preview prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -7289,20 +7289,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.PreviewOrBuilder { + implements SignalServiceProtos.DataMessage.PreviewOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.Builder.class); + SignalServiceProtos.DataMessage.Preview.class, SignalServiceProtos.DataMessage.Preview.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -7328,7 +7328,7 @@ public final class SignalServiceProtos { title_ = ""; bitField0_ = (bitField0_ & ~0x00000002); if (imageBuilder_ == null) { - image_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + image_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); } else { imageBuilder_.clear(); } @@ -7342,23 +7342,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.getDefaultInstance(); + public SignalServiceProtos.DataMessage.Preview getDefaultInstanceForType() { + return SignalServiceProtos.DataMessage.Preview.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview result = buildPartial(); + public SignalServiceProtos.DataMessage.Preview build() { + SignalServiceProtos.DataMessage.Preview result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview result = new org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview(this); + public SignalServiceProtos.DataMessage.Preview buildPartial() { + SignalServiceProtos.DataMessage.Preview result = new 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview)other); + if (other instanceof SignalServiceProtos.DataMessage.Preview) { + return mergeFrom((SignalServiceProtos.DataMessage.Preview)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.DataMessage.Preview other) { + if (other == 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 { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview parsedMessage = null; + SignalServiceProtos.DataMessage.Preview parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview) e.getUnfinishedMessage(); + parsedMessage = (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 org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer image_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + private SignalServiceProtos.AttachmentPointer image_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder> imageBuilder_; + SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder> imageBuilder_; /** * optional .signalservice.AttachmentPointer image = 3; */ @@ -7628,7 +7628,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer image = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getImage() { + public 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(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer value) { + public Builder setImage(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( - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder builderForValue) { + 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(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer value) { + public Builder mergeImage(SignalServiceProtos.AttachmentPointer value) { if (imageBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - image_ != org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance()) { + image_ != SignalServiceProtos.AttachmentPointer.getDefaultInstance()) { image_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.newBuilder(image_).mergeFrom(value).buildPartial(); + 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_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + image_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); onChanged(); } else { imageBuilder_.clear(); @@ -7700,7 +7700,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer image = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder getImageBuilder() { + public SignalServiceProtos.AttachmentPointer.Builder getImageBuilder() { bitField0_ |= 0x00000004; onChanged(); return getImageFieldBuilder().getBuilder(); @@ -7708,7 +7708,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer image = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder getImageOrBuilder() { + public 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< - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder> + SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder> getImageFieldBuilder() { if (imageBuilder_ == null) { imageBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder>( + SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder>( image_, getParentForChildren(), isClean()); @@ -7851,14 +7851,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.Builder.class); + SignalServiceProtos.DataMessage.LokiProfile.class, 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile parseFrom( + public static SignalServiceProtos.DataMessage.LokiProfile parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile parseFrom( + public static 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile parseFrom(byte[] data) + public static SignalServiceProtos.DataMessage.LokiProfile parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile parseFrom( + public static SignalServiceProtos.DataMessage.LokiProfile parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile parseFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.LokiProfile parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile parseFrom( + public static SignalServiceProtos.DataMessage.LokiProfile parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.LokiProfile parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile parseDelimitedFrom( + public static SignalServiceProtos.DataMessage.LokiProfile parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile parseFrom( + public static SignalServiceProtos.DataMessage.LokiProfile parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile parseFrom( + public static 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(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile prototype) { + public static Builder newBuilder(SignalServiceProtos.DataMessage.LokiProfile prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -8085,20 +8085,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfileOrBuilder { + implements SignalServiceProtos.DataMessage.LokiProfileOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.Builder.class); + SignalServiceProtos.DataMessage.LokiProfile.class, SignalServiceProtos.DataMessage.LokiProfile.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -8131,23 +8131,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); + public SignalServiceProtos.DataMessage.LokiProfile getDefaultInstanceForType() { + return SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile result = buildPartial(); + public SignalServiceProtos.DataMessage.LokiProfile build() { + SignalServiceProtos.DataMessage.LokiProfile result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile result = new org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile(this); + public SignalServiceProtos.DataMessage.LokiProfile buildPartial() { + SignalServiceProtos.DataMessage.LokiProfile result = new 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile)other); + if (other instanceof SignalServiceProtos.DataMessage.LokiProfile) { + return mergeFrom((SignalServiceProtos.DataMessage.LokiProfile)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.DataMessage.LokiProfile other) { + if (other == 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 { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile parsedMessage = null; + SignalServiceProtos.DataMessage.LokiProfile parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile) e.getUnfinishedMessage(); + parsedMessage = (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 org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder.class); + SignalServiceProtos.DataMessage.OpenGroupInvitation.class, 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( + public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( + public static 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom(byte[] data) + public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( + public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( + public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseDelimitedFrom( + public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( + public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( + public static 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(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation prototype) { + public static Builder newBuilder(SignalServiceProtos.DataMessage.OpenGroupInvitation prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -8768,20 +8768,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder { + implements SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder.class); + SignalServiceProtos.DataMessage.OpenGroupInvitation.class, SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -8814,23 +8814,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); + public SignalServiceProtos.DataMessage.OpenGroupInvitation getDefaultInstanceForType() { + return SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation result = buildPartial(); + public SignalServiceProtos.DataMessage.OpenGroupInvitation build() { + SignalServiceProtos.DataMessage.OpenGroupInvitation result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation result = new org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation(this); + public SignalServiceProtos.DataMessage.OpenGroupInvitation buildPartial() { + SignalServiceProtos.DataMessage.OpenGroupInvitation result = new 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation)other); + if (other instanceof SignalServiceProtos.DataMessage.OpenGroupInvitation) { + return mergeFrom((SignalServiceProtos.DataMessage.OpenGroupInvitation)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.DataMessage.OpenGroupInvitation other) { + if (other == 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 { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parsedMessage = null; + SignalServiceProtos.DataMessage.OpenGroupInvitation parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.DataMessage.OpenGroupInvitation) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -9128,7 +9128,7 @@ public final class SignalServiceProtos { * @required * */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type getType(); + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type getType(); // optional bytes publicKey = 2; /** @@ -9163,11 +9163,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair getEncryptionKeyPair(); + SignalServiceProtos.KeyPair getEncryptionKeyPair(); /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder(); + 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; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper getWrappers(int index); + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper getWrappers(int index); /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ @@ -9214,12 +9214,12 @@ 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; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder getWrappersOrBuilder( + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder getWrappersOrBuilder( int index); } /** @@ -9275,7 +9275,7 @@ public final class SignalServiceProtos { } case 8: { int rawValue = input.readEnum(); - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type value = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.valueOf(rawValue); + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type value = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); } else { @@ -9295,11 +9295,11 @@ public final class SignalServiceProtos { break; } case 34: { - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder subBuilder = null; + SignalServiceProtos.KeyPair.Builder subBuilder = null; if (((bitField0_ & 0x00000008) == 0x00000008)) { subBuilder = encryptionKeyPair_.toBuilder(); } - encryptionKeyPair_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.PARSER, extensionRegistry); + encryptionKeyPair_ = input.readMessage(SignalServiceProtos.KeyPair.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(encryptionKeyPair_); encryptionKeyPair_ = subBuilder.buildPartial(); @@ -9325,10 +9325,10 @@ 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(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.PARSER, extensionRegistry)); + wrappers_.add(input.readMessage(SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.PARSER, extensionRegistry)); break; } } @@ -9354,14 +9354,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder.class); + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.class, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -9512,7 +9512,7 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDescriptor().getEnumTypes().get(0); + return SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDescriptor().getEnumTypes().get(0); } private static final Type[] VALUES = values(); @@ -9651,14 +9651,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder.class); + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.class, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -9784,53 +9784,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( + public static 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom(byte[] data) + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( + public static 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseDelimitedFrom( + public static 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -9839,7 +9839,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper prototype) { + public static Builder newBuilder(SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -9855,20 +9855,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder { + implements SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder.class); + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.class, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -9901,23 +9901,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.getDefaultInstance(); + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper getDefaultInstanceForType() { + return SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper result = buildPartial(); + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper build() { + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper result = new org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper(this); + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper buildPartial() { + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper result = new SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -9934,16 +9934,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper)other); + if (other instanceof SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper) { + return mergeFrom((SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper other) { + if (other == SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.getDefaultInstance()) return this; if (other.hasPublicKey()) { setPublicKey(other.getPublicKey()); } @@ -9970,11 +9970,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parsedMessage = null; + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -10103,7 +10103,7 @@ public final class SignalServiceProtos { private int bitField0_; // required .signalservice.DataMessage.ClosedGroupControlMessage.Type type = 1; public static final int TYPE_FIELD_NUMBER = 1; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type type_; + private SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type type_; /** * required .signalservice.DataMessage.ClosedGroupControlMessage.Type type = 1; * @@ -10121,7 +10121,7 @@ public final class SignalServiceProtos { * @required * */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type getType() { + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type getType() { return type_; } @@ -10186,7 +10186,7 @@ public final class SignalServiceProtos { // optional .signalservice.KeyPair encryptionKeyPair = 4; public static final int ENCRYPTIONKEYPAIR_FIELD_NUMBER = 4; - private org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair encryptionKeyPair_; + private SignalServiceProtos.KeyPair encryptionKeyPair_; /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ @@ -10196,13 +10196,13 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair getEncryptionKeyPair() { + public SignalServiceProtos.KeyPair getEncryptionKeyPair() { return encryptionKeyPair_; } /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder() { + public SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder() { return encryptionKeyPair_; } @@ -10254,17 +10254,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,22 +10277,22 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper getWrappers(int index) { + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper getWrappers(int index) { return wrappers_.get(index); } /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder getWrappersOrBuilder( + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder getWrappersOrBuilder( int index) { return wrappers_.get(index); } private void initFields() { - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NEW; + type_ = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NEW; publicKey_ = com.google.protobuf.ByteString.EMPTY; name_ = ""; - encryptionKeyPair_ = org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.getDefaultInstance(); + encryptionKeyPair_ = SignalServiceProtos.KeyPair.getDefaultInstance(); members_ = java.util.Collections.emptyList(); admins_ = java.util.Collections.emptyList(); wrappers_ = java.util.Collections.emptyList(); @@ -10405,53 +10405,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( + public static 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom(byte[] data) + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseDelimitedFrom( + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -10460,7 +10460,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage prototype) { + public static Builder newBuilder(SignalServiceProtos.DataMessage.ClosedGroupControlMessage prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -10476,20 +10476,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder { + implements SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder.class); + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.class, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -10511,14 +10511,14 @@ public final class SignalServiceProtos { public Builder clear() { super.clear(); - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NEW; + type_ = 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_ = org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.getDefaultInstance(); + encryptionKeyPair_ = SignalServiceProtos.KeyPair.getDefaultInstance(); } else { encryptionKeyPairBuilder_.clear(); } @@ -10542,23 +10542,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage getDefaultInstanceForType() { + return SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage result = buildPartial(); + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage build() { + SignalServiceProtos.DataMessage.ClosedGroupControlMessage result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage result = new org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage(this); + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage buildPartial() { + SignalServiceProtos.DataMessage.ClosedGroupControlMessage result = new SignalServiceProtos.DataMessage.ClosedGroupControlMessage(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -10606,16 +10606,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage)other); + if (other instanceof SignalServiceProtos.DataMessage.ClosedGroupControlMessage) { + return mergeFrom((SignalServiceProtos.DataMessage.ClosedGroupControlMessage)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.DataMessage.ClosedGroupControlMessage other) { + if (other == SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance()) return this; if (other.hasType()) { setType(other.getType()); } @@ -10704,11 +10704,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parsedMessage = null; + SignalServiceProtos.DataMessage.ClosedGroupControlMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.DataMessage.ClosedGroupControlMessage) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -10720,7 +10720,7 @@ public final class SignalServiceProtos { private int bitField0_; // required .signalservice.DataMessage.ClosedGroupControlMessage.Type type = 1; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NEW; + private SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type type_ = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NEW; /** * required .signalservice.DataMessage.ClosedGroupControlMessage.Type type = 1; * @@ -10738,7 +10738,7 @@ public final class SignalServiceProtos { * @required * */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type getType() { + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type getType() { return type_; } /** @@ -10748,7 +10748,7 @@ public final class SignalServiceProtos { * @required * */ - public Builder setType(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type value) { + public Builder setType(SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type value) { if (value == null) { throw new NullPointerException(); } @@ -10766,7 +10766,7 @@ public final class SignalServiceProtos { */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NEW; + type_ = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NEW; onChanged(); return this; } @@ -10882,9 +10882,9 @@ public final class SignalServiceProtos { } // optional .signalservice.KeyPair encryptionKeyPair = 4; - private org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair encryptionKeyPair_ = org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.getDefaultInstance(); + private SignalServiceProtos.KeyPair encryptionKeyPair_ = SignalServiceProtos.KeyPair.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder> encryptionKeyPairBuilder_; + SignalServiceProtos.KeyPair, SignalServiceProtos.KeyPair.Builder, SignalServiceProtos.KeyPairOrBuilder> encryptionKeyPairBuilder_; /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ @@ -10894,7 +10894,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair getEncryptionKeyPair() { + public SignalServiceProtos.KeyPair getEncryptionKeyPair() { if (encryptionKeyPairBuilder_ == null) { return encryptionKeyPair_; } else { @@ -10904,7 +10904,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - public Builder setEncryptionKeyPair(org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair value) { + public Builder setEncryptionKeyPair(SignalServiceProtos.KeyPair value) { if (encryptionKeyPairBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -10921,7 +10921,7 @@ public final class SignalServiceProtos { * optional .signalservice.KeyPair encryptionKeyPair = 4; */ public Builder setEncryptionKeyPair( - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder builderForValue) { + SignalServiceProtos.KeyPair.Builder builderForValue) { if (encryptionKeyPairBuilder_ == null) { encryptionKeyPair_ = builderForValue.build(); onChanged(); @@ -10934,12 +10934,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - public Builder mergeEncryptionKeyPair(org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair value) { + public Builder mergeEncryptionKeyPair(SignalServiceProtos.KeyPair value) { if (encryptionKeyPairBuilder_ == null) { if (((bitField0_ & 0x00000008) == 0x00000008) && - encryptionKeyPair_ != org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.getDefaultInstance()) { + encryptionKeyPair_ != SignalServiceProtos.KeyPair.getDefaultInstance()) { encryptionKeyPair_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.newBuilder(encryptionKeyPair_).mergeFrom(value).buildPartial(); + SignalServiceProtos.KeyPair.newBuilder(encryptionKeyPair_).mergeFrom(value).buildPartial(); } else { encryptionKeyPair_ = value; } @@ -10955,7 +10955,7 @@ public final class SignalServiceProtos { */ public Builder clearEncryptionKeyPair() { if (encryptionKeyPairBuilder_ == null) { - encryptionKeyPair_ = org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.getDefaultInstance(); + encryptionKeyPair_ = SignalServiceProtos.KeyPair.getDefaultInstance(); onChanged(); } else { encryptionKeyPairBuilder_.clear(); @@ -10966,7 +10966,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder getEncryptionKeyPairBuilder() { + public SignalServiceProtos.KeyPair.Builder getEncryptionKeyPairBuilder() { bitField0_ |= 0x00000008; onChanged(); return getEncryptionKeyPairFieldBuilder().getBuilder(); @@ -10974,7 +10974,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder() { + public SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder() { if (encryptionKeyPairBuilder_ != null) { return encryptionKeyPairBuilder_.getMessageOrBuilder(); } else { @@ -10985,11 +10985,11 @@ public final class SignalServiceProtos { * optional .signalservice.KeyPair encryptionKeyPair = 4; */ private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder> + SignalServiceProtos.KeyPair, SignalServiceProtos.KeyPair.Builder, SignalServiceProtos.KeyPairOrBuilder> getEncryptionKeyPairFieldBuilder() { if (encryptionKeyPairBuilder_ == null) { encryptionKeyPairBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder>( + SignalServiceProtos.KeyPair, SignalServiceProtos.KeyPair.Builder, SignalServiceProtos.KeyPairOrBuilder>( encryptionKeyPair_, getParentForChildren(), isClean()); @@ -11143,22 +11143,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< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder> wrappersBuilder_; + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder, 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 +11178,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper getWrappers(int index) { + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper getWrappers(int index) { if (wrappersBuilder_ == null) { return wrappers_.get(index); } else { @@ -11189,7 +11189,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ public Builder setWrappers( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper value) { + int index, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper value) { if (wrappersBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11206,7 +11206,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ public Builder setWrappers( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder builderForValue) { + int index, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder builderForValue) { if (wrappersBuilder_ == null) { ensureWrappersIsMutable(); wrappers_.set(index, builderForValue.build()); @@ -11219,7 +11219,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public Builder addWrappers(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper value) { + public Builder addWrappers(SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper value) { if (wrappersBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11236,7 +11236,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ public Builder addWrappers( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper value) { + int index, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper value) { if (wrappersBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11253,7 +11253,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ public Builder addWrappers( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder builderForValue) { + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder builderForValue) { if (wrappersBuilder_ == null) { ensureWrappersIsMutable(); wrappers_.add(builderForValue.build()); @@ -11267,7 +11267,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ public Builder addWrappers( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder builderForValue) { + int index, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder builderForValue) { if (wrappersBuilder_ == null) { ensureWrappersIsMutable(); wrappers_.add(index, builderForValue.build()); @@ -11281,7 +11281,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 +11320,14 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder getWrappersBuilder( + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder getWrappersBuilder( int index) { return getWrappersFieldBuilder().getBuilder(index); } /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder getWrappersOrBuilder( + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder getWrappersOrBuilder( int index) { if (wrappersBuilder_ == null) { return wrappers_.get(index); } else { @@ -11337,7 +11337,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 +11348,31 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder addWrappersBuilder() { + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder addWrappersBuilder() { return getWrappersFieldBuilder().addBuilder( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.getDefaultInstance()); + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.getDefaultInstance()); } /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder addWrappersBuilder( + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder addWrappersBuilder( int index) { return getWrappersFieldBuilder().addBuilder( - index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.getDefaultInstance()); + index, 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< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder> + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder> getWrappersFieldBuilder() { if (wrappersBuilder_ == null) { wrappersBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder>( + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder>( wrappers_, ((bitField0_ & 0x00000040) == 0x00000040), getParentForChildren(), @@ -11439,17 +11439,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 +11462,20 @@ public final class SignalServiceProtos { /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getAttachments(int index) { + public SignalServiceProtos.AttachmentPointer getAttachments(int index) { return attachments_.get(index); } /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder getAttachmentsOrBuilder( + public SignalServiceProtos.AttachmentPointerOrBuilder getAttachmentsOrBuilder( int index) { return attachments_.get(index); } // optional .signalservice.GroupContext group = 3; public static final int GROUP_FIELD_NUMBER = 3; - private org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext group_; + private SignalServiceProtos.GroupContext group_; /** * optional .signalservice.GroupContext group = 3; */ @@ -11485,13 +11485,13 @@ public final class SignalServiceProtos { /** * optional .signalservice.GroupContext group = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext getGroup() { + public SignalServiceProtos.GroupContext getGroup() { return group_; } /** * optional .signalservice.GroupContext group = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContextOrBuilder getGroupOrBuilder() { + public SignalServiceProtos.GroupContextOrBuilder getGroupOrBuilder() { return group_; } @@ -11561,7 +11561,7 @@ public final class SignalServiceProtos { // optional .signalservice.DataMessage.Quote quote = 8; public static final int QUOTE_FIELD_NUMBER = 8; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote quote_; + private SignalServiceProtos.DataMessage.Quote quote_; /** * optional .signalservice.DataMessage.Quote quote = 8; */ @@ -11571,29 +11571,29 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.Quote quote = 8; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote getQuote() { + public SignalServiceProtos.DataMessage.Quote getQuote() { return quote_; } /** * optional .signalservice.DataMessage.Quote quote = 8; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.QuoteOrBuilder getQuoteOrBuilder() { + public 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 +11606,20 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview getPreview(int index) { + public SignalServiceProtos.DataMessage.Preview getPreview(int index) { return preview_.get(index); } /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.PreviewOrBuilder getPreviewOrBuilder( + public 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile profile_; + private SignalServiceProtos.DataMessage.LokiProfile profile_; /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ @@ -11629,19 +11629,19 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile getProfile() { + public SignalServiceProtos.DataMessage.LokiProfile getProfile() { return profile_; } /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfileOrBuilder getProfileOrBuilder() { + public SignalServiceProtos.DataMessage.LokiProfileOrBuilder getProfileOrBuilder() { return profile_; } // optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; public static final int OPENGROUPINVITATION_FIELD_NUMBER = 102; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation openGroupInvitation_; + private SignalServiceProtos.DataMessage.OpenGroupInvitation openGroupInvitation_; /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ @@ -11651,19 +11651,19 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation getOpenGroupInvitation() { + public SignalServiceProtos.DataMessage.OpenGroupInvitation getOpenGroupInvitation() { return openGroupInvitation_; } /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder() { + public SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder() { return openGroupInvitation_; } // optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; public static final int CLOSEDGROUPCONTROLMESSAGE_FIELD_NUMBER = 104; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage closedGroupControlMessage_; + private SignalServiceProtos.DataMessage.ClosedGroupControlMessage closedGroupControlMessage_; /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ @@ -11673,13 +11673,13 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage getClosedGroupControlMessage() { + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage getClosedGroupControlMessage() { return closedGroupControlMessage_; } /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder getClosedGroupControlMessageOrBuilder() { + public SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder getClosedGroupControlMessageOrBuilder() { return closedGroupControlMessage_; } @@ -11729,16 +11729,16 @@ public final class SignalServiceProtos { private void initFields() { body_ = ""; attachments_ = java.util.Collections.emptyList(); - group_ = org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.getDefaultInstance(); + group_ = SignalServiceProtos.GroupContext.getDefaultInstance(); flags_ = 0; expireTimer_ = 0; profileKey_ = com.google.protobuf.ByteString.EMPTY; timestamp_ = 0L; - quote_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); + quote_ = SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); preview_ = java.util.Collections.emptyList(); - profile_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); - openGroupInvitation_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); - closedGroupControlMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); + profile_ = SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); + openGroupInvitation_ = SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); + closedGroupControlMessage_ = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); syncTarget_ = ""; } private byte memoizedIsInitialized = -1; @@ -11901,53 +11901,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage parseFrom( + public static SignalServiceProtos.DataMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage parseFrom( + public static 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 org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage parseFrom(byte[] data) + public static SignalServiceProtos.DataMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage parseFrom( + public static SignalServiceProtos.DataMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage parseFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage parseFrom( + public static SignalServiceProtos.DataMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage parseDelimitedFrom( + public static SignalServiceProtos.DataMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage parseFrom( + public static SignalServiceProtos.DataMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage parseFrom( + public static SignalServiceProtos.DataMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -11956,7 +11956,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage prototype) { + public static Builder newBuilder(SignalServiceProtos.DataMessage prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -11972,20 +11972,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessageOrBuilder { + implements SignalServiceProtos.DataMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Builder.class); + SignalServiceProtos.DataMessage.class, SignalServiceProtos.DataMessage.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.DataMessage.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -12021,7 +12021,7 @@ public final class SignalServiceProtos { attachmentsBuilder_.clear(); } if (groupBuilder_ == null) { - group_ = org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.getDefaultInstance(); + group_ = SignalServiceProtos.GroupContext.getDefaultInstance(); } else { groupBuilder_.clear(); } @@ -12035,7 +12035,7 @@ public final class SignalServiceProtos { timestamp_ = 0L; bitField0_ = (bitField0_ & ~0x00000040); if (quoteBuilder_ == null) { - quote_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); + quote_ = SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); } else { quoteBuilder_.clear(); } @@ -12047,19 +12047,19 @@ public final class SignalServiceProtos { previewBuilder_.clear(); } if (profileBuilder_ == null) { - profile_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); + profile_ = SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); } else { profileBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000200); if (openGroupInvitationBuilder_ == null) { - openGroupInvitation_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); + openGroupInvitation_ = SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); } else { openGroupInvitationBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000400); if (closedGroupControlMessageBuilder_ == null) { - closedGroupControlMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); + closedGroupControlMessage_ = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); } else { closedGroupControlMessageBuilder_.clear(); } @@ -12075,23 +12075,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.getDefaultInstance(); + public SignalServiceProtos.DataMessage getDefaultInstanceForType() { + return SignalServiceProtos.DataMessage.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage result = buildPartial(); + public SignalServiceProtos.DataMessage build() { + SignalServiceProtos.DataMessage result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage result = new org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage(this); + public SignalServiceProtos.DataMessage buildPartial() { + SignalServiceProtos.DataMessage result = new SignalServiceProtos.DataMessage(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -12182,16 +12182,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage)other); + if (other instanceof SignalServiceProtos.DataMessage) { + return mergeFrom((SignalServiceProtos.DataMessage)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.DataMessage other) { + if (other == SignalServiceProtos.DataMessage.getDefaultInstance()) return this; if (other.hasBody()) { bitField0_ |= 0x00000001; body_ = other.body_; @@ -12329,11 +12329,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage parsedMessage = null; + SignalServiceProtos.DataMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.DataMessage) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -12419,22 +12419,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< - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder> attachmentsBuilder_; + SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, 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 +12454,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getAttachments(int index) { + public SignalServiceProtos.AttachmentPointer getAttachments(int index) { if (attachmentsBuilder_ == null) { return attachments_.get(index); } else { @@ -12465,7 +12465,7 @@ public final class SignalServiceProtos { * repeated .signalservice.AttachmentPointer attachments = 2; */ public Builder setAttachments( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer value) { + int index, SignalServiceProtos.AttachmentPointer value) { if (attachmentsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12482,7 +12482,7 @@ public final class SignalServiceProtos { * repeated .signalservice.AttachmentPointer attachments = 2; */ public Builder setAttachments( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder builderForValue) { + int index, SignalServiceProtos.AttachmentPointer.Builder builderForValue) { if (attachmentsBuilder_ == null) { ensureAttachmentsIsMutable(); attachments_.set(index, builderForValue.build()); @@ -12495,7 +12495,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public Builder addAttachments(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer value) { + public Builder addAttachments(SignalServiceProtos.AttachmentPointer value) { if (attachmentsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12512,7 +12512,7 @@ public final class SignalServiceProtos { * repeated .signalservice.AttachmentPointer attachments = 2; */ public Builder addAttachments( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer value) { + int index, SignalServiceProtos.AttachmentPointer value) { if (attachmentsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12529,7 +12529,7 @@ public final class SignalServiceProtos { * repeated .signalservice.AttachmentPointer attachments = 2; */ public Builder addAttachments( - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder builderForValue) { + SignalServiceProtos.AttachmentPointer.Builder builderForValue) { if (attachmentsBuilder_ == null) { ensureAttachmentsIsMutable(); attachments_.add(builderForValue.build()); @@ -12543,7 +12543,7 @@ public final class SignalServiceProtos { * repeated .signalservice.AttachmentPointer attachments = 2; */ public Builder addAttachments( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder builderForValue) { + int index, SignalServiceProtos.AttachmentPointer.Builder builderForValue) { if (attachmentsBuilder_ == null) { ensureAttachmentsIsMutable(); attachments_.add(index, builderForValue.build()); @@ -12557,7 +12557,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 +12596,14 @@ public final class SignalServiceProtos { /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder getAttachmentsBuilder( + public SignalServiceProtos.AttachmentPointer.Builder getAttachmentsBuilder( int index) { return getAttachmentsFieldBuilder().getBuilder(index); } /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder getAttachmentsOrBuilder( + public SignalServiceProtos.AttachmentPointerOrBuilder getAttachmentsOrBuilder( int index) { if (attachmentsBuilder_ == null) { return attachments_.get(index); } else { @@ -12613,7 +12613,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 +12624,31 @@ public final class SignalServiceProtos { /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder addAttachmentsBuilder() { + public SignalServiceProtos.AttachmentPointer.Builder addAttachmentsBuilder() { return getAttachmentsFieldBuilder().addBuilder( - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance()); + SignalServiceProtos.AttachmentPointer.getDefaultInstance()); } /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder addAttachmentsBuilder( + public SignalServiceProtos.AttachmentPointer.Builder addAttachmentsBuilder( int index) { return getAttachmentsFieldBuilder().addBuilder( - index, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance()); + index, 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< - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder> + SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder> getAttachmentsFieldBuilder() { if (attachmentsBuilder_ == null) { attachmentsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder>( + SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder>( attachments_, ((bitField0_ & 0x00000002) == 0x00000002), getParentForChildren(), @@ -12659,9 +12659,9 @@ public final class SignalServiceProtos { } // optional .signalservice.GroupContext group = 3; - private org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext group_ = org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.getDefaultInstance(); + private SignalServiceProtos.GroupContext group_ = SignalServiceProtos.GroupContext.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext, org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContextOrBuilder> groupBuilder_; + SignalServiceProtos.GroupContext, SignalServiceProtos.GroupContext.Builder, SignalServiceProtos.GroupContextOrBuilder> groupBuilder_; /** * optional .signalservice.GroupContext group = 3; */ @@ -12671,7 +12671,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.GroupContext group = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext getGroup() { + public SignalServiceProtos.GroupContext getGroup() { if (groupBuilder_ == null) { return group_; } else { @@ -12681,7 +12681,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.GroupContext group = 3; */ - public Builder setGroup(org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext value) { + public Builder setGroup(SignalServiceProtos.GroupContext value) { if (groupBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12698,7 +12698,7 @@ public final class SignalServiceProtos { * optional .signalservice.GroupContext group = 3; */ public Builder setGroup( - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Builder builderForValue) { + SignalServiceProtos.GroupContext.Builder builderForValue) { if (groupBuilder_ == null) { group_ = builderForValue.build(); onChanged(); @@ -12711,12 +12711,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.GroupContext group = 3; */ - public Builder mergeGroup(org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext value) { + public Builder mergeGroup(SignalServiceProtos.GroupContext value) { if (groupBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - group_ != org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.getDefaultInstance()) { + group_ != SignalServiceProtos.GroupContext.getDefaultInstance()) { group_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.newBuilder(group_).mergeFrom(value).buildPartial(); + SignalServiceProtos.GroupContext.newBuilder(group_).mergeFrom(value).buildPartial(); } else { group_ = value; } @@ -12732,7 +12732,7 @@ public final class SignalServiceProtos { */ public Builder clearGroup() { if (groupBuilder_ == null) { - group_ = org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.getDefaultInstance(); + group_ = SignalServiceProtos.GroupContext.getDefaultInstance(); onChanged(); } else { groupBuilder_.clear(); @@ -12743,7 +12743,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.GroupContext group = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Builder getGroupBuilder() { + public SignalServiceProtos.GroupContext.Builder getGroupBuilder() { bitField0_ |= 0x00000004; onChanged(); return getGroupFieldBuilder().getBuilder(); @@ -12751,7 +12751,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.GroupContext group = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContextOrBuilder getGroupOrBuilder() { + public SignalServiceProtos.GroupContextOrBuilder getGroupOrBuilder() { if (groupBuilder_ != null) { return groupBuilder_.getMessageOrBuilder(); } else { @@ -12762,11 +12762,11 @@ public final class SignalServiceProtos { * optional .signalservice.GroupContext group = 3; */ private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext, org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContextOrBuilder> + SignalServiceProtos.GroupContext, SignalServiceProtos.GroupContext.Builder, SignalServiceProtos.GroupContextOrBuilder> getGroupFieldBuilder() { if (groupBuilder_ == null) { groupBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext, org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContextOrBuilder>( + SignalServiceProtos.GroupContext, SignalServiceProtos.GroupContext.Builder, SignalServiceProtos.GroupContextOrBuilder>( group_, getParentForChildren(), isClean()); @@ -12911,9 +12911,9 @@ public final class SignalServiceProtos { } // optional .signalservice.DataMessage.Quote quote = 8; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote quote_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); + private SignalServiceProtos.DataMessage.Quote quote_ = SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.QuoteOrBuilder> quoteBuilder_; + SignalServiceProtos.DataMessage.Quote, SignalServiceProtos.DataMessage.Quote.Builder, SignalServiceProtos.DataMessage.QuoteOrBuilder> quoteBuilder_; /** * optional .signalservice.DataMessage.Quote quote = 8; */ @@ -12923,7 +12923,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.Quote quote = 8; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote getQuote() { + public SignalServiceProtos.DataMessage.Quote getQuote() { if (quoteBuilder_ == null) { return quote_; } else { @@ -12933,7 +12933,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.Quote quote = 8; */ - public Builder setQuote(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote value) { + public Builder setQuote(SignalServiceProtos.DataMessage.Quote value) { if (quoteBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12950,7 +12950,7 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.Quote quote = 8; */ public Builder setQuote( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.Builder builderForValue) { + SignalServiceProtos.DataMessage.Quote.Builder builderForValue) { if (quoteBuilder_ == null) { quote_ = builderForValue.build(); onChanged(); @@ -12963,12 +12963,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.Quote quote = 8; */ - public Builder mergeQuote(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote value) { + public Builder mergeQuote(SignalServiceProtos.DataMessage.Quote value) { if (quoteBuilder_ == null) { if (((bitField0_ & 0x00000080) == 0x00000080) && - quote_ != org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.getDefaultInstance()) { + quote_ != SignalServiceProtos.DataMessage.Quote.getDefaultInstance()) { quote_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.newBuilder(quote_).mergeFrom(value).buildPartial(); + SignalServiceProtos.DataMessage.Quote.newBuilder(quote_).mergeFrom(value).buildPartial(); } else { quote_ = value; } @@ -12984,7 +12984,7 @@ public final class SignalServiceProtos { */ public Builder clearQuote() { if (quoteBuilder_ == null) { - quote_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); + quote_ = SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); onChanged(); } else { quoteBuilder_.clear(); @@ -12995,7 +12995,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.Quote quote = 8; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.Builder getQuoteBuilder() { + public SignalServiceProtos.DataMessage.Quote.Builder getQuoteBuilder() { bitField0_ |= 0x00000080; onChanged(); return getQuoteFieldBuilder().getBuilder(); @@ -13003,7 +13003,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.Quote quote = 8; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.QuoteOrBuilder getQuoteOrBuilder() { + public SignalServiceProtos.DataMessage.QuoteOrBuilder getQuoteOrBuilder() { if (quoteBuilder_ != null) { return quoteBuilder_.getMessageOrBuilder(); } else { @@ -13014,11 +13014,11 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.Quote quote = 8; */ private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.QuoteOrBuilder> + SignalServiceProtos.DataMessage.Quote, SignalServiceProtos.DataMessage.Quote.Builder, SignalServiceProtos.DataMessage.QuoteOrBuilder> getQuoteFieldBuilder() { if (quoteBuilder_ == null) { quoteBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.QuoteOrBuilder>( + SignalServiceProtos.DataMessage.Quote, SignalServiceProtos.DataMessage.Quote.Builder, SignalServiceProtos.DataMessage.QuoteOrBuilder>( quote_, getParentForChildren(), isClean()); @@ -13028,22 +13028,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< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.PreviewOrBuilder> previewBuilder_; + SignalServiceProtos.DataMessage.Preview, SignalServiceProtos.DataMessage.Preview.Builder, 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 +13063,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview getPreview(int index) { + public SignalServiceProtos.DataMessage.Preview getPreview(int index) { if (previewBuilder_ == null) { return preview_.get(index); } else { @@ -13074,7 +13074,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Preview preview = 10; */ public Builder setPreview( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview value) { + int index, SignalServiceProtos.DataMessage.Preview value) { if (previewBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13091,7 +13091,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Preview preview = 10; */ public Builder setPreview( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.Builder builderForValue) { + int index, SignalServiceProtos.DataMessage.Preview.Builder builderForValue) { if (previewBuilder_ == null) { ensurePreviewIsMutable(); preview_.set(index, builderForValue.build()); @@ -13104,7 +13104,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public Builder addPreview(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview value) { + public Builder addPreview(SignalServiceProtos.DataMessage.Preview value) { if (previewBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13121,7 +13121,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Preview preview = 10; */ public Builder addPreview( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview value) { + int index, SignalServiceProtos.DataMessage.Preview value) { if (previewBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13138,7 +13138,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Preview preview = 10; */ public Builder addPreview( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.Builder builderForValue) { + SignalServiceProtos.DataMessage.Preview.Builder builderForValue) { if (previewBuilder_ == null) { ensurePreviewIsMutable(); preview_.add(builderForValue.build()); @@ -13152,7 +13152,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Preview preview = 10; */ public Builder addPreview( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.Builder builderForValue) { + int index, SignalServiceProtos.DataMessage.Preview.Builder builderForValue) { if (previewBuilder_ == null) { ensurePreviewIsMutable(); preview_.add(index, builderForValue.build()); @@ -13166,7 +13166,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 +13205,14 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.Builder getPreviewBuilder( + public SignalServiceProtos.DataMessage.Preview.Builder getPreviewBuilder( int index) { return getPreviewFieldBuilder().getBuilder(index); } /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.PreviewOrBuilder getPreviewOrBuilder( + public SignalServiceProtos.DataMessage.PreviewOrBuilder getPreviewOrBuilder( int index) { if (previewBuilder_ == null) { return preview_.get(index); } else { @@ -13222,7 +13222,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 +13233,31 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.Builder addPreviewBuilder() { + public SignalServiceProtos.DataMessage.Preview.Builder addPreviewBuilder() { return getPreviewFieldBuilder().addBuilder( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.getDefaultInstance()); + SignalServiceProtos.DataMessage.Preview.getDefaultInstance()); } /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.Builder addPreviewBuilder( + public SignalServiceProtos.DataMessage.Preview.Builder addPreviewBuilder( int index) { return getPreviewFieldBuilder().addBuilder( - index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.getDefaultInstance()); + index, 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< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.PreviewOrBuilder> + SignalServiceProtos.DataMessage.Preview, SignalServiceProtos.DataMessage.Preview.Builder, SignalServiceProtos.DataMessage.PreviewOrBuilder> getPreviewFieldBuilder() { if (previewBuilder_ == null) { previewBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.PreviewOrBuilder>( + SignalServiceProtos.DataMessage.Preview, SignalServiceProtos.DataMessage.Preview.Builder, SignalServiceProtos.DataMessage.PreviewOrBuilder>( preview_, ((bitField0_ & 0x00000100) == 0x00000100), getParentForChildren(), @@ -13268,9 +13268,9 @@ public final class SignalServiceProtos { } // optional .signalservice.DataMessage.LokiProfile profile = 101; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile profile_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); + private SignalServiceProtos.DataMessage.LokiProfile profile_ = SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfileOrBuilder> profileBuilder_; + SignalServiceProtos.DataMessage.LokiProfile, SignalServiceProtos.DataMessage.LokiProfile.Builder, SignalServiceProtos.DataMessage.LokiProfileOrBuilder> profileBuilder_; /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ @@ -13280,7 +13280,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile getProfile() { + public SignalServiceProtos.DataMessage.LokiProfile getProfile() { if (profileBuilder_ == null) { return profile_; } else { @@ -13290,7 +13290,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - public Builder setProfile(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile value) { + public Builder setProfile(SignalServiceProtos.DataMessage.LokiProfile value) { if (profileBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13307,7 +13307,7 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.LokiProfile profile = 101; */ public Builder setProfile( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.Builder builderForValue) { + SignalServiceProtos.DataMessage.LokiProfile.Builder builderForValue) { if (profileBuilder_ == null) { profile_ = builderForValue.build(); onChanged(); @@ -13320,12 +13320,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - public Builder mergeProfile(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile value) { + public Builder mergeProfile(SignalServiceProtos.DataMessage.LokiProfile value) { if (profileBuilder_ == null) { if (((bitField0_ & 0x00000200) == 0x00000200) && - profile_ != org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance()) { + profile_ != SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance()) { profile_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.newBuilder(profile_).mergeFrom(value).buildPartial(); + SignalServiceProtos.DataMessage.LokiProfile.newBuilder(profile_).mergeFrom(value).buildPartial(); } else { profile_ = value; } @@ -13341,7 +13341,7 @@ public final class SignalServiceProtos { */ public Builder clearProfile() { if (profileBuilder_ == null) { - profile_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); + profile_ = SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); onChanged(); } else { profileBuilder_.clear(); @@ -13352,7 +13352,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.Builder getProfileBuilder() { + public SignalServiceProtos.DataMessage.LokiProfile.Builder getProfileBuilder() { bitField0_ |= 0x00000200; onChanged(); return getProfileFieldBuilder().getBuilder(); @@ -13360,7 +13360,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfileOrBuilder getProfileOrBuilder() { + public SignalServiceProtos.DataMessage.LokiProfileOrBuilder getProfileOrBuilder() { if (profileBuilder_ != null) { return profileBuilder_.getMessageOrBuilder(); } else { @@ -13371,11 +13371,11 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.LokiProfile profile = 101; */ private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfileOrBuilder> + SignalServiceProtos.DataMessage.LokiProfile, SignalServiceProtos.DataMessage.LokiProfile.Builder, SignalServiceProtos.DataMessage.LokiProfileOrBuilder> getProfileFieldBuilder() { if (profileBuilder_ == null) { profileBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfileOrBuilder>( + SignalServiceProtos.DataMessage.LokiProfile, SignalServiceProtos.DataMessage.LokiProfile.Builder, SignalServiceProtos.DataMessage.LokiProfileOrBuilder>( profile_, getParentForChildren(), isClean()); @@ -13385,9 +13385,9 @@ public final class SignalServiceProtos { } // optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation openGroupInvitation_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); + private SignalServiceProtos.DataMessage.OpenGroupInvitation openGroupInvitation_ = SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder> openGroupInvitationBuilder_; + SignalServiceProtos.DataMessage.OpenGroupInvitation, SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder, SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder> openGroupInvitationBuilder_; /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ @@ -13397,7 +13397,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation getOpenGroupInvitation() { + public SignalServiceProtos.DataMessage.OpenGroupInvitation getOpenGroupInvitation() { if (openGroupInvitationBuilder_ == null) { return openGroupInvitation_; } else { @@ -13407,7 +13407,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - public Builder setOpenGroupInvitation(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation value) { + public Builder setOpenGroupInvitation(SignalServiceProtos.DataMessage.OpenGroupInvitation value) { if (openGroupInvitationBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13424,7 +13424,7 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ public Builder setOpenGroupInvitation( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder builderForValue) { + SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder builderForValue) { if (openGroupInvitationBuilder_ == null) { openGroupInvitation_ = builderForValue.build(); onChanged(); @@ -13437,12 +13437,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - public Builder mergeOpenGroupInvitation(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation value) { + public Builder mergeOpenGroupInvitation(SignalServiceProtos.DataMessage.OpenGroupInvitation value) { if (openGroupInvitationBuilder_ == null) { if (((bitField0_ & 0x00000400) == 0x00000400) && - openGroupInvitation_ != org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance()) { + openGroupInvitation_ != SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance()) { openGroupInvitation_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.newBuilder(openGroupInvitation_).mergeFrom(value).buildPartial(); + SignalServiceProtos.DataMessage.OpenGroupInvitation.newBuilder(openGroupInvitation_).mergeFrom(value).buildPartial(); } else { openGroupInvitation_ = value; } @@ -13458,7 +13458,7 @@ public final class SignalServiceProtos { */ public Builder clearOpenGroupInvitation() { if (openGroupInvitationBuilder_ == null) { - openGroupInvitation_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); + openGroupInvitation_ = SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); onChanged(); } else { openGroupInvitationBuilder_.clear(); @@ -13469,7 +13469,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder getOpenGroupInvitationBuilder() { + public SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder getOpenGroupInvitationBuilder() { bitField0_ |= 0x00000400; onChanged(); return getOpenGroupInvitationFieldBuilder().getBuilder(); @@ -13477,7 +13477,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder() { + public SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder() { if (openGroupInvitationBuilder_ != null) { return openGroupInvitationBuilder_.getMessageOrBuilder(); } else { @@ -13488,11 +13488,11 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder> + SignalServiceProtos.DataMessage.OpenGroupInvitation, SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder, SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder> getOpenGroupInvitationFieldBuilder() { if (openGroupInvitationBuilder_ == null) { openGroupInvitationBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder>( + SignalServiceProtos.DataMessage.OpenGroupInvitation, SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder, SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder>( openGroupInvitation_, getParentForChildren(), isClean()); @@ -13502,9 +13502,9 @@ public final class SignalServiceProtos { } // optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage closedGroupControlMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); + private SignalServiceProtos.DataMessage.ClosedGroupControlMessage closedGroupControlMessage_ = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder> closedGroupControlMessageBuilder_; + SignalServiceProtos.DataMessage.ClosedGroupControlMessage, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder, SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder> closedGroupControlMessageBuilder_; /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ @@ -13514,7 +13514,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage getClosedGroupControlMessage() { + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage getClosedGroupControlMessage() { if (closedGroupControlMessageBuilder_ == null) { return closedGroupControlMessage_; } else { @@ -13524,7 +13524,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - public Builder setClosedGroupControlMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage value) { + public Builder setClosedGroupControlMessage(SignalServiceProtos.DataMessage.ClosedGroupControlMessage value) { if (closedGroupControlMessageBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13541,7 +13541,7 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ public Builder setClosedGroupControlMessage( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder builderForValue) { + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder builderForValue) { if (closedGroupControlMessageBuilder_ == null) { closedGroupControlMessage_ = builderForValue.build(); onChanged(); @@ -13554,12 +13554,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - public Builder mergeClosedGroupControlMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage value) { + public Builder mergeClosedGroupControlMessage(SignalServiceProtos.DataMessage.ClosedGroupControlMessage value) { if (closedGroupControlMessageBuilder_ == null) { if (((bitField0_ & 0x00000800) == 0x00000800) && - closedGroupControlMessage_ != org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance()) { + closedGroupControlMessage_ != SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance()) { closedGroupControlMessage_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.newBuilder(closedGroupControlMessage_).mergeFrom(value).buildPartial(); + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.newBuilder(closedGroupControlMessage_).mergeFrom(value).buildPartial(); } else { closedGroupControlMessage_ = value; } @@ -13575,7 +13575,7 @@ public final class SignalServiceProtos { */ public Builder clearClosedGroupControlMessage() { if (closedGroupControlMessageBuilder_ == null) { - closedGroupControlMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); + closedGroupControlMessage_ = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); onChanged(); } else { closedGroupControlMessageBuilder_.clear(); @@ -13586,7 +13586,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder getClosedGroupControlMessageBuilder() { + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder getClosedGroupControlMessageBuilder() { bitField0_ |= 0x00000800; onChanged(); return getClosedGroupControlMessageFieldBuilder().getBuilder(); @@ -13594,7 +13594,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder getClosedGroupControlMessageOrBuilder() { + public SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder getClosedGroupControlMessageOrBuilder() { if (closedGroupControlMessageBuilder_ != null) { return closedGroupControlMessageBuilder_.getMessageOrBuilder(); } else { @@ -13605,11 +13605,11 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder> + SignalServiceProtos.DataMessage.ClosedGroupControlMessage, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder, SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder> getClosedGroupControlMessageFieldBuilder() { if (closedGroupControlMessageBuilder_ == null) { closedGroupControlMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder>( + SignalServiceProtos.DataMessage.ClosedGroupControlMessage, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder, SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder>( closedGroupControlMessage_, getParentForChildren(), isClean()); @@ -13710,12 +13710,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - java.util.List + java.util.List getClosedGroupsList(); /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup getClosedGroups(int index); + SignalServiceProtos.ConfigurationMessage.ClosedGroup getClosedGroups(int index); /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ @@ -13723,12 +13723,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - java.util.List + java.util.List getClosedGroupsOrBuilderList(); /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder getClosedGroupsOrBuilder( + SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder getClosedGroupsOrBuilder( int index); // repeated string openGroups = 2; @@ -13795,12 +13795,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - java.util.List + java.util.List getContactsList(); /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact getContacts(int index); + SignalServiceProtos.ConfigurationMessage.Contact getContacts(int index); /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ @@ -13808,12 +13808,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - java.util.List + java.util.List getContactsOrBuilderList(); /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ContactOrBuilder getContactsOrBuilder( + SignalServiceProtos.ConfigurationMessage.ContactOrBuilder getContactsOrBuilder( int index); } /** @@ -13869,10 +13869,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(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.PARSER, extensionRegistry)); + closedGroups_.add(input.readMessage(SignalServiceProtos.ConfigurationMessage.ClosedGroup.PARSER, extensionRegistry)); break; } case 18: { @@ -13900,10 +13900,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(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.PARSER, extensionRegistry)); + contacts_.add(input.readMessage(SignalServiceProtos.ConfigurationMessage.Contact.PARSER, extensionRegistry)); break; } } @@ -13929,14 +13929,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.class, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Builder.class); + SignalServiceProtos.ConfigurationMessage.class, SignalServiceProtos.ConfigurationMessage.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -13990,11 +13990,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair getEncryptionKeyPair(); + SignalServiceProtos.KeyPair getEncryptionKeyPair(); /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder(); + SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder(); // repeated bytes members = 4; /** @@ -14086,11 +14086,11 @@ public final class SignalServiceProtos { break; } case 26: { - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder subBuilder = null; + SignalServiceProtos.KeyPair.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = encryptionKeyPair_.toBuilder(); } - encryptionKeyPair_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.PARSER, extensionRegistry); + encryptionKeyPair_ = input.readMessage(SignalServiceProtos.KeyPair.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(encryptionKeyPair_); encryptionKeyPair_ = subBuilder.buildPartial(); @@ -14134,14 +14134,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_descriptor; + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.class, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder.class); + SignalServiceProtos.ConfigurationMessage.ClosedGroup.class, SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -14221,7 +14221,7 @@ public final class SignalServiceProtos { // optional .signalservice.KeyPair encryptionKeyPair = 3; public static final int ENCRYPTIONKEYPAIR_FIELD_NUMBER = 3; - private org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair encryptionKeyPair_; + private SignalServiceProtos.KeyPair encryptionKeyPair_; /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ @@ -14231,13 +14231,13 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair getEncryptionKeyPair() { + public SignalServiceProtos.KeyPair getEncryptionKeyPair() { return encryptionKeyPair_; } /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder() { + public SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder() { return encryptionKeyPair_; } @@ -14290,7 +14290,7 @@ public final class SignalServiceProtos { private void initFields() { publicKey_ = com.google.protobuf.ByteString.EMPTY; name_ = ""; - encryptionKeyPair_ = org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.getDefaultInstance(); + encryptionKeyPair_ = SignalServiceProtos.KeyPair.getDefaultInstance(); members_ = java.util.Collections.emptyList(); admins_ = java.util.Collections.emptyList(); } @@ -14378,53 +14378,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( + public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( + public static 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 org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom(byte[] data) + public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( + public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom(java.io.InputStream input) + public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( + public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseDelimitedFrom( + public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( + public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( + public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -14433,7 +14433,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup prototype) { + public static Builder newBuilder(SignalServiceProtos.ConfigurationMessage.ClosedGroup prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -14449,20 +14449,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder { + implements SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_descriptor; + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.class, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder.class); + SignalServiceProtos.ConfigurationMessage.ClosedGroup.class, SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -14488,7 +14488,7 @@ public final class SignalServiceProtos { name_ = ""; bitField0_ = (bitField0_ & ~0x00000002); if (encryptionKeyPairBuilder_ == null) { - encryptionKeyPair_ = org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.getDefaultInstance(); + encryptionKeyPair_ = SignalServiceProtos.KeyPair.getDefaultInstance(); } else { encryptionKeyPairBuilder_.clear(); } @@ -14506,23 +14506,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_descriptor; + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.getDefaultInstance(); + public SignalServiceProtos.ConfigurationMessage.ClosedGroup getDefaultInstanceForType() { + return SignalServiceProtos.ConfigurationMessage.ClosedGroup.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup result = buildPartial(); + public SignalServiceProtos.ConfigurationMessage.ClosedGroup build() { + SignalServiceProtos.ConfigurationMessage.ClosedGroup result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup result = new org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup(this); + public SignalServiceProtos.ConfigurationMessage.ClosedGroup buildPartial() { + SignalServiceProtos.ConfigurationMessage.ClosedGroup result = new SignalServiceProtos.ConfigurationMessage.ClosedGroup(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -14557,16 +14557,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup)other); + if (other instanceof SignalServiceProtos.ConfigurationMessage.ClosedGroup) { + return mergeFrom((SignalServiceProtos.ConfigurationMessage.ClosedGroup)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.ConfigurationMessage.ClosedGroup other) { + if (other == SignalServiceProtos.ConfigurationMessage.ClosedGroup.getDefaultInstance()) return this; if (other.hasPublicKey()) { setPublicKey(other.getPublicKey()); } @@ -14616,11 +14616,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup parsedMessage = null; + SignalServiceProtos.ConfigurationMessage.ClosedGroup parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.ConfigurationMessage.ClosedGroup) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -14742,9 +14742,9 @@ public final class SignalServiceProtos { } // optional .signalservice.KeyPair encryptionKeyPair = 3; - private org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair encryptionKeyPair_ = org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.getDefaultInstance(); + private SignalServiceProtos.KeyPair encryptionKeyPair_ = SignalServiceProtos.KeyPair.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder> encryptionKeyPairBuilder_; + SignalServiceProtos.KeyPair, SignalServiceProtos.KeyPair.Builder, SignalServiceProtos.KeyPairOrBuilder> encryptionKeyPairBuilder_; /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ @@ -14754,7 +14754,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair getEncryptionKeyPair() { + public SignalServiceProtos.KeyPair getEncryptionKeyPair() { if (encryptionKeyPairBuilder_ == null) { return encryptionKeyPair_; } else { @@ -14764,7 +14764,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - public Builder setEncryptionKeyPair(org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair value) { + public Builder setEncryptionKeyPair(SignalServiceProtos.KeyPair value) { if (encryptionKeyPairBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -14781,7 +14781,7 @@ public final class SignalServiceProtos { * optional .signalservice.KeyPair encryptionKeyPair = 3; */ public Builder setEncryptionKeyPair( - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder builderForValue) { + SignalServiceProtos.KeyPair.Builder builderForValue) { if (encryptionKeyPairBuilder_ == null) { encryptionKeyPair_ = builderForValue.build(); onChanged(); @@ -14794,12 +14794,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - public Builder mergeEncryptionKeyPair(org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair value) { + public Builder mergeEncryptionKeyPair(SignalServiceProtos.KeyPair value) { if (encryptionKeyPairBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - encryptionKeyPair_ != org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.getDefaultInstance()) { + encryptionKeyPair_ != SignalServiceProtos.KeyPair.getDefaultInstance()) { encryptionKeyPair_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.newBuilder(encryptionKeyPair_).mergeFrom(value).buildPartial(); + SignalServiceProtos.KeyPair.newBuilder(encryptionKeyPair_).mergeFrom(value).buildPartial(); } else { encryptionKeyPair_ = value; } @@ -14815,7 +14815,7 @@ public final class SignalServiceProtos { */ public Builder clearEncryptionKeyPair() { if (encryptionKeyPairBuilder_ == null) { - encryptionKeyPair_ = org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.getDefaultInstance(); + encryptionKeyPair_ = SignalServiceProtos.KeyPair.getDefaultInstance(); onChanged(); } else { encryptionKeyPairBuilder_.clear(); @@ -14826,7 +14826,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder getEncryptionKeyPairBuilder() { + public SignalServiceProtos.KeyPair.Builder getEncryptionKeyPairBuilder() { bitField0_ |= 0x00000004; onChanged(); return getEncryptionKeyPairFieldBuilder().getBuilder(); @@ -14834,7 +14834,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder() { + public SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder() { if (encryptionKeyPairBuilder_ != null) { return encryptionKeyPairBuilder_.getMessageOrBuilder(); } else { @@ -14845,11 +14845,11 @@ public final class SignalServiceProtos { * optional .signalservice.KeyPair encryptionKeyPair = 3; */ private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder> + SignalServiceProtos.KeyPair, SignalServiceProtos.KeyPair.Builder, SignalServiceProtos.KeyPairOrBuilder> getEncryptionKeyPairFieldBuilder() { if (encryptionKeyPairBuilder_ == null) { encryptionKeyPairBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder>( + SignalServiceProtos.KeyPair, SignalServiceProtos.KeyPair.Builder, SignalServiceProtos.KeyPairOrBuilder>( encryptionKeyPair_, getParentForChildren(), isClean()); @@ -15171,14 +15171,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_descriptor; + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.class, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.Builder.class); + SignalServiceProtos.ConfigurationMessage.Contact.class, SignalServiceProtos.ConfigurationMessage.Contact.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -15410,53 +15410,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact parseFrom( + public static SignalServiceProtos.ConfigurationMessage.Contact parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact parseFrom( + public static 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 org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact parseFrom(byte[] data) + public static SignalServiceProtos.ConfigurationMessage.Contact parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact parseFrom( + public static SignalServiceProtos.ConfigurationMessage.Contact parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact parseFrom(java.io.InputStream input) + public static SignalServiceProtos.ConfigurationMessage.Contact parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact parseFrom( + public static SignalServiceProtos.ConfigurationMessage.Contact parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.ConfigurationMessage.Contact parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact parseDelimitedFrom( + public static SignalServiceProtos.ConfigurationMessage.Contact parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact parseFrom( + public static SignalServiceProtos.ConfigurationMessage.Contact parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact parseFrom( + public static SignalServiceProtos.ConfigurationMessage.Contact parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -15465,7 +15465,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact prototype) { + public static Builder newBuilder(SignalServiceProtos.ConfigurationMessage.Contact prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -15481,20 +15481,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ContactOrBuilder { + implements SignalServiceProtos.ConfigurationMessage.ContactOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_descriptor; + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.class, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.Builder.class); + SignalServiceProtos.ConfigurationMessage.Contact.class, SignalServiceProtos.ConfigurationMessage.Contact.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -15531,23 +15531,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_descriptor; + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.getDefaultInstance(); + public SignalServiceProtos.ConfigurationMessage.Contact getDefaultInstanceForType() { + return SignalServiceProtos.ConfigurationMessage.Contact.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact result = buildPartial(); + public SignalServiceProtos.ConfigurationMessage.Contact build() { + SignalServiceProtos.ConfigurationMessage.Contact result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact result = new org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact(this); + public SignalServiceProtos.ConfigurationMessage.Contact buildPartial() { + SignalServiceProtos.ConfigurationMessage.Contact result = new SignalServiceProtos.ConfigurationMessage.Contact(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -15572,16 +15572,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact)other); + if (other instanceof SignalServiceProtos.ConfigurationMessage.Contact) { + return mergeFrom((SignalServiceProtos.ConfigurationMessage.Contact)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.ConfigurationMessage.Contact other) { + if (other == SignalServiceProtos.ConfigurationMessage.Contact.getDefaultInstance()) return this; if (other.hasPublicKey()) { setPublicKey(other.getPublicKey()); } @@ -15618,11 +15618,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact parsedMessage = null; + SignalServiceProtos.ConfigurationMessage.Contact parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.ConfigurationMessage.Contact) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -15907,17 +15907,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 +15930,13 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup getClosedGroups(int index) { + public SignalServiceProtos.ConfigurationMessage.ClosedGroup getClosedGroups(int index) { return closedGroups_.get(index); } /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder getClosedGroupsOrBuilder( + public SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder getClosedGroupsOrBuilder( int index) { return closedGroups_.get(index); } @@ -16075,17 +16075,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 +16098,13 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact getContacts(int index) { + public SignalServiceProtos.ConfigurationMessage.Contact getContacts(int index) { return contacts_.get(index); } /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ContactOrBuilder getContactsOrBuilder( + public SignalServiceProtos.ConfigurationMessage.ContactOrBuilder getContactsOrBuilder( int index) { return contacts_.get(index); } @@ -16209,53 +16209,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage parseFrom( + public static SignalServiceProtos.ConfigurationMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage parseFrom( + public static 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 org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage parseFrom(byte[] data) + public static SignalServiceProtos.ConfigurationMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage parseFrom( + public static SignalServiceProtos.ConfigurationMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage parseFrom(java.io.InputStream input) + public static SignalServiceProtos.ConfigurationMessage parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage parseFrom( + public static SignalServiceProtos.ConfigurationMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.ConfigurationMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage parseDelimitedFrom( + public static SignalServiceProtos.ConfigurationMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage parseFrom( + public static SignalServiceProtos.ConfigurationMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage parseFrom( + public static SignalServiceProtos.ConfigurationMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -16264,7 +16264,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage prototype) { + public static Builder newBuilder(SignalServiceProtos.ConfigurationMessage prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -16280,20 +16280,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessageOrBuilder { + implements SignalServiceProtos.ConfigurationMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.class, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Builder.class); + SignalServiceProtos.ConfigurationMessage.class, SignalServiceProtos.ConfigurationMessage.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -16344,23 +16344,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); + public SignalServiceProtos.ConfigurationMessage getDefaultInstanceForType() { + return SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage result = buildPartial(); + public SignalServiceProtos.ConfigurationMessage build() { + SignalServiceProtos.ConfigurationMessage result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage result = new org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage(this); + public SignalServiceProtos.ConfigurationMessage buildPartial() { + SignalServiceProtos.ConfigurationMessage result = new SignalServiceProtos.ConfigurationMessage(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (closedGroupsBuilder_ == null) { @@ -16405,16 +16405,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage)other); + if (other instanceof SignalServiceProtos.ConfigurationMessage) { + return mergeFrom((SignalServiceProtos.ConfigurationMessage)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.ConfigurationMessage other) { + if (other == SignalServiceProtos.ConfigurationMessage.getDefaultInstance()) return this; if (closedGroupsBuilder_ == null) { if (!other.closedGroups_.isEmpty()) { if (closedGroups_.isEmpty()) { @@ -16514,11 +16514,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage parsedMessage = null; + SignalServiceProtos.ConfigurationMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.ConfigurationMessage) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -16530,22 +16530,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< - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder> closedGroupsBuilder_; + SignalServiceProtos.ConfigurationMessage.ClosedGroup, SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder, 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 +16565,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup getClosedGroups(int index) { + public SignalServiceProtos.ConfigurationMessage.ClosedGroup getClosedGroups(int index) { if (closedGroupsBuilder_ == null) { return closedGroups_.get(index); } else { @@ -16576,7 +16576,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ public Builder setClosedGroups( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup value) { + int index, SignalServiceProtos.ConfigurationMessage.ClosedGroup value) { if (closedGroupsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -16593,7 +16593,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ public Builder setClosedGroups( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder builderForValue) { + int index, SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder builderForValue) { if (closedGroupsBuilder_ == null) { ensureClosedGroupsIsMutable(); closedGroups_.set(index, builderForValue.build()); @@ -16606,7 +16606,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public Builder addClosedGroups(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup value) { + public Builder addClosedGroups(SignalServiceProtos.ConfigurationMessage.ClosedGroup value) { if (closedGroupsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -16623,7 +16623,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ public Builder addClosedGroups( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup value) { + int index, SignalServiceProtos.ConfigurationMessage.ClosedGroup value) { if (closedGroupsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -16640,7 +16640,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ public Builder addClosedGroups( - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder builderForValue) { + SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder builderForValue) { if (closedGroupsBuilder_ == null) { ensureClosedGroupsIsMutable(); closedGroups_.add(builderForValue.build()); @@ -16654,7 +16654,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ public Builder addClosedGroups( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder builderForValue) { + int index, SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder builderForValue) { if (closedGroupsBuilder_ == null) { ensureClosedGroupsIsMutable(); closedGroups_.add(index, builderForValue.build()); @@ -16668,7 +16668,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 +16707,14 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder getClosedGroupsBuilder( + public SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder getClosedGroupsBuilder( int index) { return getClosedGroupsFieldBuilder().getBuilder(index); } /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder getClosedGroupsOrBuilder( + public SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder getClosedGroupsOrBuilder( int index) { if (closedGroupsBuilder_ == null) { return closedGroups_.get(index); } else { @@ -16724,7 +16724,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 +16735,31 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder addClosedGroupsBuilder() { + public SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder addClosedGroupsBuilder() { return getClosedGroupsFieldBuilder().addBuilder( - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.getDefaultInstance()); + SignalServiceProtos.ConfigurationMessage.ClosedGroup.getDefaultInstance()); } /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder addClosedGroupsBuilder( + public SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder addClosedGroupsBuilder( int index) { return getClosedGroupsFieldBuilder().addBuilder( - index, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.getDefaultInstance()); + index, 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< - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder> + SignalServiceProtos.ConfigurationMessage.ClosedGroup, SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder, SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder> getClosedGroupsFieldBuilder() { if (closedGroupsBuilder_ == null) { closedGroupsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder>( + SignalServiceProtos.ConfigurationMessage.ClosedGroup, SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder, SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder>( closedGroups_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), @@ -17047,22 +17047,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< - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ContactOrBuilder> contactsBuilder_; + SignalServiceProtos.ConfigurationMessage.Contact, SignalServiceProtos.ConfigurationMessage.Contact.Builder, 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 +17082,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact getContacts(int index) { + public SignalServiceProtos.ConfigurationMessage.Contact getContacts(int index) { if (contactsBuilder_ == null) { return contacts_.get(index); } else { @@ -17093,7 +17093,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ public Builder setContacts( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact value) { + int index, SignalServiceProtos.ConfigurationMessage.Contact value) { if (contactsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -17110,7 +17110,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ public Builder setContacts( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.Builder builderForValue) { + int index, SignalServiceProtos.ConfigurationMessage.Contact.Builder builderForValue) { if (contactsBuilder_ == null) { ensureContactsIsMutable(); contacts_.set(index, builderForValue.build()); @@ -17123,7 +17123,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public Builder addContacts(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact value) { + public Builder addContacts(SignalServiceProtos.ConfigurationMessage.Contact value) { if (contactsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -17140,7 +17140,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ public Builder addContacts( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact value) { + int index, SignalServiceProtos.ConfigurationMessage.Contact value) { if (contactsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -17157,7 +17157,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ public Builder addContacts( - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.Builder builderForValue) { + SignalServiceProtos.ConfigurationMessage.Contact.Builder builderForValue) { if (contactsBuilder_ == null) { ensureContactsIsMutable(); contacts_.add(builderForValue.build()); @@ -17171,7 +17171,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ public Builder addContacts( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.Builder builderForValue) { + int index, SignalServiceProtos.ConfigurationMessage.Contact.Builder builderForValue) { if (contactsBuilder_ == null) { ensureContactsIsMutable(); contacts_.add(index, builderForValue.build()); @@ -17185,7 +17185,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 +17224,14 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.Builder getContactsBuilder( + public SignalServiceProtos.ConfigurationMessage.Contact.Builder getContactsBuilder( int index) { return getContactsFieldBuilder().getBuilder(index); } /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ContactOrBuilder getContactsOrBuilder( + public SignalServiceProtos.ConfigurationMessage.ContactOrBuilder getContactsOrBuilder( int index) { if (contactsBuilder_ == null) { return contacts_.get(index); } else { @@ -17241,7 +17241,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 +17252,31 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.Builder addContactsBuilder() { + public SignalServiceProtos.ConfigurationMessage.Contact.Builder addContactsBuilder() { return getContactsFieldBuilder().addBuilder( - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.getDefaultInstance()); + SignalServiceProtos.ConfigurationMessage.Contact.getDefaultInstance()); } /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.Builder addContactsBuilder( + public SignalServiceProtos.ConfigurationMessage.Contact.Builder addContactsBuilder( int index) { return getContactsFieldBuilder().addBuilder( - index, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.getDefaultInstance()); + index, 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< - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ContactOrBuilder> + SignalServiceProtos.ConfigurationMessage.Contact, SignalServiceProtos.ConfigurationMessage.Contact.Builder, SignalServiceProtos.ConfigurationMessage.ContactOrBuilder> getContactsFieldBuilder() { if (contactsBuilder_ == null) { contactsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ContactOrBuilder>( + SignalServiceProtos.ConfigurationMessage.Contact, SignalServiceProtos.ConfigurationMessage.Contact.Builder, SignalServiceProtos.ConfigurationMessage.ContactOrBuilder>( contacts_, ((bitField0_ & 0x00000020) == 0x00000020), getParentForChildren(), @@ -17316,7 +17316,7 @@ public final class SignalServiceProtos { * @required * */ - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Type getType(); + SignalServiceProtos.ReceiptMessage.Type getType(); // repeated uint64 timestamp = 2; /** @@ -17385,7 +17385,7 @@ public final class SignalServiceProtos { } case 8: { int rawValue = input.readEnum(); - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Type value = org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Type.valueOf(rawValue); + SignalServiceProtos.ReceiptMessage.Type value = SignalServiceProtos.ReceiptMessage.Type.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); } else { @@ -17432,14 +17432,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ReceiptMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_ReceiptMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ReceiptMessage_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_ReceiptMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.class, org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Builder.class); + SignalServiceProtos.ReceiptMessage.class, SignalServiceProtos.ReceiptMessage.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -17514,7 +17514,7 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.getDescriptor().getEnumTypes().get(0); + return SignalServiceProtos.ReceiptMessage.getDescriptor().getEnumTypes().get(0); } private static final Type[] VALUES = values(); @@ -17542,7 +17542,7 @@ public final class SignalServiceProtos { private int bitField0_; // required .signalservice.ReceiptMessage.Type type = 1; public static final int TYPE_FIELD_NUMBER = 1; - private org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Type type_; + private SignalServiceProtos.ReceiptMessage.Type type_; /** * required .signalservice.ReceiptMessage.Type type = 1; * @@ -17560,7 +17560,7 @@ public final class SignalServiceProtos { * @required * */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Type getType() { + public SignalServiceProtos.ReceiptMessage.Type getType() { return type_; } @@ -17588,7 +17588,7 @@ public final class SignalServiceProtos { } private void initFields() { - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Type.DELIVERY; + type_ = SignalServiceProtos.ReceiptMessage.Type.DELIVERY; timestamp_ = java.util.Collections.emptyList(); } private byte memoizedIsInitialized = -1; @@ -17647,53 +17647,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage parseFrom( + public static SignalServiceProtos.ReceiptMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage parseFrom( + public static 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 org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage parseFrom(byte[] data) + public static SignalServiceProtos.ReceiptMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage parseFrom( + public static SignalServiceProtos.ReceiptMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage parseFrom(java.io.InputStream input) + public static SignalServiceProtos.ReceiptMessage parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage parseFrom( + public static SignalServiceProtos.ReceiptMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.ReceiptMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage parseDelimitedFrom( + public static SignalServiceProtos.ReceiptMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage parseFrom( + public static SignalServiceProtos.ReceiptMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage parseFrom( + public static SignalServiceProtos.ReceiptMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -17702,7 +17702,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage prototype) { + public static Builder newBuilder(SignalServiceProtos.ReceiptMessage prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -17718,20 +17718,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessageOrBuilder { + implements SignalServiceProtos.ReceiptMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ReceiptMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_ReceiptMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ReceiptMessage_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_ReceiptMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.class, org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Builder.class); + SignalServiceProtos.ReceiptMessage.class, SignalServiceProtos.ReceiptMessage.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -17751,7 +17751,7 @@ public final class SignalServiceProtos { public Builder clear() { super.clear(); - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Type.DELIVERY; + type_ = SignalServiceProtos.ReceiptMessage.Type.DELIVERY; bitField0_ = (bitField0_ & ~0x00000001); timestamp_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000002); @@ -17764,23 +17764,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ReceiptMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_ReceiptMessage_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.getDefaultInstance(); + public SignalServiceProtos.ReceiptMessage getDefaultInstanceForType() { + return SignalServiceProtos.ReceiptMessage.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage result = buildPartial(); + public SignalServiceProtos.ReceiptMessage build() { + SignalServiceProtos.ReceiptMessage result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage result = new org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage(this); + public SignalServiceProtos.ReceiptMessage buildPartial() { + SignalServiceProtos.ReceiptMessage result = new SignalServiceProtos.ReceiptMessage(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -17798,16 +17798,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage)other); + if (other instanceof SignalServiceProtos.ReceiptMessage) { + return mergeFrom((SignalServiceProtos.ReceiptMessage)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.ReceiptMessage other) { + if (other == SignalServiceProtos.ReceiptMessage.getDefaultInstance()) return this; if (other.hasType()) { setType(other.getType()); } @@ -17837,11 +17837,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage parsedMessage = null; + SignalServiceProtos.ReceiptMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.ReceiptMessage) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -17853,7 +17853,7 @@ public final class SignalServiceProtos { private int bitField0_; // required .signalservice.ReceiptMessage.Type type = 1; - private org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Type type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Type.DELIVERY; + private SignalServiceProtos.ReceiptMessage.Type type_ = SignalServiceProtos.ReceiptMessage.Type.DELIVERY; /** * required .signalservice.ReceiptMessage.Type type = 1; * @@ -17871,7 +17871,7 @@ public final class SignalServiceProtos { * @required * */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Type getType() { + public SignalServiceProtos.ReceiptMessage.Type getType() { return type_; } /** @@ -17881,7 +17881,7 @@ public final class SignalServiceProtos { * @required * */ - public Builder setType(org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Type value) { + public Builder setType(SignalServiceProtos.ReceiptMessage.Type value) { if (value == null) { throw new NullPointerException(); } @@ -17899,7 +17899,7 @@ public final class SignalServiceProtos { */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Type.DELIVERY; + type_ = SignalServiceProtos.ReceiptMessage.Type.DELIVERY; onChanged(); return this; } @@ -18257,14 +18257,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_AttachmentPointer_descriptor; + return SignalServiceProtos.internal_static_signalservice_AttachmentPointer_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_AttachmentPointer_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_AttachmentPointer_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.class, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder.class); + SignalServiceProtos.AttachmentPointer.class, SignalServiceProtos.AttachmentPointer.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -18330,7 +18330,7 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDescriptor().getEnumTypes().get(0); + return SignalServiceProtos.AttachmentPointer.getDescriptor().getEnumTypes().get(0); } private static final Flags[] VALUES = values(); @@ -18799,53 +18799,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer parseFrom( + public static SignalServiceProtos.AttachmentPointer parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer parseFrom( + public static 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 org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer parseFrom(byte[] data) + public static SignalServiceProtos.AttachmentPointer parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer parseFrom( + public static SignalServiceProtos.AttachmentPointer parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer parseFrom(java.io.InputStream input) + public static SignalServiceProtos.AttachmentPointer parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer parseFrom( + public static SignalServiceProtos.AttachmentPointer parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.AttachmentPointer parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer parseDelimitedFrom( + public static SignalServiceProtos.AttachmentPointer parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer parseFrom( + public static SignalServiceProtos.AttachmentPointer parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer parseFrom( + public static SignalServiceProtos.AttachmentPointer parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -18854,7 +18854,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer prototype) { + public static Builder newBuilder(SignalServiceProtos.AttachmentPointer prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -18870,20 +18870,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder { + implements SignalServiceProtos.AttachmentPointerOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_AttachmentPointer_descriptor; + return SignalServiceProtos.internal_static_signalservice_AttachmentPointer_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_AttachmentPointer_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_AttachmentPointer_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.class, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder.class); + SignalServiceProtos.AttachmentPointer.class, SignalServiceProtos.AttachmentPointer.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -18936,23 +18936,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_AttachmentPointer_descriptor; + return SignalServiceProtos.internal_static_signalservice_AttachmentPointer_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + public SignalServiceProtos.AttachmentPointer getDefaultInstanceForType() { + return SignalServiceProtos.AttachmentPointer.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer result = buildPartial(); + public SignalServiceProtos.AttachmentPointer build() { + SignalServiceProtos.AttachmentPointer result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer result = new org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer(this); + public SignalServiceProtos.AttachmentPointer buildPartial() { + SignalServiceProtos.AttachmentPointer result = new SignalServiceProtos.AttachmentPointer(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -19009,16 +19009,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer)other); + if (other instanceof SignalServiceProtos.AttachmentPointer) { + return mergeFrom((SignalServiceProtos.AttachmentPointer)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.AttachmentPointer other) { + if (other == SignalServiceProtos.AttachmentPointer.getDefaultInstance()) return this; if (other.hasId()) { setId(other.getId()); } @@ -19079,11 +19079,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer parsedMessage = null; + SignalServiceProtos.AttachmentPointer parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.AttachmentPointer) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -19727,7 +19727,7 @@ public final class SignalServiceProtos { * @required * */ - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type getType(); + SignalServiceProtos.GroupContext.Type getType(); // optional string name = 3; /** @@ -19772,11 +19772,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer avatar = 5; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getAvatar(); + SignalServiceProtos.AttachmentPointer getAvatar(); /** * optional .signalservice.AttachmentPointer avatar = 5; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder getAvatarOrBuilder(); + SignalServiceProtos.AttachmentPointerOrBuilder getAvatarOrBuilder(); // repeated string admins = 6; /** @@ -19856,7 +19856,7 @@ public final class SignalServiceProtos { } case 16: { int rawValue = input.readEnum(); - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type value = org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type.valueOf(rawValue); + SignalServiceProtos.GroupContext.Type value = SignalServiceProtos.GroupContext.Type.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(2, rawValue); } else { @@ -19879,11 +19879,11 @@ public final class SignalServiceProtos { break; } case 42: { - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder subBuilder = null; + SignalServiceProtos.AttachmentPointer.Builder subBuilder = null; if (((bitField0_ & 0x00000008) == 0x00000008)) { subBuilder = avatar_.toBuilder(); } - avatar_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.PARSER, extensionRegistry); + avatar_ = input.readMessage(SignalServiceProtos.AttachmentPointer.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(avatar_); avatar_ = subBuilder.buildPartial(); @@ -19919,14 +19919,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_GroupContext_descriptor; + return SignalServiceProtos.internal_static_signalservice_GroupContext_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_GroupContext_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_GroupContext_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.class, org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Builder.class); + SignalServiceProtos.GroupContext.class, SignalServiceProtos.GroupContext.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -20028,7 +20028,7 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.getDescriptor().getEnumTypes().get(0); + return SignalServiceProtos.GroupContext.getDescriptor().getEnumTypes().get(0); } private static final Type[] VALUES = values(); @@ -20080,7 +20080,7 @@ public final class SignalServiceProtos { // optional .signalservice.GroupContext.Type type = 2; public static final int TYPE_FIELD_NUMBER = 2; - private org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type type_; + private SignalServiceProtos.GroupContext.Type type_; /** * optional .signalservice.GroupContext.Type type = 2; * @@ -20098,7 +20098,7 @@ public final class SignalServiceProtos { * @required * */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type getType() { + public SignalServiceProtos.GroupContext.Type getType() { return type_; } @@ -20177,7 +20177,7 @@ public final class SignalServiceProtos { // optional .signalservice.AttachmentPointer avatar = 5; public static final int AVATAR_FIELD_NUMBER = 5; - private org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer avatar_; + private SignalServiceProtos.AttachmentPointer avatar_; /** * optional .signalservice.AttachmentPointer avatar = 5; */ @@ -20187,13 +20187,13 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer avatar = 5; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getAvatar() { + public SignalServiceProtos.AttachmentPointer getAvatar() { return avatar_; } /** * optional .signalservice.AttachmentPointer avatar = 5; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder getAvatarOrBuilder() { + public SignalServiceProtos.AttachmentPointerOrBuilder getAvatarOrBuilder() { return avatar_; } @@ -20229,10 +20229,10 @@ public final class SignalServiceProtos { private void initFields() { id_ = com.google.protobuf.ByteString.EMPTY; - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type.UNKNOWN; + type_ = SignalServiceProtos.GroupContext.Type.UNKNOWN; name_ = ""; members_ = com.google.protobuf.LazyStringArrayList.EMPTY; - avatar_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + avatar_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); admins_ = com.google.protobuf.LazyStringArrayList.EMPTY; } private byte memoizedIsInitialized = -1; @@ -20326,53 +20326,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext parseFrom( + public static SignalServiceProtos.GroupContext parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext parseFrom( + public static 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 org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext parseFrom(byte[] data) + public static SignalServiceProtos.GroupContext parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext parseFrom( + public static SignalServiceProtos.GroupContext parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext parseFrom(java.io.InputStream input) + public static SignalServiceProtos.GroupContext parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext parseFrom( + public static SignalServiceProtos.GroupContext parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.GroupContext parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext parseDelimitedFrom( + public static SignalServiceProtos.GroupContext parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext parseFrom( + public static SignalServiceProtos.GroupContext parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext parseFrom( + public static SignalServiceProtos.GroupContext parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -20381,7 +20381,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext prototype) { + public static Builder newBuilder(SignalServiceProtos.GroupContext prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -20397,20 +20397,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContextOrBuilder { + implements SignalServiceProtos.GroupContextOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_GroupContext_descriptor; + return SignalServiceProtos.internal_static_signalservice_GroupContext_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_GroupContext_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_GroupContext_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.class, org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Builder.class); + SignalServiceProtos.GroupContext.class, SignalServiceProtos.GroupContext.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.GroupContext.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -20433,14 +20433,14 @@ public final class SignalServiceProtos { super.clear(); id_ = com.google.protobuf.ByteString.EMPTY; bitField0_ = (bitField0_ & ~0x00000001); - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type.UNKNOWN; + type_ = SignalServiceProtos.GroupContext.Type.UNKNOWN; bitField0_ = (bitField0_ & ~0x00000002); name_ = ""; bitField0_ = (bitField0_ & ~0x00000004); members_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000008); if (avatarBuilder_ == null) { - avatar_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + avatar_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); } else { avatarBuilder_.clear(); } @@ -20456,23 +20456,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_GroupContext_descriptor; + return SignalServiceProtos.internal_static_signalservice_GroupContext_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.getDefaultInstance(); + public SignalServiceProtos.GroupContext getDefaultInstanceForType() { + return SignalServiceProtos.GroupContext.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext result = buildPartial(); + public SignalServiceProtos.GroupContext build() { + SignalServiceProtos.GroupContext result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext result = new org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext(this); + public SignalServiceProtos.GroupContext buildPartial() { + SignalServiceProtos.GroupContext result = new SignalServiceProtos.GroupContext(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -20513,16 +20513,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext)other); + if (other instanceof SignalServiceProtos.GroupContext) { + return mergeFrom((SignalServiceProtos.GroupContext)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.GroupContext other) { + if (other == SignalServiceProtos.GroupContext.getDefaultInstance()) return this; if (other.hasId()) { setId(other.getId()); } @@ -20575,11 +20575,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext parsedMessage = null; + SignalServiceProtos.GroupContext parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.GroupContext) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -20643,7 +20643,7 @@ public final class SignalServiceProtos { } // optional .signalservice.GroupContext.Type type = 2; - private org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type.UNKNOWN; + private SignalServiceProtos.GroupContext.Type type_ = SignalServiceProtos.GroupContext.Type.UNKNOWN; /** * optional .signalservice.GroupContext.Type type = 2; * @@ -20661,7 +20661,7 @@ public final class SignalServiceProtos { * @required * */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type getType() { + public SignalServiceProtos.GroupContext.Type getType() { return type_; } /** @@ -20671,7 +20671,7 @@ public final class SignalServiceProtos { * @required * */ - public Builder setType(org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type value) { + public Builder setType(SignalServiceProtos.GroupContext.Type value) { if (value == null) { throw new NullPointerException(); } @@ -20689,7 +20689,7 @@ public final class SignalServiceProtos { */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000002); - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type.UNKNOWN; + type_ = SignalServiceProtos.GroupContext.Type.UNKNOWN; onChanged(); return this; } @@ -20862,9 +20862,9 @@ public final class SignalServiceProtos { } // optional .signalservice.AttachmentPointer avatar = 5; - private org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer avatar_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + private SignalServiceProtos.AttachmentPointer avatar_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder> avatarBuilder_; + SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder> avatarBuilder_; /** * optional .signalservice.AttachmentPointer avatar = 5; */ @@ -20874,7 +20874,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer avatar = 5; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getAvatar() { + public SignalServiceProtos.AttachmentPointer getAvatar() { if (avatarBuilder_ == null) { return avatar_; } else { @@ -20884,7 +20884,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer avatar = 5; */ - public Builder setAvatar(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer value) { + public Builder setAvatar(SignalServiceProtos.AttachmentPointer value) { if (avatarBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -20901,7 +20901,7 @@ public final class SignalServiceProtos { * optional .signalservice.AttachmentPointer avatar = 5; */ public Builder setAvatar( - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder builderForValue) { + SignalServiceProtos.AttachmentPointer.Builder builderForValue) { if (avatarBuilder_ == null) { avatar_ = builderForValue.build(); onChanged(); @@ -20914,12 +20914,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer avatar = 5; */ - public Builder mergeAvatar(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer value) { + public Builder mergeAvatar(SignalServiceProtos.AttachmentPointer value) { if (avatarBuilder_ == null) { if (((bitField0_ & 0x00000010) == 0x00000010) && - avatar_ != org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance()) { + avatar_ != SignalServiceProtos.AttachmentPointer.getDefaultInstance()) { avatar_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.newBuilder(avatar_).mergeFrom(value).buildPartial(); + SignalServiceProtos.AttachmentPointer.newBuilder(avatar_).mergeFrom(value).buildPartial(); } else { avatar_ = value; } @@ -20935,7 +20935,7 @@ public final class SignalServiceProtos { */ public Builder clearAvatar() { if (avatarBuilder_ == null) { - avatar_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + avatar_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); onChanged(); } else { avatarBuilder_.clear(); @@ -20946,7 +20946,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer avatar = 5; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder getAvatarBuilder() { + public SignalServiceProtos.AttachmentPointer.Builder getAvatarBuilder() { bitField0_ |= 0x00000010; onChanged(); return getAvatarFieldBuilder().getBuilder(); @@ -20954,7 +20954,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer avatar = 5; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder getAvatarOrBuilder() { + public SignalServiceProtos.AttachmentPointerOrBuilder getAvatarOrBuilder() { if (avatarBuilder_ != null) { return avatarBuilder_.getMessageOrBuilder(); } else { @@ -20965,11 +20965,11 @@ public final class SignalServiceProtos { * optional .signalservice.AttachmentPointer avatar = 5; */ private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder> + SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder> getAvatarFieldBuilder() { if (avatarBuilder_ == null) { avatarBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder>( + SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder>( avatar_, getParentForChildren(), isClean()); diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceContent.java b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceContent.java index 0b6d2fbc53..96cc6c5559 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceContent.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceContent.java @@ -7,7 +7,7 @@ package org.session.libsignal.service.api.messages; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.internal.push.SignalServiceProtos; +import org.session.libsignal.protos.SignalServiceProtos; public class SignalServiceContent { private final String sender; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceDataMessage.java b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceDataMessage.java index 8ce3dca98e..4d83315873 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceDataMessage.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceDataMessage.java @@ -9,7 +9,7 @@ package org.session.libsignal.service.api.messages; import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.messages.shared.SharedContact; import org.session.libsignal.service.api.push.SignalServiceAddress; -import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage; +import org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage; import java.util.LinkedList; import java.util.List; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceEnvelope.java b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceEnvelope.java index 816fd8b04b..1ddb46bf85 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceEnvelope.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceEnvelope.java @@ -9,7 +9,7 @@ package org.session.libsignal.service.api.messages; import com.google.protobuf.ByteString; import org.session.libsignal.service.api.push.SignalServiceAddress; -import org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope; +import org.session.libsignal.protos.SignalServiceProtos.Envelope; /** * This class represents an encrypted Signal Service envelope. diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/ProfileAvatarData.java b/libsignal/src/main/java/org/session/libsignal/service/internal/push/ProfileAvatarData.java index 081c73244f..5d04aafc46 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/ProfileAvatarData.java +++ b/libsignal/src/main/java/org/session/libsignal/service/internal/push/ProfileAvatarData.java @@ -1,7 +1,7 @@ package org.session.libsignal.service.internal.push; -import org.session.libsignal.service.internal.push.http.OutputStreamFactory; +import org.session.libsignal.streams.OutputStreamFactory; import java.io.InputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/PushAttachmentData.java b/libsignal/src/main/java/org/session/libsignal/service/internal/push/PushAttachmentData.java index 9e878985c5..d02bd7b2c6 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/PushAttachmentData.java +++ b/libsignal/src/main/java/org/session/libsignal/service/internal/push/PushAttachmentData.java @@ -7,7 +7,7 @@ package org.session.libsignal.service.internal.push; import org.session.libsignal.service.api.messages.SignalServiceAttachment.ProgressListener; -import org.session.libsignal.service.internal.push.http.OutputStreamFactory; +import org.session.libsignal.streams.OutputStreamFactory; import java.io.InputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherInputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherInputStream.java index 08924fa957..3158d35f73 100644 --- a/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherInputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherInputStream.java @@ -8,7 +8,7 @@ package org.session.libsignal.streams; import org.session.libsignal.exceptions.InvalidMacException; import org.session.libsignal.exceptions.InvalidMessageException; -import org.session.libsignal.service.internal.util.Util; +import org.session.libsignal.utilities.Util; import java.io.File; import java.io.FileInputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherOutputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherOutputStream.java index 578dc82c69..91c3563700 100644 --- a/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherOutputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherOutputStream.java @@ -6,7 +6,7 @@ package org.session.libsignal.streams; -import org.session.libsignal.service.internal.util.Util; +import org.session.libsignal.utilities.Util; import java.io.IOException; import java.io.OutputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/AttachmentCipherOutputStreamFactory.java b/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherOutputStreamFactory.java similarity index 68% rename from libsignal/src/main/java/org/session/libsignal/service/internal/push/http/AttachmentCipherOutputStreamFactory.java rename to libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherOutputStreamFactory.java index f5a0657d31..4d1c793f08 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/AttachmentCipherOutputStreamFactory.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherOutputStreamFactory.java @@ -1,7 +1,4 @@ -package org.session.libsignal.service.internal.push.http; - -import org.session.libsignal.streams.AttachmentCipherOutputStream; -import org.session.libsignal.streams.DigestingOutputStream; +package org.session.libsignal.streams; import java.io.IOException; import java.io.OutputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/streams/ContentLengthInputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/ContentLengthInputStream.java index b1f5e2a081..aa69608cd1 100644 --- a/libsignal/src/main/java/org/session/libsignal/streams/ContentLengthInputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/ContentLengthInputStream.java @@ -1,6 +1,6 @@ package org.session.libsignal.streams; -import org.session.libsignal.service.internal.util.Util; +import org.session.libsignal.utilities.Util; import java.io.FilterInputStream; import java.io.IOException; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/DigestingRequestBody.java b/libsignal/src/main/java/org/session/libsignal/streams/DigestingRequestBody.java similarity index 94% rename from libsignal/src/main/java/org/session/libsignal/service/internal/push/http/DigestingRequestBody.java rename to libsignal/src/main/java/org/session/libsignal/streams/DigestingRequestBody.java index d4806c5103..ee8b750937 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/DigestingRequestBody.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/DigestingRequestBody.java @@ -1,7 +1,5 @@ -package org.session.libsignal.service.internal.push.http; +package org.session.libsignal.streams; - -import org.session.libsignal.streams.DigestingOutputStream; import org.session.libsignal.service.api.messages.SignalServiceAttachment.ProgressListener; import java.io.IOException; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/OutputStreamFactory.java b/libsignal/src/main/java/org/session/libsignal/streams/OutputStreamFactory.java similarity index 59% rename from libsignal/src/main/java/org/session/libsignal/service/internal/push/http/OutputStreamFactory.java rename to libsignal/src/main/java/org/session/libsignal/streams/OutputStreamFactory.java index 592c037d7b..4ca2f1b6ef 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/OutputStreamFactory.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/OutputStreamFactory.java @@ -1,7 +1,4 @@ -package org.session.libsignal.service.internal.push.http; - - -import org.session.libsignal.streams.DigestingOutputStream; +package org.session.libsignal.streams; import java.io.IOException; import java.io.OutputStream; @@ -9,5 +6,4 @@ import java.io.OutputStream; public interface OutputStreamFactory { public DigestingOutputStream createFor(OutputStream wrap) throws IOException; - } diff --git a/libsignal/src/main/java/org/session/libsignal/streams/PaddingInputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/PaddingInputStream.java index e57aca6fc0..8e4c52c3cb 100644 --- a/libsignal/src/main/java/org/session/libsignal/streams/PaddingInputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/PaddingInputStream.java @@ -1,6 +1,6 @@ package org.session.libsignal.streams; -import org.session.libsignal.service.internal.util.Util; +import org.session.libsignal.utilities.Util; import java.io.FilterInputStream; import java.io.IOException; diff --git a/libsignal/src/main/java/org/session/libsignal/streams/PlaintextOutputStreamFactory.kt b/libsignal/src/main/java/org/session/libsignal/streams/PlaintextOutputStreamFactory.kt index 2c1e118dac..07edc106cc 100644 --- a/libsignal/src/main/java/org/session/libsignal/streams/PlaintextOutputStreamFactory.kt +++ b/libsignal/src/main/java/org/session/libsignal/streams/PlaintextOutputStreamFactory.kt @@ -1,6 +1,5 @@ package org.session.libsignal.streams -import org.session.libsignal.service.internal.push.http.OutputStreamFactory import java.io.OutputStream /** diff --git a/libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherInputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherInputStream.java index c982a503d7..aa15eb00c6 100644 --- a/libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherInputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherInputStream.java @@ -1,6 +1,6 @@ package org.session.libsignal.streams; -import org.session.libsignal.service.internal.util.Util; +import org.session.libsignal.utilities.Util; import java.io.FilterInputStream; import java.io.IOException; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/ProfileCipherOutputStreamFactory.java b/libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherOutputStreamFactory.java similarity index 68% rename from libsignal/src/main/java/org/session/libsignal/service/internal/push/http/ProfileCipherOutputStreamFactory.java rename to libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherOutputStreamFactory.java index 14a76c3991..d29be29602 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/ProfileCipherOutputStreamFactory.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherOutputStreamFactory.java @@ -1,8 +1,4 @@ -package org.session.libsignal.service.internal.push.http; - - -import org.session.libsignal.streams.DigestingOutputStream; -import org.session.libsignal.streams.ProfileCipherOutputStream; +package org.session.libsignal.streams; import java.io.IOException; import java.io.OutputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/util/Util.java b/libsignal/src/main/java/org/session/libsignal/utilities/Util.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/service/internal/util/Util.java rename to libsignal/src/main/java/org/session/libsignal/utilities/Util.java index 71813ab3a4..2c9436485f 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/util/Util.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/Util.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.internal.util; +package org.session.libsignal.utilities; import java.io.ByteArrayOutputStream; import java.io.IOException;