update protobufs

libsignal/protobuf/FingerprintProtocol.proto

@@ -0,0 +1,17 @@
+syntax = "proto2";
+
+package textsecure;
+
+option java_package = "org.session.libsignal.libsignal.fingerprint";
+option java_outer_classname = "FingerprintProtos";
+
+message LogicalFingerprint {
+  optional bytes content = 1;
+//  optional bytes identifier = 2;
+}
+
+message CombinedFingerprints {
+  optional uint32             version           = 1;
+  optional LogicalFingerprint localFingerprint  = 2;
+  optional LogicalFingerprint remoteFingerprint = 3;
+}

libsignal/protobuf/LocalStorageProtocol.proto

@@ -0,0 +1,114 @@
+syntax = "proto2";
+
+package textsecure;
+
+option java_package = "org.session.libsignal.libsignal.state";
+option java_outer_classname = "StorageProtos";
+
+message SessionStructure {
+    message Chain {
+        optional bytes senderRatchetKey = 1;
+        optional bytes senderRatchetKeyPrivate = 2;
+
+        message ChainKey {
+            optional uint32 index = 1;
+            optional bytes  key   = 2;
+        }
+
+        optional ChainKey chainKey = 3;
+
+        message MessageKey {
+            optional uint32 index     = 1;
+            optional bytes  cipherKey = 2;
+            optional bytes  macKey    = 3;
+            optional bytes  iv        = 4;
+        }
+
+        repeated MessageKey messageKeys = 4;
+    }
+
+    message PendingKeyExchange {
+        optional uint32 sequence                 = 1;
+        optional bytes  localBaseKey             = 2;
+        optional bytes  localBaseKeyPrivate      = 3;
+        optional bytes  localRatchetKey          = 4;
+        optional bytes  localRatchetKeyPrivate   = 5;
+        optional bytes  localIdentityKey         = 7;
+        optional bytes  localIdentityKeyPrivate  = 8;
+    }
+
+    message PendingPreKey {
+        optional uint32 preKeyId       = 1;
+        optional int32  signedPreKeyId = 3;
+        optional bytes  baseKey        = 2;
+    }
+
+    optional uint32 sessionVersion      = 1;
+    optional bytes localIdentityPublic  = 2;
+    optional bytes remoteIdentityPublic = 3;
+
+    optional bytes rootKey              = 4;
+    optional uint32 previousCounter     = 5;
+
+    optional Chain senderChain          = 6;
+    repeated Chain receiverChains       = 7;
+
+    optional PendingKeyExchange pendingKeyExchange = 8;
+    optional PendingPreKey      pendingPreKey      = 9;
+
+    optional uint32 remoteRegistrationId = 10;
+    optional uint32 localRegistrationId  = 11;
+
+    optional bool needsRefresh = 12;
+    optional bytes aliceBaseKey = 13;
+}
+
+message RecordStructure {
+    optional SessionStructure currentSession   = 1;
+    repeated SessionStructure previousSessions = 2;
+}
+
+message PreKeyRecordStructure {
+    optional uint32 id        = 1;
+    optional bytes  publicKey = 2;
+    optional bytes  privateKey = 3;
+}
+
+message SignedPreKeyRecordStructure {
+    optional uint32  id         = 1;
+    optional bytes   publicKey  = 2;
+    optional bytes   privateKey = 3;
+    optional bytes   signature  = 4;
+    optional fixed64 timestamp  = 5;
+}
+
+message IdentityKeyPairStructure {
+    optional bytes publicKey  = 1;
+    optional bytes privateKey = 2;
+}
+
+message SenderKeyStateStructure {
+    message SenderChainKey {
+        optional uint32 iteration = 1;
+        optional bytes  seed      = 2;
+    }
+
+    message SenderMessageKey {
+        optional uint32 iteration = 1;
+        optional bytes  seed      = 2;
+    }
+
+    message SenderSigningKey {
+        optional bytes public  = 1;
+        optional bytes private = 2;
+    }
+
+    optional uint32           senderKeyId       = 1;
+    optional SenderChainKey   senderChainKey    = 2;
+    optional SenderSigningKey senderSigningKey  = 3;
+    repeated SenderMessageKey senderMessageKeys = 4;
+}
+
+message SenderKeyRecordStructure {
+    repeated SenderKeyStateStructure senderKeyStates = 1;
+}

libsignal/protobuf/Makefile

@@ -0,0 +1,5 @@
+
+all:
+	protoc25 --java_out=../src/main/java/ SignalService.proto Provisioning.proto WebSocketResources.proto StickerResources.proto
+	protoc25 --java_out=../src/main/java/ UnidentifiedDelivery.proto
+	protoc25 --java_out=../src/main/java/ WhisperTextProtocol.proto LocalStorageProtocol.proto FingerprintProtocol.proto

libsignal/protobuf/Provisioning.proto

@@ -0,0 +1,27 @@
+/**
+ * Copyright (C) 2014-2016 Open Whisper Systems
+ *
+ * Licensed according to the LICENSE file in this repository.
+ */
+
+syntax = "proto2";
+
+package signalservice;
+
+option java_package = "org.session.libsignal.service.internal.push";
+option java_outer_classname = "ProvisioningProtos";
+
+message ProvisionEnvelope {
+  optional bytes publicKey = 1;
+  optional bytes body      = 2; // Encrypted ProvisionMessage
+}
+
+message ProvisionMessage {
+  optional bytes  identityKeyPublic  = 1;
+  optional bytes  identityKeyPrivate = 2;
+  optional string number             = 3;
+  optional string provisioningCode   = 4;
+  optional string userAgent          = 5;
+  optional bytes  profileKey         = 6;
+  optional bool   readReceipts       = 7;
+}

libsignal/protobuf/README.md

@@ -0,0 +1,29 @@
+# Generating Protobuf Files
+
+Android requires protobuf `2.5.0` to auto generate the files.
+To generate the files just run `make`.
+
+**Note: Protobuf `2.5.0` will have to be aliased to `protoc25`.**
+
+## Mac Installation Instructions
+
+Protobuf can be installed using brew but this will only get versions > 3.
+To install protobuf `2.5.0` follow these steps:
+
+```sh
+wget https://github.com/google/protobuf/releases/download/v2.5.0/protobuf-2.5.0.tar.bz2
+tar xvf protobuf-2.5.0.tar.bz2
+cd protobuf-2.5.0
+./configure CC=clang CXX=clang++ CXXFLAGS='-std=c++11 -stdlib=libc++ -O3 -g' LDFLAGS='-stdlib=libc++' LIBS="-lc++ -lc++abi" --disable-shared --prefix='<PATH TO A DIRECTORY>'
+make -j4
+make install
+```
+
+This will compile and build the binary at `PATH TO A DIRECTORY` which you specified in the `./configure` command.
+Next you need to move it to your local bin:
+
+```
+cd <PATH WHERE YOU INSTALLED PROTOBUF 2.5>/bin
+chmod +x ./protoc
+mv ./protoc /usr/local/bin/protoc25
+```

libsignal/protobuf/SignalService.proto

@@ -0,0 +1,482 @@
+/**
+ * Copyright (C) 2014-2016 Open Whisper Systems
+ *
+ * Licensed according to the LICENSE file in this repository.
+ */
+
+syntax = "proto2";
+
+package signalservice;
+
+option java_package = "org.session.libsignal.service.internal.push";
+option java_outer_classname = "SignalServiceProtos";
+
+message Envelope {
+  enum Type {
+    UNKNOWN                 = 0;
+    CIPHERTEXT              = 1;
+    KEY_EXCHANGE            = 2;
+    PREKEY_BUNDLE           = 3;
+    RECEIPT                 = 5;
+    UNIDENTIFIED_SENDER     = 6;
+    CLOSED_GROUP_CIPHERTEXT = 7; // Loki
+    FALLBACK_MESSAGE        = 101; // Loki - Encrypted using the fallback session cipher. Contains a pre key bundle if it's a session request.
+  }
+
+  optional Type   type            = 1;
+  optional string source          = 2;
+  optional uint32 sourceDevice    = 7;
+  optional string relay           = 3;
+  optional uint64 timestamp       = 5;
+  optional bytes  legacyMessage   = 6; // Contains an encrypted DataMessage
+  optional bytes  content         = 8; // Contains an encrypted Content
+  optional string serverGuid      = 9;
+  optional uint64 serverTimestamp = 10;
+}
+
+message Content {
+  optional DataMessage         dataMessage         = 1;
+  optional SyncMessage         syncMessage         = 2;
+  optional CallMessage         callMessage         = 3;
+  optional NullMessage         nullMessage         = 4;
+  optional ReceiptMessage      receiptMessage      = 5;
+  optional TypingMessage       typingMessage       = 6;
+  optional PreKeyBundleMessage preKeyBundleMessage = 101; // Loki
+  optional DeviceLinkMessage   deviceLinkMessage   = 103; // Loki
+}
+
+message DeviceLinkMessage {
+  optional string primaryPublicKey       = 1;
+  optional string secondaryPublicKey     = 2;
+  optional bytes  requestSignature       = 3;
+  optional bytes  authorizationSignature = 4;
+}
+
+message PreKeyBundleMessage {
+  optional bytes  identityKey = 1;
+  optional uint32 deviceId    = 2;
+  optional uint32 preKeyId    = 3;
+  optional uint32 signedKeyId = 4;
+  optional bytes  preKey      = 5;
+  optional bytes  signedKey   = 6;
+  optional bytes  signature   = 7;
+}
+
+message CallMessage {
+  message Offer {
+    optional uint64 id          = 1;
+    optional string description = 2;
+  }
+
+  message Answer {
+    optional uint64 id          = 1;
+    optional string description = 2;
+  }
+
+  message IceUpdate {
+    optional uint64 id            = 1;
+    optional string sdpMid        = 2;
+    optional uint32 sdpMLineIndex = 3;
+    optional string sdp           = 4;
+  }
+
+  message Busy {
+    optional uint64 id = 1;
+  }
+
+  message Hangup {
+    optional uint64 id = 1;
+  }
+
+  optional Offer     offer     = 1;
+  optional Answer    answer    = 2;
+  repeated IceUpdate iceUpdate = 3;
+  optional Hangup    hangup    = 4;
+  optional Busy      busy      = 5;
+}
+
+message ClosedGroupCiphertextMessageWrapper {
+  // @required
+  optional bytes ciphertext = 1;
+  // @required
+  optional bytes ephemeralPublicKey = 2;
+}
+
+message DataMessage {
+  enum Flags {
+    END_SESSION                 = 1;
+    EXPIRATION_TIMER_UPDATE     = 2;
+    PROFILE_KEY_UPDATE          = 4;
+    DEVICE_UNLINKING_REQUEST    = 128;
+  }
+
+  message Quote {
+    message QuotedAttachment {
+      optional string            contentType = 1;
+      optional string            fileName    = 2;
+      optional AttachmentPointer thumbnail   = 3;
+    }
+
+    optional uint64           id          = 1;
+    optional string           author      = 2;
+    optional string           text        = 3;
+    repeated QuotedAttachment attachments = 4;
+  }
+
+  message Contact {
+    message Name {
+      optional string givenName   = 1;
+      optional string familyName  = 2;
+      optional string prefix      = 3;
+      optional string suffix      = 4;
+      optional string middleName  = 5;
+      optional string displayName = 6;
+    }
+
+    message Phone {
+      enum Type {
+        HOME   = 1;
+        MOBILE = 2;
+        WORK   = 3;
+        CUSTOM = 4;
+      }
+
+      optional string value = 1;
+      optional Type   type  = 2;
+      optional string label = 3;
+    }
+
+    message Email {
+      enum Type {
+        HOME   = 1;
+        MOBILE = 2;
+        WORK   = 3;
+        CUSTOM = 4;
+      }
+
+      optional string value = 1;
+      optional Type   type  = 2;
+      optional string label = 3;
+    }
+
+    message PostalAddress {
+      enum Type {
+        HOME   = 1;
+        WORK   = 2;
+        CUSTOM = 3;
+      }
+
+      optional Type   type         = 1;
+      optional string label        = 2;
+      optional string street       = 3;
+      optional string pobox        = 4;
+      optional string neighborhood = 5;
+      optional string city         = 6;
+      optional string region       = 7;
+      optional string postcode     = 8;
+      optional string country      = 9;
+    }
+
+    message Avatar {
+      optional AttachmentPointer avatar    = 1;
+      optional bool              isProfile = 2;
+    }
+
+    optional Name              name            = 1;
+    repeated Phone             number          = 3;
+    repeated Email             email           = 4;
+    repeated PostalAddress     address         = 5;
+    optional Avatar            avatar          = 6;
+    optional string            organization    = 7;
+  }
+
+  message Preview {
+    optional string            url   = 1;
+    optional string            title = 2;
+    optional AttachmentPointer image = 3;
+  }
+
+  message Sticker {
+    optional bytes             packId    = 1;
+    optional bytes             packKey   = 2;
+    optional uint32            stickerId = 3;
+    optional AttachmentPointer data      = 4;
+  }
+
+  optional string              body                = 1;
+  repeated AttachmentPointer   attachments         = 2;
+  optional GroupContext        group               = 3;
+  optional uint32              flags               = 4;
+  optional uint32              expireTimer         = 5;
+  optional bytes               profileKey          = 6;
+  optional uint64              timestamp           = 7;
+  optional Quote               quote               = 8;
+  repeated Contact             contact             = 9;
+  repeated Preview             preview             = 10;
+  optional Sticker             sticker             = 11;
+  optional LokiUserProfile     profile             = 101; // Loki - The profile of the current user
+  optional ClosedGroupUpdate   closedGroupUpdate   = 103; // Loki
+  optional ClosedGroupUpdateV2 closedGroupUpdateV2 = 104;
+}
+
+message LokiUserProfile {
+  optional string displayName       = 1;
+  optional string profilePictureURL = 2;
+}
+
+message ClosedGroupUpdateV2 {
+
+  enum Type {
+    NEW                 = 1; // publicKey, name, encryptionKeyPair, members, admins
+    UPDATE              = 2; // name, members
+    ENCRYPTION_KEY_PAIR = 3; // wrappers
+  }
+
+  message KeyPair {
+    // @required
+    required bytes publicKey  = 1;
+    // @required
+    required bytes privateKey = 2;
+  }
+
+  message KeyPairWrapper {
+    // @required
+    required bytes publicKey        = 1; // The public key of the user the key pair is meant for
+    // @required
+    required bytes encryptedKeyPair = 2; // The encrypted key pair
+  }
+
+  // @required
+  required Type           type              = 1;
+  optional bytes          publicKey         = 2;
+  optional string         name              = 3;
+  optional KeyPair        encryptionKeyPair = 4;
+  repeated bytes          members           = 5;
+  repeated bytes          admins            = 6;
+  repeated KeyPairWrapper wrappers          = 7;
+}
+
+message ClosedGroupUpdate {
+
+  enum Type {
+    NEW                = 0; // groupPublicKey, name, groupPrivateKey, senderKeys, members, admins
+    INFO               = 1; // groupPublicKey, name, senderKeys, members, admins
+    SENDER_KEY_REQUEST = 2; // groupPublicKey
+    SENDER_KEY         = 3; // groupPublicKey, senderKeys
+  }
+
+  message SenderKey {
+    // @required
+    optional bytes  chainKey  = 1;
+    // @required
+    optional uint32 keyIndex  = 2;
+    // @required
+    optional bytes  publicKey = 3;
+  }
+
+  optional string    name            = 1;
+  // @required
+  optional bytes     groupPublicKey  = 2;
+  optional bytes     groupPrivateKey = 3;
+  repeated SenderKey senderKeys      = 4;
+  repeated bytes     members         = 5;
+  repeated bytes     admins          = 6;
+  // @required
+  optional Type      type            = 7;
+}
+
+message NullMessage {
+  optional bytes padding = 1;
+}
+
+message ReceiptMessage {
+  enum Type {
+    DELIVERY = 0;
+    READ     = 1;
+  }
+
+  optional Type   type      = 1;
+  repeated uint64 timestamp = 2;
+}
+
+message TypingMessage {
+    enum Action {
+        STARTED = 0;
+        STOPPED = 1;
+    }
+
+    optional uint64 timestamp = 1;
+    optional Action action    = 2;
+    optional bytes  groupId   = 3;
+}
+
+message Verified {
+  enum State {
+    DEFAULT    = 0;
+    VERIFIED   = 1;
+    UNVERIFIED = 2;
+  }
+
+  optional string destination = 1;
+  optional bytes  identityKey = 2;
+  optional State  state       = 3;
+  optional bytes  nullMessage = 4;
+}
+
+message SyncMessage {
+  message Sent {
+    message UnidentifiedDeliveryStatus {
+      optional string destination  = 1;
+      optional bool   unidentified = 2;
+    }
+
+    optional string                     destination              = 1;
+    optional uint64                     timestamp                = 2;
+    optional DataMessage                message                  = 3;
+    optional uint64                     expirationStartTimestamp = 4;
+    repeated UnidentifiedDeliveryStatus unidentifiedStatus       = 5;
+  }
+
+  message Contacts {
+    optional AttachmentPointer blob     = 1;
+    optional bool              complete = 2 [default = false];
+    optional bytes             data     = 101;
+  }
+
+  message Groups {
+    optional AttachmentPointer blob = 1;
+    optional bytes             data = 101;
+  }
+
+  message Blocked {
+    repeated string numbers  = 1;
+    repeated bytes  groupIds = 2;
+  }
+
+  message Request {
+    enum Type {
+      UNKNOWN       = 0;
+      CONTACTS      = 1;
+      GROUPS        = 2;
+      BLOCKED       = 3;
+      CONFIGURATION = 4;
+    }
+
+    optional Type type = 1;
+  }
+
+  message Read {
+    optional string sender    = 1;
+    optional uint64 timestamp = 2;
+  }
+
+  message Configuration {
+    optional bool readReceipts                   = 1;
+    optional bool unidentifiedDeliveryIndicators = 2;
+    optional bool typingIndicators               = 3;
+    optional bool linkPreviews                   = 4;
+  }
+
+  message StickerPackOperation {
+    enum Type {
+      INSTALL = 0;
+      REMOVE  = 1;
+    }
+
+    optional bytes packId  = 1;
+    optional bytes packKey = 2;
+    optional Type  type    = 3;
+  }
+
+  message OpenGroupDetails {
+    optional string url       = 1;
+    optional uint32 channelID = 2;
+  }
+
+  optional Sent                 sent                 = 1;
+  optional Contacts             contacts             = 2;
+  optional Groups               groups               = 3;
+  optional Request              request              = 4;
+  repeated Read                 read                 = 5;
+  optional Blocked              blocked              = 6;
+  optional Verified             verified             = 7;
+  optional Configuration        configuration        = 9;
+  optional bytes                padding              = 8;
+  repeated StickerPackOperation stickerPackOperation = 10;
+  repeated OpenGroupDetails     openGroups           = 100;
+}
+
+message AttachmentPointer {
+  enum Flags {
+    VOICE_MESSAGE = 1;
+  }
+
+  optional fixed64 id          = 1;
+  optional string  contentType = 2;
+  optional bytes   key         = 3;
+  optional uint32  size        = 4;
+  optional bytes   thumbnail   = 5;
+  optional bytes   digest      = 6;
+  optional string  fileName    = 7;
+  optional uint32  flags       = 8;
+  optional uint32  width       = 9;
+  optional uint32  height      = 10;
+  optional string  caption     = 11;
+  optional string  url         = 101;
+}
+
+message GroupContext {
+  enum Type {
+    UNKNOWN      = 0;
+    UPDATE       = 1;
+    DELIVER      = 2;
+    QUIT         = 3;
+    REQUEST_INFO = 4;
+  }
+  optional bytes             id      = 1;
+  optional Type              type    = 2;
+  optional string            name    = 3;
+  repeated string            members = 4;
+  optional AttachmentPointer avatar  = 5;
+  repeated string            admins  = 6;
+
+  // Loki - These fields are only used internally for the Android code base.
+  // This is so that we can differentiate adding/kicking.
+  // DO NOT USE WHEN SENDING MESSAGES.
+  repeated string           newMembers     = 998;
+  repeated string           removedMembers = 999;
+}
+
+message ContactDetails {
+  message Avatar {
+    optional string contentType = 1;
+    optional uint32 length      = 2;
+  }
+
+  optional string   number      = 1;
+  optional string   name        = 2;
+  optional Avatar   avatar      = 3;
+  optional string   color       = 4;
+  optional Verified verified    = 5;
+  optional bytes    profileKey  = 6;
+  optional bool     blocked     = 7;
+  optional uint32   expireTimer = 8;
+  optional string   nickname    = 101; // Loki
+}
+
+message GroupDetails {
+  message Avatar {
+    optional string contentType = 1;
+    optional uint32 length      = 2;
+  }
+
+  optional bytes  id          = 1;
+  optional string name        = 2;
+  repeated string members     = 3;
+  optional Avatar avatar      = 4;
+  optional bool   active      = 5 [default = true];
+  optional uint32 expireTimer = 6;
+  optional string color       = 7;
+  optional bool   blocked     = 8;
+  repeated string admins      = 9;
+}

libsignal/protobuf/StickerResources.proto

@@ -0,0 +1,25 @@
+/**
+ * Copyright (C) 2019 Open Whisper Systems
+ *
+ * Licensed according to the LICENSE file in this repository.
+ */
+
+syntax = "proto2";
+
+package signalservice;
+
+option java_package = "org.session.libsignal.service.internal.sticker";
+option java_outer_classname = "StickerProtos";
+
+message Pack {
+    message Sticker {
+        optional uint32 id    = 1;
+        optional string emoji = 2;
+    }
+
+    optional string  title    = 1;
+    optional string  author   = 2;
+    optional Sticker cover    = 3;
+    repeated Sticker stickers = 4;
+}
+

libsignal/protobuf/UnidentifiedDelivery.proto

@@ -0,0 +1,40 @@
+syntax = "proto2";
+
+package signal;
+
+option java_package = "org.session.libsignal.metadata";
+option java_outer_classname = "SignalProtos";
+
+message ServerCertificate {
+    message Certificate {
+        optional uint32 id  = 1;
+        optional bytes  key = 2;
+    }
+
+    optional bytes certificate = 1;
+    optional bytes signature   = 2;
+}
+
+message SenderCertificate {
+    optional string sender       = 1;
+    optional uint32 senderDevice = 2;
+}
+
+message UnidentifiedSenderMessage {
+
+    message Message {
+        enum Type {
+            PREKEY_MESSAGE          = 1;
+            MESSAGE                 = 2;
+            FALLBACK_MESSAGE        = 3;
+        }
+
+        optional Type              type              = 1;
+        optional SenderCertificate senderCertificate = 2;
+        optional bytes             content           = 3;
+    }
+
+    optional bytes ephemeralPublic  = 1;
+    optional bytes encryptedStatic  = 2;
+    optional bytes encryptedMessage = 3;
+}

libsignal/protobuf/WebSocketResources.proto

@@ -0,0 +1,40 @@
+/**
+ * Copyright (C) 2014-2016 Open Whisper Systems
+ *
+ * Licensed according to the LICENSE file in this repository.
+ */
+
+syntax = "proto2";
+
+package signalservice;
+
+option java_package = "org.session.libsignal.service.internal.websocket";
+option java_outer_classname = "WebSocketProtos";
+
+message WebSocketRequestMessage {
+    optional string verb    = 1;
+    optional string path    = 2;
+    optional bytes  body    = 3;
+    repeated string headers = 5;
+    optional uint64 id      = 4;
+}
+
+message WebSocketResponseMessage {
+    optional uint64 id      = 1;
+    optional uint32 status  = 2;
+    optional string message = 3;
+    repeated string headers = 5;
+    optional bytes  body    = 4;
+}
+
+message WebSocketMessage {
+    enum Type {
+        UNKNOWN  = 0;
+        REQUEST  = 1;
+        RESPONSE = 2;
+    }
+
+    optional Type                     type     = 1;
+    optional WebSocketRequestMessage  request  = 2;
+    optional WebSocketResponseMessage response = 3;
+}

libsignal/protobuf/WhisperTextProtocol.proto

@@ -0,0 +1,57 @@
+syntax = "proto2";
+
+package textsecure;
+
+option java_package = "org.session.libsignal.libsignal.protocol";
+option java_outer_classname = "SignalProtos";
+
+message SignalMessage {
+  optional bytes  ratchetKey      = 1;
+  optional uint32 counter         = 2;
+  optional uint32 previousCounter = 3;
+  optional bytes  ciphertext      = 4;
+}
+
+message PreKeySignalMessage {
+  optional uint32 registrationId = 5;
+  optional uint32 preKeyId       = 1;
+  optional uint32 signedPreKeyId = 6;
+  optional bytes  baseKey        = 2;
+  optional bytes  identityKey    = 3;
+  optional bytes  message        = 4; // SignalMessage
+}
+
+message KeyExchangeMessage {
+  optional uint32 id               = 1;
+  optional bytes  baseKey          = 2;
+  optional bytes  ratchetKey       = 3;
+  optional bytes  identityKey      = 4;
+  optional bytes  baseKeySignature = 5;
+}
+
+message SenderKeyMessage {
+  optional uint32 id         = 1;
+  optional uint32 iteration  = 2;
+  optional bytes  ciphertext = 3;
+}
+
+message SenderKeyDistributionMessage {
+  optional uint32 id         = 1;
+  optional uint32 iteration  = 2;
+  optional bytes  chainKey   = 3;
+  optional bytes  signingKey = 4;
+}
+
+message DeviceConsistencyCodeMessage {
+  optional uint32 generation = 1;
+  optional bytes  signature  = 2;
+}
+
+message ClosedGroupCiphertextMessage {
+  // @required
+  optional bytes  ciphertext      = 1;
+  // @required
+  optional bytes  senderPublicKey = 2;
+  // @required
+  optional uint32 keyIndex        = 3;
+}

libsignal/src/main/java/org/session/libsignal/libsignal/fingerprint/FingerprintProtos.java

@@ -52,7 +52,7 @@ public final class FingerprintProtos {
     }
 
     private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @Override
+    @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
         getUnknownFields() {
       return this.unknownFields;
@@ -102,7 +102,7 @@ public final class FingerprintProtos {
       return org.session.libsignal.libsignal.fingerprint.FingerprintProtos.internal_static_textsecure_LogicalFingerprint_descriptor;
     }
 
-    protected FieldAccessorTable
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.session.libsignal.libsignal.fingerprint.FingerprintProtos.internal_static_textsecure_LogicalFingerprint_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -119,7 +119,7 @@ public final class FingerprintProtos {
       }
     };
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Parser<LogicalFingerprint> getParserForType() {
       return PARSER;
     }
@@ -186,8 +186,8 @@ public final class FingerprintProtos {
     }
 
     private static final long serialVersionUID = 0L;
-    @Override
-    protected Object writeReplace()
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
@@ -252,9 +252,9 @@ public final class FingerprintProtos {
     }
     public Builder toBuilder() { return newBuilder(this); }
 
-    @Override
+    @java.lang.Override
     protected Builder newBuilderForType(
-        BuilderParent parent) {
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -269,7 +269,7 @@ public final class FingerprintProtos {
         return org.session.libsignal.libsignal.fingerprint.FingerprintProtos.internal_static_textsecure_LogicalFingerprint_descriptor;
       }
 
-      protected FieldAccessorTable
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.session.libsignal.libsignal.fingerprint.FingerprintProtos.internal_static_textsecure_LogicalFingerprint_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -282,7 +282,7 @@ public final class FingerprintProtos {
       }
 
       private Builder(
-          BuilderParent parent) {
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -503,7 +503,7 @@ public final class FingerprintProtos {
     }
 
     private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @Override
+    @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
         getUnknownFields() {
       return this.unknownFields;
@@ -579,7 +579,7 @@ public final class FingerprintProtos {
       return org.session.libsignal.libsignal.fingerprint.FingerprintProtos.internal_static_textsecure_CombinedFingerprints_descriptor;
     }
 
-    protected FieldAccessorTable
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.session.libsignal.libsignal.fingerprint.FingerprintProtos.internal_static_textsecure_CombinedFingerprints_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -596,7 +596,7 @@ public final class FingerprintProtos {
       }
     };
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Parser<CombinedFingerprints> getParserForType() {
       return PARSER;
     }
@@ -715,8 +715,8 @@ public final class FingerprintProtos {
     }
 
     private static final long serialVersionUID = 0L;
-    @Override
-    protected Object writeReplace()
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
@@ -781,9 +781,9 @@ public final class FingerprintProtos {
     }
     public Builder toBuilder() { return newBuilder(this); }
 
-    @Override
+    @java.lang.Override
     protected Builder newBuilderForType(
-        BuilderParent parent) {
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -798,7 +798,7 @@ public final class FingerprintProtos {
         return org.session.libsignal.libsignal.fingerprint.FingerprintProtos.internal_static_textsecure_CombinedFingerprints_descriptor;
       }
 
-      protected FieldAccessorTable
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.session.libsignal.libsignal.fingerprint.FingerprintProtos.internal_static_textsecure_CombinedFingerprints_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -811,7 +811,7 @@ public final class FingerprintProtos {
       }
 
       private Builder(
-          BuilderParent parent) {
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -1237,15 +1237,15 @@ public final class FingerprintProtos {
   private static com.google.protobuf.Descriptors.FileDescriptor
       descriptor;
   static {
-    String[] descriptorData = {
+    java.lang.String[] descriptorData = {
       "\n\031FingerprintProtocol.proto\022\ntextsecure\"" +
       "%\n\022LogicalFingerprint\022\017\n\007content\030\001 \001(\014\"\234" +
       "\001\n\024CombinedFingerprints\022\017\n\007version\030\001 \001(\r" +
       "\0228\n\020localFingerprint\030\002 \001(\0132\036.textsecure." +
       "LogicalFingerprint\0229\n\021remoteFingerprint\030" +
-      "\003 \001(\0132\036.textsecure.LogicalFingerprintB=\n" +
-      "(org.session.libsignal.libsignal.fingerprin" +
-      "tB\021FingerprintProtos"
+      "\003 \001(\0132\036.textsecure.LogicalFingerprintB@\n" +
+      "+org.session.libsignal.libsignal.fingerp" +
+      "rintB\021FingerprintProtos"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -1257,13 +1257,13 @@ public final class FingerprintProtos {
           internal_static_textsecure_LogicalFingerprint_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_textsecure_LogicalFingerprint_descriptor,
-              new String[] { "Content", });
+              new java.lang.String[] { "Content", });
           internal_static_textsecure_CombinedFingerprints_descriptor =
             getDescriptor().getMessageTypes().get(1);
           internal_static_textsecure_CombinedFingerprints_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_textsecure_CombinedFingerprints_descriptor,
-              new String[] { "Version", "LocalFingerprint", "RemoteFingerprint", });
+              new java.lang.String[] { "Version", "LocalFingerprint", "RemoteFingerprint", });
           return null;
         }
       };

libsignal/src/main/java/org/session/libsignal/libsignal/protocol/SignalProtos.java

@@ -74,7 +74,7 @@ public final class SignalProtos {
     }
 
     private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @Override
+    @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
         getUnknownFields() {
       return this.unknownFields;
@@ -139,11 +139,11 @@ public final class SignalProtos {
       return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_SignalMessage_descriptor;
     }
 
-    protected FieldAccessorTable
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_SignalMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-                  org.session.libsignal.libsignal.protocol.SignalProtos.SignalMessage.class, org.session.libsignal.libsignal.protocol.SignalProtos.SignalMessage.Builder.class);
+              org.session.libsignal.libsignal.protocol.SignalProtos.SignalMessage.class, org.session.libsignal.libsignal.protocol.SignalProtos.SignalMessage.Builder.class);
     }
 
     public static com.google.protobuf.Parser<SignalMessage> PARSER =
@@ -156,7 +156,7 @@ public final class SignalProtos {
       }
     };
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Parser<SignalMessage> getParserForType() {
       return PARSER;
     }
@@ -287,8 +287,8 @@ public final class SignalProtos {
     }
 
     private static final long serialVersionUID = 0L;
-    @Override
-    protected Object writeReplace()
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
@@ -353,9 +353,9 @@ public final class SignalProtos {
     }
     public Builder toBuilder() { return newBuilder(this); }
 
-    @Override
+    @java.lang.Override
     protected Builder newBuilderForType(
-        BuilderParent parent) {
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -370,7 +370,7 @@ public final class SignalProtos {
         return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_SignalMessage_descriptor;
       }
 
-      protected FieldAccessorTable
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_SignalMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -383,7 +383,7 @@ public final class SignalProtos {
       }
 
       private Builder(
-          BuilderParent parent) {
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -747,7 +747,7 @@ public final class SignalProtos {
     }
 
     private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @Override
+    @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
         getUnknownFields() {
       return this.unknownFields;
@@ -822,7 +822,7 @@ public final class SignalProtos {
       return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_PreKeySignalMessage_descriptor;
     }
 
-    protected FieldAccessorTable
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_PreKeySignalMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -839,7 +839,7 @@ public final class SignalProtos {
       }
     };
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Parser<PreKeySignalMessage> getParserForType() {
       return PARSER;
     }
@@ -1026,8 +1026,8 @@ public final class SignalProtos {
     }
 
     private static final long serialVersionUID = 0L;
-    @Override
-    protected Object writeReplace()
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
@@ -1092,9 +1092,9 @@ public final class SignalProtos {
     }
     public Builder toBuilder() { return newBuilder(this); }
 
-    @Override
+    @java.lang.Override
     protected Builder newBuilderForType(
-        BuilderParent parent) {
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -1109,7 +1109,7 @@ public final class SignalProtos {
         return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_PreKeySignalMessage_descriptor;
       }
 
-      protected FieldAccessorTable
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_PreKeySignalMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -1122,7 +1122,7 @@ public final class SignalProtos {
       }
 
       private Builder(
-          BuilderParent parent) {
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -1571,7 +1571,7 @@ public final class SignalProtos {
     }
 
     private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @Override
+    @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
         getUnknownFields() {
       return this.unknownFields;
@@ -1641,7 +1641,7 @@ public final class SignalProtos {
       return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_KeyExchangeMessage_descriptor;
     }
 
-    protected FieldAccessorTable
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_KeyExchangeMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -1658,7 +1658,7 @@ public final class SignalProtos {
       }
     };
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Parser<KeyExchangeMessage> getParserForType() {
       return PARSER;
     }
@@ -1813,8 +1813,8 @@ public final class SignalProtos {
     }
 
     private static final long serialVersionUID = 0L;
-    @Override
-    protected Object writeReplace()
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
@@ -1879,9 +1879,9 @@ public final class SignalProtos {
     }
     public Builder toBuilder() { return newBuilder(this); }
 
-    @Override
+    @java.lang.Override
     protected Builder newBuilderForType(
-        BuilderParent parent) {
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -1896,7 +1896,7 @@ public final class SignalProtos {
         return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_KeyExchangeMessage_descriptor;
       }
 
-      protected FieldAccessorTable
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_KeyExchangeMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -1909,7 +1909,7 @@ public final class SignalProtos {
       }
 
       private Builder(
-          BuilderParent parent) {
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -2283,7 +2283,7 @@ public final class SignalProtos {
     }
 
     private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @Override
+    @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
         getUnknownFields() {
       return this.unknownFields;
@@ -2343,7 +2343,7 @@ public final class SignalProtos {
       return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_SenderKeyMessage_descriptor;
     }
 
-    protected FieldAccessorTable
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_SenderKeyMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -2360,7 +2360,7 @@ public final class SignalProtos {
       }
     };
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Parser<SenderKeyMessage> getParserForType() {
       return PARSER;
     }
@@ -2467,8 +2467,8 @@ public final class SignalProtos {
     }
 
     private static final long serialVersionUID = 0L;
-    @Override
-    protected Object writeReplace()
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
@@ -2533,9 +2533,9 @@ public final class SignalProtos {
     }
     public Builder toBuilder() { return newBuilder(this); }
 
-    @Override
+    @java.lang.Override
     protected Builder newBuilderForType(
-        BuilderParent parent) {
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -2550,7 +2550,7 @@ public final class SignalProtos {
         return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_SenderKeyMessage_descriptor;
       }
 
-      protected FieldAccessorTable
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_SenderKeyMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -2563,7 +2563,7 @@ public final class SignalProtos {
       }
 
       private Builder(
-          BuilderParent parent) {
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -2854,7 +2854,7 @@ public final class SignalProtos {
     }
 
     private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @Override
+    @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
         getUnknownFields() {
       return this.unknownFields;
@@ -2919,7 +2919,7 @@ public final class SignalProtos {
       return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_SenderKeyDistributionMessage_descriptor;
     }
 
-    protected FieldAccessorTable
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_SenderKeyDistributionMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -2936,7 +2936,7 @@ public final class SignalProtos {
       }
     };
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Parser<SenderKeyDistributionMessage> getParserForType() {
       return PARSER;
     }
@@ -3067,8 +3067,8 @@ public final class SignalProtos {
     }
 
     private static final long serialVersionUID = 0L;
-    @Override
-    protected Object writeReplace()
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
@@ -3133,9 +3133,9 @@ public final class SignalProtos {
     }
     public Builder toBuilder() { return newBuilder(this); }
 
-    @Override
+    @java.lang.Override
     protected Builder newBuilderForType(
-        BuilderParent parent) {
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -3150,7 +3150,7 @@ public final class SignalProtos {
         return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_SenderKeyDistributionMessage_descriptor;
       }
 
-      protected FieldAccessorTable
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_SenderKeyDistributionMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -3163,7 +3163,7 @@ public final class SignalProtos {
       }
 
       private Builder(
-          BuilderParent parent) {
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -3479,7 +3479,7 @@ public final class SignalProtos {
     }
 
     private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @Override
+    @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
         getUnknownFields() {
       return this.unknownFields;
@@ -3534,7 +3534,7 @@ public final class SignalProtos {
       return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_DeviceConsistencyCodeMessage_descriptor;
     }
 
-    protected FieldAccessorTable
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_DeviceConsistencyCodeMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -3551,7 +3551,7 @@ public final class SignalProtos {
       }
     };
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Parser<DeviceConsistencyCodeMessage> getParserForType() {
       return PARSER;
     }
@@ -3634,8 +3634,8 @@ public final class SignalProtos {
     }
 
     private static final long serialVersionUID = 0L;
-    @Override
-    protected Object writeReplace()
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
@@ -3700,9 +3700,9 @@ public final class SignalProtos {
     }
     public Builder toBuilder() { return newBuilder(this); }
 
-    @Override
+    @java.lang.Override
     protected Builder newBuilderForType(
-        BuilderParent parent) {
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -3717,7 +3717,7 @@ public final class SignalProtos {
         return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_DeviceConsistencyCodeMessage_descriptor;
       }
 
-      protected FieldAccessorTable
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_DeviceConsistencyCodeMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -3730,7 +3730,7 @@ public final class SignalProtos {
       }
 
       private Builder(
-          BuilderParent parent) {
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -3993,7 +3993,7 @@ public final class SignalProtos {
     }
 
     private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @Override
+    @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
         getUnknownFields() {
       return this.unknownFields;
@@ -4053,7 +4053,7 @@ public final class SignalProtos {
       return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_ClosedGroupCiphertextMessage_descriptor;
     }
 
-    protected FieldAccessorTable
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_ClosedGroupCiphertextMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -4070,7 +4070,7 @@ public final class SignalProtos {
       }
     };
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Parser<ClosedGroupCiphertextMessage> getParserForType() {
       return PARSER;
     }
@@ -4201,8 +4201,8 @@ public final class SignalProtos {
     }
 
     private static final long serialVersionUID = 0L;
-    @Override
-    protected Object writeReplace()
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
@@ -4267,9 +4267,9 @@ public final class SignalProtos {
     }
     public Builder toBuilder() { return newBuilder(this); }
 
-    @Override
+    @java.lang.Override
     protected Builder newBuilderForType(
-        BuilderParent parent) {
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -4284,7 +4284,7 @@ public final class SignalProtos {
         return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_ClosedGroupCiphertextMessage_descriptor;
       }
 
-      protected FieldAccessorTable
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.session.libsignal.libsignal.protocol.SignalProtos.internal_static_textsecure_ClosedGroupCiphertextMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -4297,7 +4297,7 @@ public final class SignalProtos {
       }
 
       private Builder(
-          BuilderParent parent) {
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -4616,7 +4616,7 @@ public final class SignalProtos {
   private static com.google.protobuf.Descriptors.FileDescriptor
       descriptor;
   static {
-    String[] descriptorData = {
+    java.lang.String[] descriptorData = {
       "\n\031WhisperTextProtocol.proto\022\ntextsecure\"" +
       "a\n\rSignalMessage\022\022\n\nratchetKey\030\001 \001(\014\022\017\n\007" +
       "counter\030\002 \001(\r\022\027\n\017previousCounter\030\003 \001(\r\022\022" +
@@ -4635,8 +4635,8 @@ public final class SignalProtos {
       "ssage\022\022\n\ngeneration\030\001 \001(\r\022\021\n\tsignature\030\002" +
       " \001(\014\"]\n\034ClosedGroupCiphertextMessage\022\022\n\n" +
       "ciphertext\030\001 \001(\014\022\027\n\017senderPublicKey\030\002 \001(" +
-      "\014\022\020\n\010keyIndex\030\003 \001(\rB5\n%org.whispersystem" +
-      "s.libsignal.protocolB\014SignalProtos"
+      "\014\022\020\n\010keyIndex\030\003 \001(\rB8\n(org.session.libsi" +
+      "gnal.libsignal.protocolB\014SignalProtos"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -4648,43 +4648,43 @@ public final class SignalProtos {
           internal_static_textsecure_SignalMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_textsecure_SignalMessage_descriptor,
-              new String[] { "RatchetKey", "Counter", "PreviousCounter", "Ciphertext", });
+              new java.lang.String[] { "RatchetKey", "Counter", "PreviousCounter", "Ciphertext", });
           internal_static_textsecure_PreKeySignalMessage_descriptor =
             getDescriptor().getMessageTypes().get(1);
           internal_static_textsecure_PreKeySignalMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_textsecure_PreKeySignalMessage_descriptor,
-              new String[] { "RegistrationId", "PreKeyId", "SignedPreKeyId", "BaseKey", "IdentityKey", "Message", });
+              new java.lang.String[] { "RegistrationId", "PreKeyId", "SignedPreKeyId", "BaseKey", "IdentityKey", "Message", });
           internal_static_textsecure_KeyExchangeMessage_descriptor =
             getDescriptor().getMessageTypes().get(2);
           internal_static_textsecure_KeyExchangeMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_textsecure_KeyExchangeMessage_descriptor,
-              new String[] { "Id", "BaseKey", "RatchetKey", "IdentityKey", "BaseKeySignature", });
+              new java.lang.String[] { "Id", "BaseKey", "RatchetKey", "IdentityKey", "BaseKeySignature", });
           internal_static_textsecure_SenderKeyMessage_descriptor =
             getDescriptor().getMessageTypes().get(3);
           internal_static_textsecure_SenderKeyMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_textsecure_SenderKeyMessage_descriptor,
-              new String[] { "Id", "Iteration", "Ciphertext", });
+              new java.lang.String[] { "Id", "Iteration", "Ciphertext", });
           internal_static_textsecure_SenderKeyDistributionMessage_descriptor =
             getDescriptor().getMessageTypes().get(4);
           internal_static_textsecure_SenderKeyDistributionMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_textsecure_SenderKeyDistributionMessage_descriptor,
-              new String[] { "Id", "Iteration", "ChainKey", "SigningKey", });
+              new java.lang.String[] { "Id", "Iteration", "ChainKey", "SigningKey", });
           internal_static_textsecure_DeviceConsistencyCodeMessage_descriptor =
             getDescriptor().getMessageTypes().get(5);
           internal_static_textsecure_DeviceConsistencyCodeMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_textsecure_DeviceConsistencyCodeMessage_descriptor,
-              new String[] { "Generation", "Signature", });
+              new java.lang.String[] { "Generation", "Signature", });
           internal_static_textsecure_ClosedGroupCiphertextMessage_descriptor =
             getDescriptor().getMessageTypes().get(6);
           internal_static_textsecure_ClosedGroupCiphertextMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_textsecure_ClosedGroupCiphertextMessage_descriptor,
-              new String[] { "Ciphertext", "SenderPublicKey", "KeyIndex", });
+              new java.lang.String[] { "Ciphertext", "SenderPublicKey", "KeyIndex", });
           return null;
         }
       };

libsignal/src/main/java/org/session/libsignal/service/internal/push/ProvisioningProtos.java

@@ -62,7 +62,7 @@ public final class ProvisioningProtos {
     }
 
     private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @Override
+    @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
         getUnknownFields() {
       return this.unknownFields;
@@ -134,7 +134,7 @@ public final class ProvisioningProtos {
       }
     };
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Parser<ProvisionEnvelope> getParserForType() {
       return PARSER;
     }
@@ -225,8 +225,8 @@ public final class ProvisioningProtos {
     }
 
     private static final long serialVersionUID = 0L;
-    @Override
-    protected Object writeReplace()
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
@@ -291,7 +291,7 @@ public final class ProvisioningProtos {
     }
     public Builder toBuilder() { return newBuilder(this); }
 
-    @Override
+    @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
@@ -554,7 +554,7 @@ public final class ProvisioningProtos {
     /**
      * <code>optional string number = 3;</code>
      */
-    String getNumber();
+    java.lang.String getNumber();
     /**
      * <code>optional string number = 3;</code>
      */
@@ -569,7 +569,7 @@ public final class ProvisioningProtos {
     /**
      * <code>optional string provisioningCode = 4;</code>
      */
-    String getProvisioningCode();
+    java.lang.String getProvisioningCode();
     /**
      * <code>optional string provisioningCode = 4;</code>
      */
@@ -584,7 +584,7 @@ public final class ProvisioningProtos {
     /**
      * <code>optional string userAgent = 5;</code>
      */
-    String getUserAgent();
+    java.lang.String getUserAgent();
     /**
      * <code>optional string userAgent = 5;</code>
      */
@@ -634,7 +634,7 @@ public final class ProvisioningProtos {
     }
 
     private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @Override
+    @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
         getUnknownFields() {
       return this.unknownFields;
@@ -731,7 +731,7 @@ public final class ProvisioningProtos {
       }
     };
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Parser<ProvisionMessage> getParserForType() {
       return PARSER;
     }
@@ -771,7 +771,7 @@ public final class ProvisioningProtos {
 
     // optional string number = 3;
     public static final int NUMBER_FIELD_NUMBER = 3;
-    private Object number_;
+    private java.lang.Object number_;
     /**
      * <code>optional string number = 3;</code>
      */
@@ -781,14 +781,14 @@ public final class ProvisioningProtos {
     /**
      * <code>optional string number = 3;</code>
      */
-    public String getNumber() {
-      Object ref = number_;
-      if (ref instanceof String) {
-        return (String) ref;
+    public java.lang.String getNumber() {
+      java.lang.Object ref = number_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           number_ = s;
         }
@@ -800,11 +800,11 @@ public final class ProvisioningProtos {
      */
     public com.google.protobuf.ByteString
         getNumberBytes() {
-      Object ref = number_;
-      if (ref instanceof String) {
+      java.lang.Object ref = number_;
+      if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
-                (String) ref);
+                (java.lang.String) ref);
         number_ = b;
         return b;
       } else {
@@ -814,7 +814,7 @@ public final class ProvisioningProtos {
 
     // optional string provisioningCode = 4;
     public static final int PROVISIONINGCODE_FIELD_NUMBER = 4;
-    private Object provisioningCode_;
+    private java.lang.Object provisioningCode_;
     /**
      * <code>optional string provisioningCode = 4;</code>
      */
@@ -824,14 +824,14 @@ public final class ProvisioningProtos {
     /**
      * <code>optional string provisioningCode = 4;</code>
      */
-    public String getProvisioningCode() {
-      Object ref = provisioningCode_;
-      if (ref instanceof String) {
-        return (String) ref;
+    public java.lang.String getProvisioningCode() {
+      java.lang.Object ref = provisioningCode_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           provisioningCode_ = s;
         }
@@ -843,11 +843,11 @@ public final class ProvisioningProtos {
      */
     public com.google.protobuf.ByteString
         getProvisioningCodeBytes() {
-      Object ref = provisioningCode_;
-      if (ref instanceof String) {
+      java.lang.Object ref = provisioningCode_;
+      if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
-                (String) ref);
+                (java.lang.String) ref);
         provisioningCode_ = b;
         return b;
       } else {
@@ -857,7 +857,7 @@ public final class ProvisioningProtos {
 
     // optional string userAgent = 5;
     public static final int USERAGENT_FIELD_NUMBER = 5;
-    private Object userAgent_;
+    private java.lang.Object userAgent_;
     /**
      * <code>optional string userAgent = 5;</code>
      */
@@ -867,14 +867,14 @@ public final class ProvisioningProtos {
     /**
      * <code>optional string userAgent = 5;</code>
      */
-    public String getUserAgent() {
-      Object ref = userAgent_;
-      if (ref instanceof String) {
-        return (String) ref;
+    public java.lang.String getUserAgent() {
+      java.lang.Object ref = userAgent_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           userAgent_ = s;
         }
@@ -886,11 +886,11 @@ public final class ProvisioningProtos {
      */
     public com.google.protobuf.ByteString
         getUserAgentBytes() {
-      Object ref = userAgent_;
-      if (ref instanceof String) {
+      java.lang.Object ref = userAgent_;
+      if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
-                (String) ref);
+                (java.lang.String) ref);
         userAgent_ = b;
         return b;
       } else {
@@ -1015,8 +1015,8 @@ public final class ProvisioningProtos {
     }
 
     private static final long serialVersionUID = 0L;
-    @Override
-    protected Object writeReplace()
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
@@ -1081,7 +1081,7 @@ public final class ProvisioningProtos {
     }
     public Builder toBuilder() { return newBuilder(this); }
 
-    @Override
+    @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
@@ -1338,7 +1338,7 @@ public final class ProvisioningProtos {
       }
 
       // optional string number = 3;
-      private Object number_ = "";
+      private java.lang.Object number_ = "";
       /**
        * <code>optional string number = 3;</code>
        */
@@ -1348,15 +1348,15 @@ public final class ProvisioningProtos {
       /**
        * <code>optional string number = 3;</code>
        */
-      public String getNumber() {
-        Object ref = number_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref)
+      public java.lang.String getNumber() {
+        java.lang.Object ref = number_;
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
               .toStringUtf8();
           number_ = s;
           return s;
         } else {
-          return (String) ref;
+          return (java.lang.String) ref;
         }
       }
       /**
@@ -1364,11 +1364,11 @@ public final class ProvisioningProtos {
        */
       public com.google.protobuf.ByteString
           getNumberBytes() {
-        Object ref = number_;
+        java.lang.Object ref = number_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
-                  (String) ref);
+                  (java.lang.String) ref);
           number_ = b;
           return b;
         } else {
@@ -1379,7 +1379,7 @@ public final class ProvisioningProtos {
        * <code>optional string number = 3;</code>
        */
       public Builder setNumber(
-          String value) {
+          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1412,7 +1412,7 @@ public final class ProvisioningProtos {
       }
 
       // optional string provisioningCode = 4;
-      private Object provisioningCode_ = "";
+      private java.lang.Object provisioningCode_ = "";
       /**
        * <code>optional string provisioningCode = 4;</code>
        */
@@ -1422,15 +1422,15 @@ public final class ProvisioningProtos {
       /**
        * <code>optional string provisioningCode = 4;</code>
        */
-      public String getProvisioningCode() {
-        Object ref = provisioningCode_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref)
+      public java.lang.String getProvisioningCode() {
+        java.lang.Object ref = provisioningCode_;
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
               .toStringUtf8();
           provisioningCode_ = s;
           return s;
         } else {
-          return (String) ref;
+          return (java.lang.String) ref;
         }
       }
       /**
@@ -1438,11 +1438,11 @@ public final class ProvisioningProtos {
        */
       public com.google.protobuf.ByteString
           getProvisioningCodeBytes() {
-        Object ref = provisioningCode_;
+        java.lang.Object ref = provisioningCode_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
-                  (String) ref);
+                  (java.lang.String) ref);
           provisioningCode_ = b;
           return b;
         } else {
@@ -1453,7 +1453,7 @@ public final class ProvisioningProtos {
        * <code>optional string provisioningCode = 4;</code>
        */
       public Builder setProvisioningCode(
-          String value) {
+          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1486,7 +1486,7 @@ public final class ProvisioningProtos {
       }
 
       // optional string userAgent = 5;
-      private Object userAgent_ = "";
+      private java.lang.Object userAgent_ = "";
       /**
        * <code>optional string userAgent = 5;</code>
        */
@@ -1496,15 +1496,15 @@ public final class ProvisioningProtos {
       /**
        * <code>optional string userAgent = 5;</code>
        */
-      public String getUserAgent() {
-        Object ref = userAgent_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref)
+      public java.lang.String getUserAgent() {
+        java.lang.Object ref = userAgent_;
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
               .toStringUtf8();
           userAgent_ = s;
           return s;
         } else {
-          return (String) ref;
+          return (java.lang.String) ref;
         }
       }
       /**
@@ -1512,11 +1512,11 @@ public final class ProvisioningProtos {
        */
       public com.google.protobuf.ByteString
           getUserAgentBytes() {
-        Object ref = userAgent_;
+        java.lang.Object ref = userAgent_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
-                  (String) ref);
+                  (java.lang.String) ref);
           userAgent_ = b;
           return b;
         } else {
@@ -1527,7 +1527,7 @@ public final class ProvisioningProtos {
        * <code>optional string userAgent = 5;</code>
        */
       public Builder setUserAgent(
-          String value) {
+          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1657,16 +1657,16 @@ public final class ProvisioningProtos {
   private static com.google.protobuf.Descriptors.FileDescriptor
       descriptor;
   static {
-    String[] descriptorData = {
+    java.lang.String[] descriptorData = {
       "\n\022Provisioning.proto\022\rsignalservice\"4\n\021P" +
       "rovisionEnvelope\022\021\n\tpublicKey\030\001 \001(\014\022\014\n\004b" +
       "ody\030\002 \001(\014\"\260\001\n\020ProvisionMessage\022\031\n\021identi" +
       "tyKeyPublic\030\001 \001(\014\022\032\n\022identityKeyPrivate\030" +
       "\002 \001(\014\022\016\n\006number\030\003 \001(\t\022\030\n\020provisioningCod" +
       "e\030\004 \001(\t\022\021\n\tuserAgent\030\005 \001(\t\022\022\n\nprofileKey" +
-      "\030\006 \001(\014\022\024\n\014readReceipts\030\007 \001(\010BD\n.org.whis" +
-      "persystems.signalservice.internal.pushB\022" +
-      "ProvisioningProtos"
+      "\030\006 \001(\014\022\024\n\014readReceipts\030\007 \001(\010BA\n+org.sess" +
+      "ion.libsignal.service.internal.pushB\022Pro" +
+      "visioningProtos"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -1678,13 +1678,13 @@ public final class ProvisioningProtos {
           internal_static_signalservice_ProvisionEnvelope_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_signalservice_ProvisionEnvelope_descriptor,
-              new String[] { "PublicKey", "Body", });
+              new java.lang.String[] { "PublicKey", "Body", });
           internal_static_signalservice_ProvisionMessage_descriptor =
             getDescriptor().getMessageTypes().get(1);
           internal_static_signalservice_ProvisionMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_signalservice_ProvisionMessage_descriptor,
-              new String[] { "IdentityKeyPublic", "IdentityKeyPrivate", "Number", "ProvisioningCode", "UserAgent", "ProfileKey", "ReadReceipts", });
+              new java.lang.String[] { "IdentityKeyPublic", "IdentityKeyPrivate", "Number", "ProvisioningCode", "UserAgent", "ProfileKey", "ReadReceipts", });
           return null;
         }
       };

libsignal/src/main/java/org/session/libsignal/service/internal/sticker/StickerProtos.java

@@ -19,7 +19,7 @@ public final class StickerProtos {
     /**
      * <code>optional string title = 1;</code>
      */
-    String getTitle();
+    java.lang.String getTitle();
     /**
      * <code>optional string title = 1;</code>
      */
@@ -34,7 +34,7 @@ public final class StickerProtos {
     /**
      * <code>optional string author = 2;</code>
      */
-    String getAuthor();
+    java.lang.String getAuthor();
     /**
      * <code>optional string author = 2;</code>
      */
@@ -103,7 +103,7 @@ public final class StickerProtos {
     }
 
     private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @Override
+    @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
         getUnknownFields() {
       return this.unknownFields;
@@ -199,7 +199,7 @@ public final class StickerProtos {
       }
     };
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Parser<Pack> getParserForType() {
       return PARSER;
     }
@@ -225,7 +225,7 @@ public final class StickerProtos {
       /**
        * <code>optional string emoji = 2;</code>
        */
-      String getEmoji();
+      java.lang.String getEmoji();
       /**
        * <code>optional string emoji = 2;</code>
        */
@@ -255,7 +255,7 @@ public final class StickerProtos {
       }
 
       private final com.google.protobuf.UnknownFieldSet unknownFields;
-      @Override
+      @java.lang.Override
       public final com.google.protobuf.UnknownFieldSet
           getUnknownFields() {
         return this.unknownFields;
@@ -327,7 +327,7 @@ public final class StickerProtos {
         }
       };
 
-      @Override
+      @java.lang.Override
       public com.google.protobuf.Parser<Sticker> getParserForType() {
         return PARSER;
       }
@@ -351,7 +351,7 @@ public final class StickerProtos {
 
       // optional string emoji = 2;
       public static final int EMOJI_FIELD_NUMBER = 2;
-      private Object emoji_;
+      private java.lang.Object emoji_;
       /**
        * <code>optional string emoji = 2;</code>
        */
@@ -361,14 +361,14 @@ public final class StickerProtos {
       /**
        * <code>optional string emoji = 2;</code>
        */
-      public String getEmoji() {
-        Object ref = emoji_;
-        if (ref instanceof String) {
-          return (String) ref;
+      public java.lang.String getEmoji() {
+        java.lang.Object ref = emoji_;
+        if (ref instanceof java.lang.String) {
+          return (java.lang.String) ref;
         } else {
           com.google.protobuf.ByteString bs = 
               (com.google.protobuf.ByteString) ref;
-          String s = bs.toStringUtf8();
+          java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             emoji_ = s;
           }
@@ -380,11 +380,11 @@ public final class StickerProtos {
        */
       public com.google.protobuf.ByteString
           getEmojiBytes() {
-        Object ref = emoji_;
-        if (ref instanceof String) {
+        java.lang.Object ref = emoji_;
+        if (ref instanceof java.lang.String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
-                  (String) ref);
+                  (java.lang.String) ref);
           emoji_ = b;
           return b;
         } else {
@@ -437,8 +437,8 @@ public final class StickerProtos {
       }
 
       private static final long serialVersionUID = 0L;
-      @Override
-      protected Object writeReplace()
+      @java.lang.Override
+      protected java.lang.Object writeReplace()
           throws java.io.ObjectStreamException {
         return super.writeReplace();
       }
@@ -503,7 +503,7 @@ public final class StickerProtos {
       }
       public Builder toBuilder() { return newBuilder(this); }
 
-      @Override
+      @java.lang.Override
       protected Builder newBuilderForType(
           com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         Builder builder = new Builder(parent);
@@ -672,7 +672,7 @@ public final class StickerProtos {
         }
 
         // optional string emoji = 2;
-        private Object emoji_ = "";
+        private java.lang.Object emoji_ = "";
         /**
          * <code>optional string emoji = 2;</code>
          */
@@ -682,15 +682,15 @@ public final class StickerProtos {
         /**
          * <code>optional string emoji = 2;</code>
          */
-        public String getEmoji() {
-          Object ref = emoji_;
-          if (!(ref instanceof String)) {
-            String s = ((com.google.protobuf.ByteString) ref)
+        public java.lang.String getEmoji() {
+          java.lang.Object ref = emoji_;
+          if (!(ref instanceof java.lang.String)) {
+            java.lang.String s = ((com.google.protobuf.ByteString) ref)
                 .toStringUtf8();
             emoji_ = s;
             return s;
           } else {
-            return (String) ref;
+            return (java.lang.String) ref;
           }
         }
         /**
@@ -698,11 +698,11 @@ public final class StickerProtos {
          */
         public com.google.protobuf.ByteString
             getEmojiBytes() {
-          Object ref = emoji_;
+          java.lang.Object ref = emoji_;
           if (ref instanceof String) {
             com.google.protobuf.ByteString b = 
                 com.google.protobuf.ByteString.copyFromUtf8(
-                    (String) ref);
+                    (java.lang.String) ref);
             emoji_ = b;
             return b;
           } else {
@@ -713,7 +713,7 @@ public final class StickerProtos {
          * <code>optional string emoji = 2;</code>
          */
         public Builder setEmoji(
-            String value) {
+            java.lang.String value) {
           if (value == null) {
     throw new NullPointerException();
   }
@@ -759,7 +759,7 @@ public final class StickerProtos {
     private int bitField0_;
     // optional string title = 1;
     public static final int TITLE_FIELD_NUMBER = 1;
-    private Object title_;
+    private java.lang.Object title_;
     /**
      * <code>optional string title = 1;</code>
      */
@@ -769,14 +769,14 @@ public final class StickerProtos {
     /**
      * <code>optional string title = 1;</code>
      */
-    public String getTitle() {
-      Object ref = title_;
-      if (ref instanceof String) {
-        return (String) ref;
+    public java.lang.String getTitle() {
+      java.lang.Object ref = title_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           title_ = s;
         }
@@ -788,11 +788,11 @@ public final class StickerProtos {
      */
     public com.google.protobuf.ByteString
         getTitleBytes() {
-      Object ref = title_;
-      if (ref instanceof String) {
+      java.lang.Object ref = title_;
+      if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
-                (String) ref);
+                (java.lang.String) ref);
         title_ = b;
         return b;
       } else {
@@ -802,7 +802,7 @@ public final class StickerProtos {
 
     // optional string author = 2;
     public static final int AUTHOR_FIELD_NUMBER = 2;
-    private Object author_;
+    private java.lang.Object author_;
     /**
      * <code>optional string author = 2;</code>
      */
@@ -812,14 +812,14 @@ public final class StickerProtos {
     /**
      * <code>optional string author = 2;</code>
      */
-    public String getAuthor() {
-      Object ref = author_;
-      if (ref instanceof String) {
-        return (String) ref;
+    public java.lang.String getAuthor() {
+      java.lang.Object ref = author_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           author_ = s;
         }
@@ -831,11 +831,11 @@ public final class StickerProtos {
      */
     public com.google.protobuf.ByteString
         getAuthorBytes() {
-      Object ref = author_;
-      if (ref instanceof String) {
+      java.lang.Object ref = author_;
+      if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
-                (String) ref);
+                (java.lang.String) ref);
         author_ = b;
         return b;
       } else {
@@ -962,8 +962,8 @@ public final class StickerProtos {
     }
 
     private static final long serialVersionUID = 0L;
-    @Override
-    protected Object writeReplace()
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
@@ -1028,7 +1028,7 @@ public final class StickerProtos {
     }
     public Builder toBuilder() { return newBuilder(this); }
 
-    @Override
+    @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
@@ -1226,7 +1226,7 @@ public final class StickerProtos {
       private int bitField0_;
 
       // optional string title = 1;
-      private Object title_ = "";
+      private java.lang.Object title_ = "";
       /**
        * <code>optional string title = 1;</code>
        */
@@ -1236,15 +1236,15 @@ public final class StickerProtos {
       /**
        * <code>optional string title = 1;</code>
        */
-      public String getTitle() {
-        Object ref = title_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref)
+      public java.lang.String getTitle() {
+        java.lang.Object ref = title_;
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
               .toStringUtf8();
           title_ = s;
           return s;
         } else {
-          return (String) ref;
+          return (java.lang.String) ref;
         }
       }
       /**
@@ -1252,11 +1252,11 @@ public final class StickerProtos {
        */
       public com.google.protobuf.ByteString
           getTitleBytes() {
-        Object ref = title_;
+        java.lang.Object ref = title_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
-                  (String) ref);
+                  (java.lang.String) ref);
           title_ = b;
           return b;
         } else {
@@ -1267,7 +1267,7 @@ public final class StickerProtos {
        * <code>optional string title = 1;</code>
        */
       public Builder setTitle(
-          String value) {
+          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1300,7 +1300,7 @@ public final class StickerProtos {
       }
 
       // optional string author = 2;
-      private Object author_ = "";
+      private java.lang.Object author_ = "";
       /**
        * <code>optional string author = 2;</code>
        */
@@ -1310,15 +1310,15 @@ public final class StickerProtos {
       /**
        * <code>optional string author = 2;</code>
        */
-      public String getAuthor() {
-        Object ref = author_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref)
+      public java.lang.String getAuthor() {
+        java.lang.Object ref = author_;
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
               .toStringUtf8();
           author_ = s;
           return s;
         } else {
-          return (String) ref;
+          return (java.lang.String) ref;
         }
       }
       /**
@@ -1326,11 +1326,11 @@ public final class StickerProtos {
        */
       public com.google.protobuf.ByteString
           getAuthorBytes() {
-        Object ref = author_;
+        java.lang.Object ref = author_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
-                  (String) ref);
+                  (java.lang.String) ref);
           author_ = b;
           return b;
         } else {
@@ -1341,7 +1341,7 @@ public final class StickerProtos {
        * <code>optional string author = 2;</code>
        */
       public Builder setAuthor(
-          String value) {
+          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1629,7 +1629,7 @@ public final class StickerProtos {
        * <code>repeated .signalservice.Pack.Sticker stickers = 4;</code>
        */
       public Builder addAllStickers(
-          Iterable<? extends org.session.libsignal.service.internal.sticker.StickerProtos.Pack.Sticker> values) {
+          java.lang.Iterable<? extends org.session.libsignal.service.internal.sticker.StickerProtos.Pack.Sticker> values) {
         if (stickersBuilder_ == null) {
           ensureStickersIsMutable();
           super.addAll(values, stickers_);
@@ -1759,14 +1759,14 @@ public final class StickerProtos {
   private static com.google.protobuf.Descriptors.FileDescriptor
       descriptor;
   static {
-    String[] descriptorData = {
+    java.lang.String[] descriptorData = {
       "\n\026StickerResources.proto\022\rsignalservice\"" +
       "\246\001\n\004Pack\022\r\n\005title\030\001 \001(\t\022\016\n\006author\030\002 \001(\t\022" +
       "*\n\005cover\030\003 \001(\0132\033.signalservice.Pack.Stic" +
       "ker\022-\n\010stickers\030\004 \003(\0132\033.signalservice.Pa" +
       "ck.Sticker\032$\n\007Sticker\022\n\n\002id\030\001 \001(\r\022\r\n\005emo" +
-      "ji\030\002 \001(\tBB\n1org.whispersystems.signalser" +
-      "vice.internal.stickerB\rStickerProtos"
+      "ji\030\002 \001(\tB?\n.org.session.libsignal.servic" +
+      "e.internal.stickerB\rStickerProtos"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -1778,13 +1778,13 @@ public final class StickerProtos {
           internal_static_signalservice_Pack_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_signalservice_Pack_descriptor,
-              new String[] { "Title", "Author", "Cover", "Stickers", });
+              new java.lang.String[] { "Title", "Author", "Cover", "Stickers", });
           internal_static_signalservice_Pack_Sticker_descriptor =
             internal_static_signalservice_Pack_descriptor.getNestedTypes().get(0);
           internal_static_signalservice_Pack_Sticker_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_signalservice_Pack_Sticker_descriptor,
-              new String[] { "Id", "Emoji", });
+              new java.lang.String[] { "Id", "Emoji", });
           return null;
         }
       };

libsignal/src/main/java/org/session/libsignal/service/internal/websocket/WebSocketProtos.java

@@ -19,7 +19,7 @@ public final class WebSocketProtos {
     /**
      * <code>optional string verb = 1;</code>
      */
-    String getVerb();
+    java.lang.String getVerb();
     /**
      * <code>optional string verb = 1;</code>
      */
@@ -34,7 +34,7 @@ public final class WebSocketProtos {
     /**
      * <code>optional string path = 2;</code>
      */
-    String getPath();
+    java.lang.String getPath();
     /**
      * <code>optional string path = 2;</code>
      */
@@ -55,7 +55,7 @@ public final class WebSocketProtos {
     /**
      * <code>repeated string headers = 5;</code>
      */
-    java.util.List<String>
+    java.util.List<java.lang.String>
     getHeadersList();
     /**
      * <code>repeated string headers = 5;</code>
@@ -64,7 +64,7 @@ public final class WebSocketProtos {
     /**
      * <code>repeated string headers = 5;</code>
      */
-    String getHeaders(int index);
+    java.lang.String getHeaders(int index);
     /**
      * <code>repeated string headers = 5;</code>
      */
@@ -104,7 +104,7 @@ public final class WebSocketProtos {
     }
 
     private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @Override
+    @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
         getUnknownFields() {
       return this.unknownFields;
@@ -197,7 +197,7 @@ public final class WebSocketProtos {
       }
     };
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Parser<WebSocketRequestMessage> getParserForType() {
       return PARSER;
     }
@@ -205,7 +205,7 @@ public final class WebSocketProtos {
     private int bitField0_;
     // optional string verb = 1;
     public static final int VERB_FIELD_NUMBER = 1;
-    private Object verb_;
+    private java.lang.Object verb_;
     /**
      * <code>optional string verb = 1;</code>
      */
@@ -215,14 +215,14 @@ public final class WebSocketProtos {
     /**
      * <code>optional string verb = 1;</code>
      */
-    public String getVerb() {
-      Object ref = verb_;
-      if (ref instanceof String) {
-        return (String) ref;
+    public java.lang.String getVerb() {
+      java.lang.Object ref = verb_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           verb_ = s;
         }
@@ -234,11 +234,11 @@ public final class WebSocketProtos {
      */
     public com.google.protobuf.ByteString
         getVerbBytes() {
-      Object ref = verb_;
-      if (ref instanceof String) {
+      java.lang.Object ref = verb_;
+      if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
-                (String) ref);
+                (java.lang.String) ref);
         verb_ = b;
         return b;
       } else {
@@ -248,7 +248,7 @@ public final class WebSocketProtos {
 
     // optional string path = 2;
     public static final int PATH_FIELD_NUMBER = 2;
-    private Object path_;
+    private java.lang.Object path_;
     /**
      * <code>optional string path = 2;</code>
      */
@@ -258,14 +258,14 @@ public final class WebSocketProtos {
     /**
      * <code>optional string path = 2;</code>
      */
-    public String getPath() {
-      Object ref = path_;
-      if (ref instanceof String) {
-        return (String) ref;
+    public java.lang.String getPath() {
+      java.lang.Object ref = path_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           path_ = s;
         }
@@ -277,11 +277,11 @@ public final class WebSocketProtos {
      */
     public com.google.protobuf.ByteString
         getPathBytes() {
-      Object ref = path_;
-      if (ref instanceof String) {
+      java.lang.Object ref = path_;
+      if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
-                (String) ref);
+                (java.lang.String) ref);
         path_ = b;
         return b;
       } else {
@@ -311,7 +311,7 @@ public final class WebSocketProtos {
     /**
      * <code>repeated string headers = 5;</code>
      */
-    public java.util.List<String>
+    public java.util.List<java.lang.String>
         getHeadersList() {
       return headers_;
     }
@@ -324,7 +324,7 @@ public final class WebSocketProtos {
     /**
      * <code>repeated string headers = 5;</code>
      */
-    public String getHeaders(int index) {
+    public java.lang.String getHeaders(int index) {
       return headers_.get(index);
     }
     /**
@@ -425,8 +425,8 @@ public final class WebSocketProtos {
     }
 
     private static final long serialVersionUID = 0L;
-    @Override
-    protected Object writeReplace()
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
@@ -491,7 +491,7 @@ public final class WebSocketProtos {
     }
     public Builder toBuilder() { return newBuilder(this); }
 
-    @Override
+    @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
@@ -665,7 +665,7 @@ public final class WebSocketProtos {
       private int bitField0_;
 
       // optional string verb = 1;
-      private Object verb_ = "";
+      private java.lang.Object verb_ = "";
       /**
        * <code>optional string verb = 1;</code>
        */
@@ -675,15 +675,15 @@ public final class WebSocketProtos {
       /**
        * <code>optional string verb = 1;</code>
        */
-      public String getVerb() {
-        Object ref = verb_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref)
+      public java.lang.String getVerb() {
+        java.lang.Object ref = verb_;
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
               .toStringUtf8();
           verb_ = s;
           return s;
         } else {
-          return (String) ref;
+          return (java.lang.String) ref;
         }
       }
       /**
@@ -691,11 +691,11 @@ public final class WebSocketProtos {
        */
       public com.google.protobuf.ByteString
           getVerbBytes() {
-        Object ref = verb_;
+        java.lang.Object ref = verb_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
-                  (String) ref);
+                  (java.lang.String) ref);
           verb_ = b;
           return b;
         } else {
@@ -706,7 +706,7 @@ public final class WebSocketProtos {
        * <code>optional string verb = 1;</code>
        */
       public Builder setVerb(
-          String value) {
+          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -739,7 +739,7 @@ public final class WebSocketProtos {
       }
 
       // optional string path = 2;
-      private Object path_ = "";
+      private java.lang.Object path_ = "";
       /**
        * <code>optional string path = 2;</code>
        */
@@ -749,15 +749,15 @@ public final class WebSocketProtos {
       /**
        * <code>optional string path = 2;</code>
        */
-      public String getPath() {
-        Object ref = path_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref)
+      public java.lang.String getPath() {
+        java.lang.Object ref = path_;
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
               .toStringUtf8();
           path_ = s;
           return s;
         } else {
-          return (String) ref;
+          return (java.lang.String) ref;
         }
       }
       /**
@@ -765,11 +765,11 @@ public final class WebSocketProtos {
        */
       public com.google.protobuf.ByteString
           getPathBytes() {
-        Object ref = path_;
+        java.lang.Object ref = path_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
-                  (String) ref);
+                  (java.lang.String) ref);
           path_ = b;
           return b;
         } else {
@@ -780,7 +780,7 @@ public final class WebSocketProtos {
        * <code>optional string path = 2;</code>
        */
       public Builder setPath(
-          String value) {
+          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -859,7 +859,7 @@ public final class WebSocketProtos {
       /**
        * <code>repeated string headers = 5;</code>
        */
-      public java.util.List<String>
+      public java.util.List<java.lang.String>
           getHeadersList() {
         return java.util.Collections.unmodifiableList(headers_);
       }
@@ -872,7 +872,7 @@ public final class WebSocketProtos {
       /**
        * <code>repeated string headers = 5;</code>
        */
-      public String getHeaders(int index) {
+      public java.lang.String getHeaders(int index) {
         return headers_.get(index);
       }
       /**
@@ -886,7 +886,7 @@ public final class WebSocketProtos {
        * <code>repeated string headers = 5;</code>
        */
       public Builder setHeaders(
-          int index, String value) {
+          int index, java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -899,7 +899,7 @@ public final class WebSocketProtos {
        * <code>repeated string headers = 5;</code>
        */
       public Builder addHeaders(
-          String value) {
+          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -912,7 +912,7 @@ public final class WebSocketProtos {
        * <code>repeated string headers = 5;</code>
        */
       public Builder addAllHeaders(
-          Iterable<String> values) {
+          java.lang.Iterable<java.lang.String> values) {
         ensureHeadersIsMutable();
         super.addAll(values, headers_);
         onChanged();
@@ -1016,7 +1016,7 @@ public final class WebSocketProtos {
     /**
      * <code>optional string message = 3;</code>
      */
-    String getMessage();
+    java.lang.String getMessage();
     /**
      * <code>optional string message = 3;</code>
      */
@@ -1027,7 +1027,7 @@ public final class WebSocketProtos {
     /**
      * <code>repeated string headers = 5;</code>
      */
-    java.util.List<String>
+    java.util.List<java.lang.String>
     getHeadersList();
     /**
      * <code>repeated string headers = 5;</code>
@@ -1036,7 +1036,7 @@ public final class WebSocketProtos {
     /**
      * <code>repeated string headers = 5;</code>
      */
-    String getHeaders(int index);
+    java.lang.String getHeaders(int index);
     /**
      * <code>repeated string headers = 5;</code>
      */
@@ -1076,7 +1076,7 @@ public final class WebSocketProtos {
     }
 
     private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @Override
+    @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
         getUnknownFields() {
       return this.unknownFields;
@@ -1169,7 +1169,7 @@ public final class WebSocketProtos {
       }
     };
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Parser<WebSocketResponseMessage> getParserForType() {
       return PARSER;
     }
@@ -1209,7 +1209,7 @@ public final class WebSocketProtos {
 
     // optional string message = 3;
     public static final int MESSAGE_FIELD_NUMBER = 3;
-    private Object message_;
+    private java.lang.Object message_;
     /**
      * <code>optional string message = 3;</code>
      */
@@ -1219,14 +1219,14 @@ public final class WebSocketProtos {
     /**
      * <code>optional string message = 3;</code>
      */
-    public String getMessage() {
-      Object ref = message_;
-      if (ref instanceof String) {
-        return (String) ref;
+    public java.lang.String getMessage() {
+      java.lang.Object ref = message_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           message_ = s;
         }
@@ -1238,11 +1238,11 @@ public final class WebSocketProtos {
      */
     public com.google.protobuf.ByteString
         getMessageBytes() {
-      Object ref = message_;
-      if (ref instanceof String) {
+      java.lang.Object ref = message_;
+      if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
-                (String) ref);
+                (java.lang.String) ref);
         message_ = b;
         return b;
       } else {
@@ -1256,7 +1256,7 @@ public final class WebSocketProtos {
     /**
      * <code>repeated string headers = 5;</code>
      */
-    public java.util.List<String>
+    public java.util.List<java.lang.String>
         getHeadersList() {
       return headers_;
     }
@@ -1269,7 +1269,7 @@ public final class WebSocketProtos {
     /**
      * <code>repeated string headers = 5;</code>
      */
-    public String getHeaders(int index) {
+    public java.lang.String getHeaders(int index) {
       return headers_.get(index);
     }
     /**
@@ -1370,8 +1370,8 @@ public final class WebSocketProtos {
     }
 
     private static final long serialVersionUID = 0L;
-    @Override
-    protected Object writeReplace()
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
@@ -1436,7 +1436,7 @@ public final class WebSocketProtos {
     }
     public Builder toBuilder() { return newBuilder(this); }
 
-    @Override
+    @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
@@ -1674,7 +1674,7 @@ public final class WebSocketProtos {
       }
 
       // optional string message = 3;
-      private Object message_ = "";
+      private java.lang.Object message_ = "";
       /**
        * <code>optional string message = 3;</code>
        */
@@ -1684,15 +1684,15 @@ public final class WebSocketProtos {
       /**
        * <code>optional string message = 3;</code>
        */
-      public String getMessage() {
-        Object ref = message_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref)
+      public java.lang.String getMessage() {
+        java.lang.Object ref = message_;
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
               .toStringUtf8();
           message_ = s;
           return s;
         } else {
-          return (String) ref;
+          return (java.lang.String) ref;
         }
       }
       /**
@@ -1700,11 +1700,11 @@ public final class WebSocketProtos {
        */
       public com.google.protobuf.ByteString
           getMessageBytes() {
-        Object ref = message_;
+        java.lang.Object ref = message_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
-                  (String) ref);
+                  (java.lang.String) ref);
           message_ = b;
           return b;
         } else {
@@ -1715,7 +1715,7 @@ public final class WebSocketProtos {
        * <code>optional string message = 3;</code>
        */
       public Builder setMessage(
-          String value) {
+          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1758,7 +1758,7 @@ public final class WebSocketProtos {
       /**
        * <code>repeated string headers = 5;</code>
        */
-      public java.util.List<String>
+      public java.util.List<java.lang.String>
           getHeadersList() {
         return java.util.Collections.unmodifiableList(headers_);
       }
@@ -1771,7 +1771,7 @@ public final class WebSocketProtos {
       /**
        * <code>repeated string headers = 5;</code>
        */
-      public String getHeaders(int index) {
+      public java.lang.String getHeaders(int index) {
         return headers_.get(index);
       }
       /**
@@ -1785,7 +1785,7 @@ public final class WebSocketProtos {
        * <code>repeated string headers = 5;</code>
        */
       public Builder setHeaders(
-          int index, String value) {
+          int index, java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1798,7 +1798,7 @@ public final class WebSocketProtos {
        * <code>repeated string headers = 5;</code>
        */
       public Builder addHeaders(
-          String value) {
+          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1811,7 +1811,7 @@ public final class WebSocketProtos {
        * <code>repeated string headers = 5;</code>
        */
       public Builder addAllHeaders(
-          Iterable<String> values) {
+          java.lang.Iterable<java.lang.String> values) {
         ensureHeadersIsMutable();
         super.addAll(values, headers_);
         onChanged();
@@ -1951,7 +1951,7 @@ public final class WebSocketProtos {
     }
 
     private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @Override
+    @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
         getUnknownFields() {
       return this.unknownFields;
@@ -2050,7 +2050,7 @@ public final class WebSocketProtos {
       }
     };
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Parser<WebSocketMessage> getParserForType() {
       return PARSER;
     }
@@ -2129,7 +2129,7 @@ public final class WebSocketProtos {
       public static Type valueOf(
           com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
         if (desc.getType() != getDescriptor()) {
-          throw new IllegalArgumentException(
+          throw new java.lang.IllegalArgumentException(
             "EnumValueDescriptor is not for this type.");
         }
         return VALUES[desc.getIndex()];
@@ -2260,8 +2260,8 @@ public final class WebSocketProtos {
     }
 
     private static final long serialVersionUID = 0L;
-    @Override
-    protected Object writeReplace()
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
@@ -2326,7 +2326,7 @@ public final class WebSocketProtos {
     }
     public Builder toBuilder() { return newBuilder(this); }
 
-    @Override
+    @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
@@ -2626,7 +2626,7 @@ public final class WebSocketProtos {
        * <code>optional .signalservice.WebSocketRequestMessage request = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          org.session.libsignal.service.internal.websocket.WebSocketProtos.WebSocketRequestMessage, org.session.libsignal.service.internal.websocket.WebSocketProtos.WebSocketRequestMessage.Builder, org.session.libsignal.service.internal.websocket.WebSocketProtos.WebSocketRequestMessageOrBuilder>
+          org.session.libsignal.service.internal.websocket.WebSocketProtos.WebSocketRequestMessage, org.session.libsignal.service.internal.websocket.WebSocketProtos.WebSocketRequestMessage.Builder, org.session.libsignal.service.internal.websocket.WebSocketProtos.WebSocketRequestMessageOrBuilder> 
           getRequestFieldBuilder() {
         if (requestBuilder_ == null) {
           requestBuilder_ = new com.google.protobuf.SingleFieldBuilder<
@@ -2743,7 +2743,7 @@ public final class WebSocketProtos {
        * <code>optional .signalservice.WebSocketResponseMessage response = 3;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          org.session.libsignal.service.internal.websocket.WebSocketProtos.WebSocketResponseMessage, org.session.libsignal.service.internal.websocket.WebSocketProtos.WebSocketResponseMessage.Builder, org.session.libsignal.service.internal.websocket.WebSocketProtos.WebSocketResponseMessageOrBuilder>
+          org.session.libsignal.service.internal.websocket.WebSocketProtos.WebSocketResponseMessage, org.session.libsignal.service.internal.websocket.WebSocketProtos.WebSocketResponseMessage.Builder, org.session.libsignal.service.internal.websocket.WebSocketProtos.WebSocketResponseMessageOrBuilder> 
           getResponseFieldBuilder() {
         if (responseBuilder_ == null) {
           responseBuilder_ = new com.google.protobuf.SingleFieldBuilder<
@@ -2790,7 +2790,7 @@ public final class WebSocketProtos {
   private static com.google.protobuf.Descriptors.FileDescriptor
       descriptor;
   static {
-    String[] descriptorData = {
+    java.lang.String[] descriptorData = {
       "\n\030WebSocketResources.proto\022\rsignalservic" +
       "e\"`\n\027WebSocketRequestMessage\022\014\n\004verb\030\001 \001" +
       "(\t\022\014\n\004path\030\002 \001(\t\022\014\n\004body\030\003 \001(\014\022\017\n\007header" +
@@ -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" +
-      "BF\n3org.session.libsignal.service.int" +
-      "ernal.websocketB\017WebSocketProtos"
+      "BC\n0org.session.libsignal.service.intern" +
+      "al.websocketB\017WebSocketProtos"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -2816,19 +2816,19 @@ public final class WebSocketProtos {
           internal_static_signalservice_WebSocketRequestMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_signalservice_WebSocketRequestMessage_descriptor,
-              new String[] { "Verb", "Path", "Body", "Headers", "Id", });
+              new java.lang.String[] { "Verb", "Path", "Body", "Headers", "Id", });
           internal_static_signalservice_WebSocketResponseMessage_descriptor =
             getDescriptor().getMessageTypes().get(1);
           internal_static_signalservice_WebSocketResponseMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_signalservice_WebSocketResponseMessage_descriptor,
-              new String[] { "Id", "Status", "Message", "Headers", "Body", });
+              new java.lang.String[] { "Id", "Status", "Message", "Headers", "Body", });
           internal_static_signalservice_WebSocketMessage_descriptor =
             getDescriptor().getMessageTypes().get(2);
           internal_static_signalservice_WebSocketMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_signalservice_WebSocketMessage_descriptor,
-              new String[] { "Type", "Request", "Response", });
+              new java.lang.String[] { "Type", "Request", "Response", });
           return null;
         }
       };