TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-27 03:55:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move protos

Browse Source
This commit is contained in:
Niels Andriesse 2021-05-18 09:36:20 +10:00
parent 961972a723
commit c124f86f6b
7 changed files with 159 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/loki/utilities/Broadcaster.kt
View File

@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.loki.utilities
import android.content.Context
import android.content.Intent
import androidx.localbroadcastmanager.content.LocalBroadcastManager
import org.session.libsignal.service.loki.Broadcaster
import org.session.libsignal.utilities.Broadcaster
class Broadcaster(private val context: Context) : Broadcaster {

4
libsession/src/main/java/org/session/libsession/messaging/utilities/MessageWrapper.kt
View File

@ -3,8 +3,8 @@ package org.session.libsession.messaging.utilities
import com.google.protobuf.ByteString
import org.session.libsignal.utilities.Log
import org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope
import org.session.libsignal.service.internal.websocket.WebSocketProtos.WebSocketMessage
import org.session.libsignal.service.internal.websocket.WebSocketProtos.WebSocketRequestMessage
import org.session.libsignal.protos.WebSocketProtos.WebSocketMessage
import org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage
import java.security.SecureRandom
object MessageWrapper {

2
libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt
View File

@ -18,7 +18,7 @@ import org.session.libsession.utilities.getBodyForOnionRequest
import org.session.libsession.utilities.getHeadersForOnionRequest
import org.session.libsignal.crypto.getRandomElement
import org.session.libsignal.crypto.getRandomElementOrNull
import org.session.libsignal.service.loki.Broadcaster
import org.session.libsignal.utilities.Broadcaster
import org.session.libsignal.utilities.HTTP
import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol

2
libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
View File

@ -12,7 +12,7 @@ import org.session.libsignal.service.internal.push.SignalServiceProtos
import org.session.libsignal.service.loki.Snode
import org.session.libsignal.utilities.HTTP
import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol
import org.session.libsignal.service.loki.Broadcaster
import org.session.libsignal.utilities.Broadcaster
import org.session.libsignal.utilities.prettifiedDescription
import org.session.libsignal.utilities.removing05PrefixIfNeeded
import org.session.libsignal.utilities.retryIfNeeded

2
libsession/src/main/java/org/session/libsession/snode/SnodeModule.kt
View File

@ -1,7 +1,7 @@
package org.session.libsession.snode
import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol
import org.session.libsignal.service.loki.Broadcaster
import org.session.libsignal.utilities.Broadcaster
class SnodeModule(val storage: LokiAPIDatabaseProtocol, val broadcaster: Broadcaster) {

304
libsignal/src/main/java/org/session/libsignal/service/internal/websocket/WebSocketProtos.java → libsignal/src/main/java/org/session/libsignal/protos/WebSocketProtos.java
View File

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

2
libsignal/src/main/java/org/session/libsignal/service/loki/Broadcaster.kt → libsignal/src/main/java/org/session/libsignal/utilities/Broadcaster.kt
View File

@ -1,4 +1,4 @@
package org.session.libsignal.service.loki
package org.session.libsignal.utilities
interface Broadcaster {