Merge branch 'dev' of https://github.com/loki-project/session-android into formation-timestamp-update

app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt

@@ -429,7 +429,13 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
     }
 
     override fun updateFormationTimestamp(groupID: String, formationTimestamp: Long) {
-        DatabaseFactory.getGroupDatabase(context).updateFormationTimestamp(groupID, formationTimestamp)
+        DatabaseFactory.getGroupDatabase(context)
+            .updateFormationTimestamp(groupID, formationTimestamp)
+    }
+
+    override fun setExpirationTimer(groupID: String, duration: Int) {
+        val recipient = Recipient.from(context, fromSerialized(groupID), false)
+        DatabaseFactory.getRecipientDatabase(context).setExpireMessages(recipient, duration);
     }
 
     override fun getAllV2OpenGroups(): Map<Long, OpenGroupV2> {

libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt

@@ -116,6 +116,7 @@ interface StorageProtocol {
     fun getClosedGroupEncryptionKeyPairs(groupPublicKey: String): MutableList<ECKeyPair>
     fun getLatestClosedGroupEncryptionKeyPair(groupPublicKey: String): ECKeyPair?
     fun updateFormationTimestamp(groupID: String, formationTimestamp: Long)
+    fun setExpirationTimer(groupID: String, duration: Int)
 
     // Groups
     fun getAllGroups(): List<GroupRecord>

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

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

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt

@@ -11,8 +11,10 @@ import org.session.libsession.messaging.sending_receiving.MessageSender.Error
 import org.session.libsession.messaging.sending_receiving.notifications.PushNotificationAPI
 import org.session.libsession.messaging.sending_receiving.pollers.ClosedGroupPollerV2
 import org.session.libsession.utilities.Address
+import org.session.libsession.utilities.Address.Companion.fromSerialized
 import org.session.libsession.utilities.GroupUtil
 import org.session.libsession.utilities.TextSecurePreferences
+import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsignal.crypto.ecc.Curve
 import org.session.libsignal.crypto.ecc.ECKeyPair
 import org.session.libsignal.utilities.guava.Optional
@@ -50,7 +52,7 @@ fun MessageSender.create(name: String, members: Collection<String>): Promise<Str
             null, null, LinkedList(admins.map { Address.fromSerialized(it) }), System.currentTimeMillis())
         storage.setProfileSharing(Address.fromSerialized(groupID), true)
         // Send a closed group update message to all members individually
-        val closedGroupUpdateKind = ClosedGroupControlMessage.Kind.New(ByteString.copyFrom(Hex.fromStringCondensed(groupPublicKey)), name, encryptionKeyPair, membersAsData, adminsAsData)
+        val closedGroupUpdateKind = ClosedGroupControlMessage.Kind.New(ByteString.copyFrom(Hex.fromStringCondensed(groupPublicKey)), name, encryptionKeyPair, membersAsData, adminsAsData, 0)
         val sentTime = System.currentTimeMillis()
         for (member in members) {
             val closedGroupControlMessage = ClosedGroupControlMessage(closedGroupUpdateKind)
@@ -131,6 +133,8 @@ fun MessageSender.addMembers(groupPublicKey: String, membersToAdd: List<String>)
         Log.d("Loki", "Can't add members to nonexistent closed group.")
         throw Error.NoThread
     }
+    val recipient = Recipient.from(context, fromSerialized(groupID), false)
+    val expireTimer = recipient.expireMessages
     if (membersToAdd.isEmpty()) {
         Log.d("Loki", "Invalid closed group update.")
         throw Error.InvalidClosedGroupUpdate
@@ -155,7 +159,7 @@ fun MessageSender.addMembers(groupPublicKey: String, membersToAdd: List<String>)
     send(closedGroupControlMessage, Address.fromSerialized(groupID))
     // Send closed group update messages to any new members individually
     for (member in membersToAdd) {
-        val closedGroupNewKind = ClosedGroupControlMessage.Kind.New(ByteString.copyFrom(Hex.fromStringCondensed(groupPublicKey)), name, encryptionKeyPair, membersAsData, adminsAsData)
+        val closedGroupNewKind = ClosedGroupControlMessage.Kind.New(ByteString.copyFrom(Hex.fromStringCondensed(groupPublicKey)), name, encryptionKeyPair, membersAsData, adminsAsData, expireTimer)
         val closedGroupControlMessage = ClosedGroupControlMessage(closedGroupNewKind)
         closedGroupControlMessage.sentTimestamp = sentTime
         send(closedGroupControlMessage, Address.fromSerialized(member))

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

@@ -121,7 +121,7 @@ private fun handleConfigurationMessage(message: ConfigurationMessage) {
     for (closedGroup in message.closedGroups) {
         if (allClosedGroupPublicKeys.contains(closedGroup.publicKey)) continue
         handleNewClosedGroup(message.sender!!, message.sentTimestamp!!, closedGroup.publicKey, closedGroup.name,
-            closedGroup.encryptionKeyPair!!, closedGroup.members, closedGroup.admins, message.sentTimestamp!!)
+            closedGroup.encryptionKeyPair!!, closedGroup.members, closedGroup.admins, message.sentTimestamp!!, 0)
     }
     val allV2OpenGroups = storage.getAllV2OpenGroups().map { it.value.joinURL }
     for (openGroup in message.openGroups) {
@@ -256,10 +256,11 @@ private fun MessageReceiver.handleNewClosedGroup(message: ClosedGroupControlMess
     val groupPublicKey = kind.publicKey.toByteArray().toHexString()
     val members = kind.members.map { it.toByteArray().toHexString() }
     val admins = kind.admins.map { it.toByteArray().toHexString() }
-    handleNewClosedGroup(message.sender!!, message.sentTimestamp!!, groupPublicKey, kind.name, kind.encryptionKeyPair!!, members, admins, message.sentTimestamp!!)
+    val expireTimer = kind.expireTimer
+    handleNewClosedGroup(message.sender!!, message.sentTimestamp!!, groupPublicKey, kind.name, kind.encryptionKeyPair!!, members, admins, message.sentTimestamp!!, expireTimer)
 }
 
-private fun handleNewClosedGroup(sender: String, sentTimestamp: Long, groupPublicKey: String, name: String, encryptionKeyPair: ECKeyPair, members: List<String>, admins: List<String>, formationTimestamp: Long) {
+private fun handleNewClosedGroup(sender: String, sentTimestamp: Long, groupPublicKey: String, name: String, encryptionKeyPair: ECKeyPair, members: List<String>, admins: List<String>, formationTimestamp: Long, expireTimer: Int) {
     val context = MessagingModuleConfiguration.shared.context
     val storage = MessagingModuleConfiguration.shared.storage
     val userPublicKey = TextSecurePreferences.getLocalNumber(context)
@@ -284,6 +285,8 @@ private fun handleNewClosedGroup(sender: String, sentTimestamp: Long, groupPubli
     storage.addClosedGroupPublicKey(groupPublicKey)
     // Store the encryption key pair
     storage.addClosedGroupEncryptionKeyPair(encryptionKeyPair, groupPublicKey)
+    // Set expiration timer
+    storage.setExpirationTimer(groupID, expireTimer)
     // Notify the PN server
     PushNotificationAPI.performOperation(PushNotificationAPI.ClosedGroupOperation.Subscribe, groupPublicKey, storage.getUserPublicKey()!!)
     // Notify the user

libsignal/protobuf/SignalService.proto

@@ -2,7 +2,7 @@ syntax = "proto2";
 
 package signalservice;
 
-option java_package = "org.session.libsignal.service.internal.push";
+option java_package = "org.session.libsignal.protos";
 option java_outer_classname = "SignalServiceProtos";
 
 message Envelope {
@@ -112,7 +112,7 @@ message DataMessage {
   message ClosedGroupControlMessage {
 
     enum Type {
-      NEW                         = 1; // publicKey, name, encryptionKeyPair, members, admins
+      NEW                         = 1; // publicKey, name, encryptionKeyPair, members, admins, expireTimer
       ENCRYPTION_KEY_PAIR         = 3; // publicKey, wrappers
       NAME_CHANGE                 = 4; // name
       MEMBERS_ADDED               = 5; // members
@@ -135,6 +135,7 @@ message DataMessage {
     repeated bytes          members           = 5;
     repeated bytes          admins            = 6;
     repeated KeyPairWrapper wrappers          = 7;
+    optional uint32         expireTimer       = 8;
   }
 
   optional string                    body                      = 1;

libsignal/protobuf/WebSocketResources.proto

@@ -8,7 +8,7 @@ syntax = "proto2";
 
 package signalservice;
 
-option java_package = "org.session.libsignal.service.internal.websocket";
+option java_package = "org.session.libsignal.protos";
 option java_outer_classname = "WebSocketProtos";
 
 message WebSocketRequestMessage {

libsignal/src/main/java/org/session/libsignal/protos/WebSocketProtos.java

@@ -177,14 +177,14 @@ public final class WebSocketProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return WebSocketProtos.internal_static_signalservice_WebSocketRequestMessage_descriptor;
+      return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketRequestMessage_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return WebSocketProtos.internal_static_signalservice_WebSocketRequestMessage_fieldAccessorTable
+      return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketRequestMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              WebSocketProtos.WebSocketRequestMessage.class, WebSocketProtos.WebSocketRequestMessage.Builder.class);
+              org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.class, org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.Builder.class);
     }
 
     public static com.google.protobuf.Parser<WebSocketRequestMessage> PARSER =
@@ -431,53 +431,53 @@ public final class WebSocketProtos {
       return super.writeReplace();
     }
 
-    public static WebSocketProtos.WebSocketRequestMessage parseFrom(
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static WebSocketProtos.WebSocketRequestMessage parseFrom(
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static WebSocketProtos.WebSocketRequestMessage parseFrom(byte[] data)
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static WebSocketProtos.WebSocketRequestMessage parseFrom(
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static WebSocketProtos.WebSocketRequestMessage parseFrom(java.io.InputStream input)
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static WebSocketProtos.WebSocketRequestMessage parseFrom(
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static WebSocketProtos.WebSocketRequestMessage parseDelimitedFrom(java.io.InputStream input)
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static WebSocketProtos.WebSocketRequestMessage parseDelimitedFrom(
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static WebSocketProtos.WebSocketRequestMessage parseFrom(
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static WebSocketProtos.WebSocketRequestMessage parseFrom(
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -486,7 +486,7 @@ public final class WebSocketProtos {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(WebSocketProtos.WebSocketRequestMessage prototype) {
+    public static Builder newBuilder(org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -502,17 +502,17 @@ public final class WebSocketProtos {
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements WebSocketProtos.WebSocketRequestMessageOrBuilder {
+       implements org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessageOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return WebSocketProtos.internal_static_signalservice_WebSocketRequestMessage_descriptor;
+        return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketRequestMessage_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return WebSocketProtos.internal_static_signalservice_WebSocketRequestMessage_fieldAccessorTable
+        return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketRequestMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                WebSocketProtos.WebSocketRequestMessage.class, WebSocketProtos.WebSocketRequestMessage.Builder.class);
+                org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.class, org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.Builder.class);
       }
 
       // Construct using org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.newBuilder()
@@ -554,23 +554,23 @@ public final class WebSocketProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return WebSocketProtos.internal_static_signalservice_WebSocketRequestMessage_descriptor;
+        return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketRequestMessage_descriptor;
       }
 
-      public WebSocketProtos.WebSocketRequestMessage getDefaultInstanceForType() {
+      public org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage getDefaultInstanceForType() {
-        return WebSocketProtos.WebSocketRequestMessage.getDefaultInstance();
+        return org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.getDefaultInstance();
       }
 
-      public WebSocketProtos.WebSocketRequestMessage build() {
+      public org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage build() {
-        WebSocketProtos.WebSocketRequestMessage result = buildPartial();
+        org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public WebSocketProtos.WebSocketRequestMessage buildPartial() {
+      public org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage buildPartial() {
-        WebSocketProtos.WebSocketRequestMessage result = new WebSocketProtos.WebSocketRequestMessage(this);
+        org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage result = new org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -601,16 +601,16 @@ public final class WebSocketProtos {
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof WebSocketProtos.WebSocketRequestMessage) {
+        if (other instanceof org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage) {
-          return mergeFrom((WebSocketProtos.WebSocketRequestMessage)other);
+          return mergeFrom((org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(WebSocketProtos.WebSocketRequestMessage other) {
+      public Builder mergeFrom(org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage other) {
-        if (other == WebSocketProtos.WebSocketRequestMessage.getDefaultInstance()) return this;
+        if (other == org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.getDefaultInstance()) return this;
         if (other.hasVerb()) {
           bitField0_ |= 0x00000001;
           verb_ = other.verb_;
@@ -649,11 +649,11 @@ public final class WebSocketProtos {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        WebSocketProtos.WebSocketRequestMessage parsedMessage = null;
+        org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (WebSocketProtos.WebSocketRequestMessage) e.getUnfinishedMessage();
+          parsedMessage = (org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -1149,14 +1149,14 @@ public final class WebSocketProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return WebSocketProtos.internal_static_signalservice_WebSocketResponseMessage_descriptor;
+      return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketResponseMessage_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return WebSocketProtos.internal_static_signalservice_WebSocketResponseMessage_fieldAccessorTable
+      return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketResponseMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              WebSocketProtos.WebSocketResponseMessage.class, WebSocketProtos.WebSocketResponseMessage.Builder.class);
+              org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.class, org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.Builder.class);
     }
 
     public static com.google.protobuf.Parser<WebSocketResponseMessage> PARSER =
@@ -1376,53 +1376,53 @@ public final class WebSocketProtos {
       return super.writeReplace();
     }
 
-    public static WebSocketProtos.WebSocketResponseMessage parseFrom(
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static WebSocketProtos.WebSocketResponseMessage parseFrom(
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static WebSocketProtos.WebSocketResponseMessage parseFrom(byte[] data)
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static WebSocketProtos.WebSocketResponseMessage parseFrom(
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static WebSocketProtos.WebSocketResponseMessage parseFrom(java.io.InputStream input)
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static WebSocketProtos.WebSocketResponseMessage parseFrom(
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static WebSocketProtos.WebSocketResponseMessage parseDelimitedFrom(java.io.InputStream input)
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static WebSocketProtos.WebSocketResponseMessage parseDelimitedFrom(
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static WebSocketProtos.WebSocketResponseMessage parseFrom(
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static WebSocketProtos.WebSocketResponseMessage parseFrom(
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1431,7 +1431,7 @@ public final class WebSocketProtos {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(WebSocketProtos.WebSocketResponseMessage prototype) {
+    public static Builder newBuilder(org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -1447,17 +1447,17 @@ public final class WebSocketProtos {
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements WebSocketProtos.WebSocketResponseMessageOrBuilder {
+       implements org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessageOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return WebSocketProtos.internal_static_signalservice_WebSocketResponseMessage_descriptor;
+        return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketResponseMessage_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return WebSocketProtos.internal_static_signalservice_WebSocketResponseMessage_fieldAccessorTable
+        return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketResponseMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                WebSocketProtos.WebSocketResponseMessage.class, WebSocketProtos.WebSocketResponseMessage.Builder.class);
+                org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.class, org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.Builder.class);
       }
 
       // Construct using org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.newBuilder()
@@ -1499,23 +1499,23 @@ public final class WebSocketProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return WebSocketProtos.internal_static_signalservice_WebSocketResponseMessage_descriptor;
+        return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketResponseMessage_descriptor;
       }
 
-      public WebSocketProtos.WebSocketResponseMessage getDefaultInstanceForType() {
+      public org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage getDefaultInstanceForType() {
-        return WebSocketProtos.WebSocketResponseMessage.getDefaultInstance();
+        return org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.getDefaultInstance();
       }
 
-      public WebSocketProtos.WebSocketResponseMessage build() {
+      public org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage build() {
-        WebSocketProtos.WebSocketResponseMessage result = buildPartial();
+        org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public WebSocketProtos.WebSocketResponseMessage buildPartial() {
+      public org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage buildPartial() {
-        WebSocketProtos.WebSocketResponseMessage result = new WebSocketProtos.WebSocketResponseMessage(this);
+        org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage result = new org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -1546,16 +1546,16 @@ public final class WebSocketProtos {
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof WebSocketProtos.WebSocketResponseMessage) {
+        if (other instanceof org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage) {
-          return mergeFrom((WebSocketProtos.WebSocketResponseMessage)other);
+          return mergeFrom((org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(WebSocketProtos.WebSocketResponseMessage other) {
+      public Builder mergeFrom(org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage other) {
-        if (other == WebSocketProtos.WebSocketResponseMessage.getDefaultInstance()) return this;
+        if (other == org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.getDefaultInstance()) return this;
         if (other.hasId()) {
           setId(other.getId());
         }
@@ -1592,11 +1592,11 @@ public final class WebSocketProtos {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        WebSocketProtos.WebSocketResponseMessage parsedMessage = null;
+        org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (WebSocketProtos.WebSocketResponseMessage) e.getUnfinishedMessage();
+          parsedMessage = (org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -1898,7 +1898,7 @@ public final class WebSocketProtos {
     /**
      * <code>optional .signalservice.WebSocketMessage.Type type = 1;</code>
      */
-    WebSocketProtos.WebSocketMessage.Type getType();
+    org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Type getType();
 
     // optional .signalservice.WebSocketRequestMessage request = 2;
     /**
@@ -1908,11 +1908,11 @@ public final class WebSocketProtos {
     /**
      * <code>optional .signalservice.WebSocketRequestMessage request = 2;</code>
      */
-    WebSocketProtos.WebSocketRequestMessage getRequest();
+    org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage getRequest();
     /**
      * <code>optional .signalservice.WebSocketRequestMessage request = 2;</code>
      */
-    WebSocketProtos.WebSocketRequestMessageOrBuilder getRequestOrBuilder();
+    org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessageOrBuilder getRequestOrBuilder();
 
     // optional .signalservice.WebSocketResponseMessage response = 3;
     /**
@@ -1922,11 +1922,11 @@ public final class WebSocketProtos {
     /**
      * <code>optional .signalservice.WebSocketResponseMessage response = 3;</code>
      */
-    WebSocketProtos.WebSocketResponseMessage getResponse();
+    org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage getResponse();
     /**
      * <code>optional .signalservice.WebSocketResponseMessage response = 3;</code>
      */
-    WebSocketProtos.WebSocketResponseMessageOrBuilder getResponseOrBuilder();
+    org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessageOrBuilder getResponseOrBuilder();
   }
   /**
    * Protobuf type {@code signalservice.WebSocketMessage}
@@ -1981,7 +1981,7 @@ public final class WebSocketProtos {
             }
             case 8: {
               int rawValue = input.readEnum();
-              WebSocketProtos.WebSocketMessage.Type value = WebSocketProtos.WebSocketMessage.Type.valueOf(rawValue);
+              org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Type value = org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Type.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(1, rawValue);
               } else {
@@ -1991,11 +1991,11 @@ public final class WebSocketProtos {
               break;
             }
             case 18: {
-              WebSocketProtos.WebSocketRequestMessage.Builder subBuilder = null;
+              org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) == 0x00000002)) {
                 subBuilder = request_.toBuilder();
               }
-              request_ = input.readMessage(WebSocketProtos.WebSocketRequestMessage.PARSER, extensionRegistry);
+              request_ = input.readMessage(org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(request_);
                 request_ = subBuilder.buildPartial();
@@ -2004,11 +2004,11 @@ public final class WebSocketProtos {
               break;
             }
             case 26: {
-              WebSocketProtos.WebSocketResponseMessage.Builder subBuilder = null;
+              org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.Builder subBuilder = null;
               if (((bitField0_ & 0x00000004) == 0x00000004)) {
                 subBuilder = response_.toBuilder();
               }
-              response_ = input.readMessage(WebSocketProtos.WebSocketResponseMessage.PARSER, extensionRegistry);
+              response_ = input.readMessage(org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(response_);
                 response_ = subBuilder.buildPartial();
@@ -2030,14 +2030,14 @@ public final class WebSocketProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return WebSocketProtos.internal_static_signalservice_WebSocketMessage_descriptor;
+      return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketMessage_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return WebSocketProtos.internal_static_signalservice_WebSocketMessage_fieldAccessorTable
+      return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              WebSocketProtos.WebSocketMessage.class, WebSocketProtos.WebSocketMessage.Builder.class);
+              org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.class, org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Builder.class);
     }
 
     public static com.google.protobuf.Parser<WebSocketMessage> PARSER =
@@ -2121,7 +2121,7 @@ public final class WebSocketProtos {
       }
       public static final com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
-        return WebSocketProtos.WebSocketMessage.getDescriptor().getEnumTypes().get(0);
+        return org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.getDescriptor().getEnumTypes().get(0);
       }
 
       private static final Type[] VALUES = values();
@@ -2149,7 +2149,7 @@ public final class WebSocketProtos {
     private int bitField0_;
     // optional .signalservice.WebSocketMessage.Type type = 1;
     public static final int TYPE_FIELD_NUMBER = 1;
-    private WebSocketProtos.WebSocketMessage.Type type_;
+    private org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Type type_;
     /**
      * <code>optional .signalservice.WebSocketMessage.Type type = 1;</code>
      */
@@ -2159,13 +2159,13 @@ public final class WebSocketProtos {
     /**
      * <code>optional .signalservice.WebSocketMessage.Type type = 1;</code>
      */
-    public WebSocketProtos.WebSocketMessage.Type getType() {
+    public org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Type getType() {
       return type_;
     }
 
     // optional .signalservice.WebSocketRequestMessage request = 2;
     public static final int REQUEST_FIELD_NUMBER = 2;
-    private WebSocketProtos.WebSocketRequestMessage request_;
+    private org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage request_;
     /**
      * <code>optional .signalservice.WebSocketRequestMessage request = 2;</code>
      */
@@ -2175,19 +2175,19 @@ public final class WebSocketProtos {
     /**
      * <code>optional .signalservice.WebSocketRequestMessage request = 2;</code>
      */
-    public WebSocketProtos.WebSocketRequestMessage getRequest() {
+    public org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage getRequest() {
       return request_;
     }
     /**
      * <code>optional .signalservice.WebSocketRequestMessage request = 2;</code>
      */
-    public WebSocketProtos.WebSocketRequestMessageOrBuilder getRequestOrBuilder() {
+    public org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessageOrBuilder getRequestOrBuilder() {
       return request_;
     }
 
     // optional .signalservice.WebSocketResponseMessage response = 3;
     public static final int RESPONSE_FIELD_NUMBER = 3;
-    private WebSocketProtos.WebSocketResponseMessage response_;
+    private org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage response_;
     /**
      * <code>optional .signalservice.WebSocketResponseMessage response = 3;</code>
      */
@@ -2197,20 +2197,20 @@ public final class WebSocketProtos {
     /**
      * <code>optional .signalservice.WebSocketResponseMessage response = 3;</code>
      */
-    public WebSocketProtos.WebSocketResponseMessage getResponse() {
+    public org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage getResponse() {
       return response_;
     }
     /**
      * <code>optional .signalservice.WebSocketResponseMessage response = 3;</code>
      */
-    public WebSocketProtos.WebSocketResponseMessageOrBuilder getResponseOrBuilder() {
+    public org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessageOrBuilder getResponseOrBuilder() {
       return response_;
     }
 
     private void initFields() {
-      type_ = WebSocketProtos.WebSocketMessage.Type.UNKNOWN;
+      type_ = org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Type.UNKNOWN;
-      request_ = WebSocketProtos.WebSocketRequestMessage.getDefaultInstance();
+      request_ = org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.getDefaultInstance();
-      response_ = WebSocketProtos.WebSocketResponseMessage.getDefaultInstance();
+      response_ = org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -2266,53 +2266,53 @@ public final class WebSocketProtos {
       return super.writeReplace();
     }
 
-    public static WebSocketProtos.WebSocketMessage parseFrom(
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketMessage parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static WebSocketProtos.WebSocketMessage parseFrom(
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketMessage parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static WebSocketProtos.WebSocketMessage parseFrom(byte[] data)
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketMessage parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static WebSocketProtos.WebSocketMessage parseFrom(
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketMessage parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static WebSocketProtos.WebSocketMessage parseFrom(java.io.InputStream input)
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketMessage parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static WebSocketProtos.WebSocketMessage parseFrom(
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketMessage parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static WebSocketProtos.WebSocketMessage parseDelimitedFrom(java.io.InputStream input)
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static WebSocketProtos.WebSocketMessage parseDelimitedFrom(
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketMessage parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static WebSocketProtos.WebSocketMessage parseFrom(
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketMessage parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static WebSocketProtos.WebSocketMessage parseFrom(
+    public static org.session.libsignal.protos.WebSocketProtos.WebSocketMessage parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2321,7 +2321,7 @@ public final class WebSocketProtos {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(WebSocketProtos.WebSocketMessage prototype) {
+    public static Builder newBuilder(org.session.libsignal.protos.WebSocketProtos.WebSocketMessage prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -2337,17 +2337,17 @@ public final class WebSocketProtos {
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements WebSocketProtos.WebSocketMessageOrBuilder {
+       implements org.session.libsignal.protos.WebSocketProtos.WebSocketMessageOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return WebSocketProtos.internal_static_signalservice_WebSocketMessage_descriptor;
+        return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketMessage_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return WebSocketProtos.internal_static_signalservice_WebSocketMessage_fieldAccessorTable
+        return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                WebSocketProtos.WebSocketMessage.class, WebSocketProtos.WebSocketMessage.Builder.class);
+                org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.class, org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Builder.class);
       }
 
       // Construct using org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.newBuilder()
@@ -2372,16 +2372,16 @@ public final class WebSocketProtos {
 
       public Builder clear() {
         super.clear();
-        type_ = WebSocketProtos.WebSocketMessage.Type.UNKNOWN;
+        type_ = org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Type.UNKNOWN;
         bitField0_ = (bitField0_ & ~0x00000001);
         if (requestBuilder_ == null) {
-          request_ = WebSocketProtos.WebSocketRequestMessage.getDefaultInstance();
+          request_ = org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.getDefaultInstance();
         } else {
           requestBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000002);
         if (responseBuilder_ == null) {
-          response_ = WebSocketProtos.WebSocketResponseMessage.getDefaultInstance();
+          response_ = org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.getDefaultInstance();
         } else {
           responseBuilder_.clear();
         }
@@ -2395,23 +2395,23 @@ public final class WebSocketProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return WebSocketProtos.internal_static_signalservice_WebSocketMessage_descriptor;
+        return org.session.libsignal.protos.WebSocketProtos.internal_static_signalservice_WebSocketMessage_descriptor;
       }
 
-      public WebSocketProtos.WebSocketMessage getDefaultInstanceForType() {
+      public org.session.libsignal.protos.WebSocketProtos.WebSocketMessage getDefaultInstanceForType() {
-        return WebSocketProtos.WebSocketMessage.getDefaultInstance();
+        return org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.getDefaultInstance();
       }
 
-      public WebSocketProtos.WebSocketMessage build() {
+      public org.session.libsignal.protos.WebSocketProtos.WebSocketMessage build() {
-        WebSocketProtos.WebSocketMessage result = buildPartial();
+        org.session.libsignal.protos.WebSocketProtos.WebSocketMessage result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public WebSocketProtos.WebSocketMessage buildPartial() {
+      public org.session.libsignal.protos.WebSocketProtos.WebSocketMessage buildPartial() {
-        WebSocketProtos.WebSocketMessage result = new WebSocketProtos.WebSocketMessage(this);
+        org.session.libsignal.protos.WebSocketProtos.WebSocketMessage result = new org.session.libsignal.protos.WebSocketProtos.WebSocketMessage(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -2440,16 +2440,16 @@ public final class WebSocketProtos {
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof WebSocketProtos.WebSocketMessage) {
+        if (other instanceof org.session.libsignal.protos.WebSocketProtos.WebSocketMessage) {
-          return mergeFrom((WebSocketProtos.WebSocketMessage)other);
+          return mergeFrom((org.session.libsignal.protos.WebSocketProtos.WebSocketMessage)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(WebSocketProtos.WebSocketMessage other) {
+      public Builder mergeFrom(org.session.libsignal.protos.WebSocketProtos.WebSocketMessage other) {
-        if (other == WebSocketProtos.WebSocketMessage.getDefaultInstance()) return this;
+        if (other == org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.getDefaultInstance()) return this;
         if (other.hasType()) {
           setType(other.getType());
         }
@@ -2471,11 +2471,11 @@ public final class WebSocketProtos {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        WebSocketProtos.WebSocketMessage parsedMessage = null;
+        org.session.libsignal.protos.WebSocketProtos.WebSocketMessage parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (WebSocketProtos.WebSocketMessage) e.getUnfinishedMessage();
+          parsedMessage = (org.session.libsignal.protos.WebSocketProtos.WebSocketMessage) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -2487,7 +2487,7 @@ public final class WebSocketProtos {
       private int bitField0_;
 
       // optional .signalservice.WebSocketMessage.Type type = 1;
-      private WebSocketProtos.WebSocketMessage.Type type_ = WebSocketProtos.WebSocketMessage.Type.UNKNOWN;
+      private org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Type type_ = org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Type.UNKNOWN;
       /**
        * <code>optional .signalservice.WebSocketMessage.Type type = 1;</code>
        */
@@ -2497,13 +2497,13 @@ public final class WebSocketProtos {
       /**
        * <code>optional .signalservice.WebSocketMessage.Type type = 1;</code>
        */
-      public WebSocketProtos.WebSocketMessage.Type getType() {
+      public org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Type getType() {
         return type_;
       }
       /**
        * <code>optional .signalservice.WebSocketMessage.Type type = 1;</code>
        */
-      public Builder setType(WebSocketProtos.WebSocketMessage.Type value) {
+      public Builder setType(org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -2517,15 +2517,15 @@ public final class WebSocketProtos {
        */
       public Builder clearType() {
         bitField0_ = (bitField0_ & ~0x00000001);
-        type_ = WebSocketProtos.WebSocketMessage.Type.UNKNOWN;
+        type_ = org.session.libsignal.protos.WebSocketProtos.WebSocketMessage.Type.UNKNOWN;
         onChanged();
         return this;
       }
 
       // optional .signalservice.WebSocketRequestMessage request = 2;
-      private WebSocketProtos.WebSocketRequestMessage request_ = WebSocketProtos.WebSocketRequestMessage.getDefaultInstance();
+      private org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage request_ = org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          WebSocketProtos.WebSocketRequestMessage, WebSocketProtos.WebSocketRequestMessage.Builder, WebSocketProtos.WebSocketRequestMessageOrBuilder> requestBuilder_;
+          org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage, org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.Builder, org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessageOrBuilder> requestBuilder_;
       /**
        * <code>optional .signalservice.WebSocketRequestMessage request = 2;</code>
        */
@@ -2535,7 +2535,7 @@ public final class WebSocketProtos {
       /**
        * <code>optional .signalservice.WebSocketRequestMessage request = 2;</code>
        */
-      public WebSocketProtos.WebSocketRequestMessage getRequest() {
+      public org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage getRequest() {
         if (requestBuilder_ == null) {
           return request_;
         } else {
@@ -2545,7 +2545,7 @@ public final class WebSocketProtos {
       /**
        * <code>optional .signalservice.WebSocketRequestMessage request = 2;</code>
        */
-      public Builder setRequest(WebSocketProtos.WebSocketRequestMessage value) {
+      public Builder setRequest(org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage value) {
         if (requestBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2562,7 +2562,7 @@ public final class WebSocketProtos {
        * <code>optional .signalservice.WebSocketRequestMessage request = 2;</code>
        */
       public Builder setRequest(
-          WebSocketProtos.WebSocketRequestMessage.Builder builderForValue) {
+          org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.Builder builderForValue) {
         if (requestBuilder_ == null) {
           request_ = builderForValue.build();
           onChanged();
@@ -2575,12 +2575,12 @@ public final class WebSocketProtos {
       /**
        * <code>optional .signalservice.WebSocketRequestMessage request = 2;</code>
        */
-      public Builder mergeRequest(WebSocketProtos.WebSocketRequestMessage value) {
+      public Builder mergeRequest(org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage value) {
         if (requestBuilder_ == null) {
           if (((bitField0_ & 0x00000002) == 0x00000002) &&
-              request_ != WebSocketProtos.WebSocketRequestMessage.getDefaultInstance()) {
+              request_ != org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.getDefaultInstance()) {
             request_ =
-              WebSocketProtos.WebSocketRequestMessage.newBuilder(request_).mergeFrom(value).buildPartial();
+              org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.newBuilder(request_).mergeFrom(value).buildPartial();
           } else {
             request_ = value;
           }
@@ -2596,7 +2596,7 @@ public final class WebSocketProtos {
        */
       public Builder clearRequest() {
         if (requestBuilder_ == null) {
-          request_ = WebSocketProtos.WebSocketRequestMessage.getDefaultInstance();
+          request_ = org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.getDefaultInstance();
           onChanged();
         } else {
           requestBuilder_.clear();
@@ -2607,7 +2607,7 @@ public final class WebSocketProtos {
       /**
        * <code>optional .signalservice.WebSocketRequestMessage request = 2;</code>
        */
-      public WebSocketProtos.WebSocketRequestMessage.Builder getRequestBuilder() {
+      public org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.Builder getRequestBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getRequestFieldBuilder().getBuilder();
@@ -2615,7 +2615,7 @@ public final class WebSocketProtos {
       /**
        * <code>optional .signalservice.WebSocketRequestMessage request = 2;</code>
        */
-      public WebSocketProtos.WebSocketRequestMessageOrBuilder getRequestOrBuilder() {
+      public org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessageOrBuilder getRequestOrBuilder() {
         if (requestBuilder_ != null) {
           return requestBuilder_.getMessageOrBuilder();
         } else {
@@ -2626,11 +2626,11 @@ public final class WebSocketProtos {
        * <code>optional .signalservice.WebSocketRequestMessage request = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          WebSocketProtos.WebSocketRequestMessage, WebSocketProtos.WebSocketRequestMessage.Builder, WebSocketProtos.WebSocketRequestMessageOrBuilder>
+          org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage, org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.Builder, org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessageOrBuilder> 
           getRequestFieldBuilder() {
         if (requestBuilder_ == null) {
           requestBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              WebSocketProtos.WebSocketRequestMessage, WebSocketProtos.WebSocketRequestMessage.Builder, WebSocketProtos.WebSocketRequestMessageOrBuilder>(
+              org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage, org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage.Builder, org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessageOrBuilder>(
                   request_,
                   getParentForChildren(),
                   isClean());
@@ -2640,9 +2640,9 @@ public final class WebSocketProtos {
       }
 
       // optional .signalservice.WebSocketResponseMessage response = 3;
-      private WebSocketProtos.WebSocketResponseMessage response_ = WebSocketProtos.WebSocketResponseMessage.getDefaultInstance();
+      private org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage response_ = org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          WebSocketProtos.WebSocketResponseMessage, WebSocketProtos.WebSocketResponseMessage.Builder, WebSocketProtos.WebSocketResponseMessageOrBuilder> responseBuilder_;
+          org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage, org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.Builder, org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessageOrBuilder> responseBuilder_;
       /**
        * <code>optional .signalservice.WebSocketResponseMessage response = 3;</code>
        */
@@ -2652,7 +2652,7 @@ public final class WebSocketProtos {
       /**
        * <code>optional .signalservice.WebSocketResponseMessage response = 3;</code>
        */
-      public WebSocketProtos.WebSocketResponseMessage getResponse() {
+      public org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage getResponse() {
         if (responseBuilder_ == null) {
           return response_;
         } else {
@@ -2662,7 +2662,7 @@ public final class WebSocketProtos {
       /**
        * <code>optional .signalservice.WebSocketResponseMessage response = 3;</code>
        */
-      public Builder setResponse(WebSocketProtos.WebSocketResponseMessage value) {
+      public Builder setResponse(org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage value) {
         if (responseBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2679,7 +2679,7 @@ public final class WebSocketProtos {
        * <code>optional .signalservice.WebSocketResponseMessage response = 3;</code>
        */
       public Builder setResponse(
-          WebSocketProtos.WebSocketResponseMessage.Builder builderForValue) {
+          org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.Builder builderForValue) {
         if (responseBuilder_ == null) {
           response_ = builderForValue.build();
           onChanged();
@@ -2692,12 +2692,12 @@ public final class WebSocketProtos {
       /**
        * <code>optional .signalservice.WebSocketResponseMessage response = 3;</code>
        */
-      public Builder mergeResponse(WebSocketProtos.WebSocketResponseMessage value) {
+      public Builder mergeResponse(org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage value) {
         if (responseBuilder_ == null) {
           if (((bitField0_ & 0x00000004) == 0x00000004) &&
-              response_ != WebSocketProtos.WebSocketResponseMessage.getDefaultInstance()) {
+              response_ != org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.getDefaultInstance()) {
             response_ =
-              WebSocketProtos.WebSocketResponseMessage.newBuilder(response_).mergeFrom(value).buildPartial();
+              org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.newBuilder(response_).mergeFrom(value).buildPartial();
           } else {
             response_ = value;
           }
@@ -2713,7 +2713,7 @@ public final class WebSocketProtos {
        */
       public Builder clearResponse() {
         if (responseBuilder_ == null) {
-          response_ = WebSocketProtos.WebSocketResponseMessage.getDefaultInstance();
+          response_ = org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.getDefaultInstance();
           onChanged();
         } else {
           responseBuilder_.clear();
@@ -2724,7 +2724,7 @@ public final class WebSocketProtos {
       /**
        * <code>optional .signalservice.WebSocketResponseMessage response = 3;</code>
        */
-      public WebSocketProtos.WebSocketResponseMessage.Builder getResponseBuilder() {
+      public org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.Builder getResponseBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
         return getResponseFieldBuilder().getBuilder();
@@ -2732,7 +2732,7 @@ public final class WebSocketProtos {
       /**
        * <code>optional .signalservice.WebSocketResponseMessage response = 3;</code>
        */
-      public WebSocketProtos.WebSocketResponseMessageOrBuilder getResponseOrBuilder() {
+      public org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessageOrBuilder getResponseOrBuilder() {
         if (responseBuilder_ != null) {
           return responseBuilder_.getMessageOrBuilder();
         } else {
@@ -2743,11 +2743,11 @@ public final class WebSocketProtos {
        * <code>optional .signalservice.WebSocketResponseMessage response = 3;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          WebSocketProtos.WebSocketResponseMessage, WebSocketProtos.WebSocketResponseMessage.Builder, WebSocketProtos.WebSocketResponseMessageOrBuilder>
+          org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage, org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.Builder, org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessageOrBuilder> 
           getResponseFieldBuilder() {
         if (responseBuilder_ == null) {
           responseBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              WebSocketProtos.WebSocketResponseMessage, WebSocketProtos.WebSocketResponseMessage.Builder, WebSocketProtos.WebSocketResponseMessageOrBuilder>(
+              org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage, org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessage.Builder, org.session.libsignal.protos.WebSocketProtos.WebSocketResponseMessageOrBuilder>(
                   response_,
                   getParentForChildren(),
                   isClean());
@@ -2803,8 +2803,8 @@ public final class WebSocketProtos {
       "equestMessage\0229\n\010response\030\003 \001(\0132\'.signal",
       "service.WebSocketResponseMessage\".\n\004Type" +
       "\022\013\n\007UNKNOWN\020\000\022\013\n\007REQUEST\020\001\022\014\n\010RESPONSE\020\002" +
-      "BC\n0org.session.libsignal.service.intern" +
+      "B/\n\034org.session.libsignal.protosB\017WebSoc" +
-      "al.websocketB\017WebSocketProtos"
+      "ketProtos"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {