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

light refactor + OpenGroupUrlParser implementation & unit test

Browse Source
This commit is contained in:
Brice-W 2021-05-03 14:15:39 +10:00
parent 9ee167c173
commit bb25877515
5 changed files with 251 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libsession/src/main/java/org/session/libsession/messaging/messages/control/OpenGroupInvitation.kt
View File

@ -5,39 +5,34 @@ import org.session.libsignal.utilities.logging.Log
class OpenGroupInvitation() : ControlMessage() { class OpenGroupInvitation() : ControlMessage() {
var serverAddress: String? = null; var groupUrl: String? = null;
var channelId: Int? = 0; var groupName: String? = null;
var serverName: String? = null;
companion object { companion object {
const val TAG = "OpenGroupInvitation" const val TAG = "OpenGroupInvitation"
fun fromProto(proto: SignalServiceProtos.Content): OpenGroupInvitation? { fun fromProto(proto: SignalServiceProtos.Content): OpenGroupInvitation? {
val openGroupInvitationProto = if (proto.hasOpenGroupInvitation()) proto.openGroupInvitation else return null val openGroupInvitationProto = if (proto.hasOpenGroupInvitation()) proto.openGroupInvitation else return null
val serverAddress = openGroupInvitationProto.serverAddress val serverAddress = openGroupInvitationProto.groupUrl
val channelId = openGroupInvitationProto.channelId val serverName = openGroupInvitationProto.groupName
val serverName = openGroupInvitationProto.serverName return OpenGroupInvitation(serverAddress, serverName)
return OpenGroupInvitation(serverAddress, channelId, serverName)
} }
} }
constructor(serverAddress: String?, channelId: Int, serverName: String?): this() { constructor(url: String?, serverName: String?): this() {
this.serverAddress = serverAddress this.groupUrl = url
this.channelId = channelId this.groupName = serverName
this.serverName = serverName
} }
override fun isValid(): Boolean { override fun isValid(): Boolean {
if (!super.isValid()) return false if (!super.isValid()) return false
//TODO determine what's required return (groupUrl != null && groupName != null)
return (serverAddress != null && channelId != null && serverName != null)
} }
override fun toProto(): SignalServiceProtos.Content? { override fun toProto(): SignalServiceProtos.Content? {
val openGroupInvitationProto = SignalServiceProtos.OpenGroupInvitation.newBuilder() val openGroupInvitationProto = SignalServiceProtos.OpenGroupInvitation.newBuilder()
openGroupInvitationProto.serverAddress = serverAddress openGroupInvitationProto.groupUrl = groupUrl
openGroupInvitationProto.channelId = channelId ?: 0 openGroupInvitationProto.groupName = groupName
openGroupInvitationProto.serverName = serverName
val proto = SignalServiceProtos.Content.newBuilder() val proto = SignalServiceProtos.Content.newBuilder()
return try { return try {

38
libsession/src/main/java/org/session/libsession/utilities/OpenGroupUrlParser.kt Normal file
View File

@ -0,0 +1,38 @@
package org.session.libsession.utilities
import java.net.MalformedURLException
import java.net.URL
object OpenGroupUrlParser {
// Error
sealed class Error(val description: String) : Exception(description) {
class MalformedUrl(message: String?) : Error("Malformed URL: $message.")
object NoRoomSpecified : Error("No room specified in the URL.")
object NoPublicKeySpecified : Error("No public key specified in the URL.")
object WrongQuery : Error("'public_key' argument is missing.")
object InvalidPublicKeyProvided : Error("Invalid public key provided.")
}
private const val pathPrefix = "/"
private const val queryPrefix = "public_key="
fun parseUrl(url: String): OpenGroupRoom {
// If the URL is malformed, it will throw an exception
val url = try { URL(url) } catch (e: MalformedURLException) { throw Error.MalformedUrl(e.message) }
val host = url.host
// Test if the room is specified in the URL
val room = if (!url.path.isNullOrEmpty()) url.path.removePrefix(pathPrefix) else throw Error.NoRoomSpecified
// Test if the query is specified in the URL
val query = if (!url.query.isNullOrEmpty()) url.query else throw Error.NoPublicKeySpecified
// Test if 'public_key' is specified in the URL
val publicKey = if (query.contains(queryPrefix)) url.query.removePrefix(queryPrefix) else throw Error.WrongQuery
// Public key must be 64 characters
if (publicKey.length != 64) throw Error.InvalidPublicKeyProvided
return OpenGroupRoom(host,room,publicKey)
}
}
class OpenGroupRoom(val serverHost: String, val room: String, val serverPublicKey: String) {}

65
libsession/src/test/java/org/session/libsession/utilities/OpenGroupUrlParserTest.kt Normal file
View File

@ -0,0 +1,65 @@
package org.session.libsession.utilities
import org.junit.Test
import org.junit.Assert.*
class OpenGroupUrlParserTest {
@Test
fun parseUrlTest() {
val inputUrl = "https://sessionopengroup.co/main?public_key=658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c"
val expectedHost = "sessionopengroup.co"
val expectedRoom = "main"
val expectedPublicKey = "658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c"
val result = OpenGroupUrlParser.parseUrl(inputUrl)
assertEquals(expectedHost, result.serverHost)
assertEquals(expectedRoom, result.room)
assertEquals(expectedPublicKey, result.serverPublicKey)
}
@Test
fun parseUrlWithIpTest() {
val inputUrl = "https://143.198.213.255:80/main?public_key=658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c"
val expectedHost = "143.198.213.255"
val expectedRoom = "main"
val expectedPublicKey = "658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c"
val result = OpenGroupUrlParser.parseUrl(inputUrl)
assertEquals(expectedHost, result.serverHost)
assertEquals(expectedRoom, result.room)
assertEquals(expectedPublicKey, result.serverPublicKey)
}
@Test(expected = OpenGroupUrlParser.Error.MalformedUrl::class)
fun parseUrlMalformedUrlTest() {
val inputUrl = "sessionopengroup.co/main?public_key=658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c"
OpenGroupUrlParser.parseUrl(inputUrl)
}
@Test(expected = OpenGroupUrlParser.Error.NoRoomSpecified::class)
fun parseUrlNoRoomSpecifiedTest() {
val inputUrl = "https://sessionopengroup.comain?public_key=658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c"
OpenGroupUrlParser.parseUrl(inputUrl)
}
@Test(expected = OpenGroupUrlParser.Error.NoPublicKeySpecified::class)
fun parseUrlNoPublicKeySpecifiedTest() {
val inputUrl = "https://sessionopengroup.co/main"
OpenGroupUrlParser.parseUrl(inputUrl)
}
@Test(expected = OpenGroupUrlParser.Error.WrongQuery::class)
fun parseUrlWrongQueryTest() {
val inputUrl = "https://sessionopengroup.co/main?publickey=658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c"
OpenGroupUrlParser.parseUrl(inputUrl)
}
@Test(expected = OpenGroupUrlParser.Error.InvalidPublicKeyProvided::class)
fun parseUrlInvalidPublicKeyProviedTest() {
val inputUrl = "https://sessionopengroup.co/main?public_key=658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adff"
OpenGroupUrlParser.parseUrl(inputUrl)
}
}

5
libsignal/protobuf/SignalService.proto
View File

@ -146,9 +146,8 @@ message DataMessage {
} }
message OpenGroupInvitation { message OpenGroupInvitation {
optional string serverAddress = 1; optional string groupUrl = 1;
optional uint32 channelId = 2; optional string groupName = 2;
optional string serverName = 3;
} }
message ConfigurationMessage { message ConfigurationMessage {

352
libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java
View File

@ -12955,45 +12955,35 @@ public final class SignalServiceProtos {
public interface OpenGroupInvitationOrBuilder public interface OpenGroupInvitationOrBuilder
extends com.google.protobuf.MessageOrBuilder { extends com.google.protobuf.MessageOrBuilder {
// optional string serverAddress = 1; // optional string groupUrl = 1;
/** /**
* <code>optional string serverAddress = 1;</code> * <code>optional string groupUrl = 1;</code>
*/ */
boolean hasServerAddress(); boolean hasGroupUrl();
/** /**
* <code>optional string serverAddress = 1;</code> * <code>optional string groupUrl = 1;</code>
*/ */
java.lang.String getServerAddress(); java.lang.String getGroupUrl();
/** /**
* <code>optional string serverAddress = 1;</code> * <code>optional string groupUrl = 1;</code>
*/ */
com.google.protobuf.ByteString com.google.protobuf.ByteString
getServerAddressBytes(); getGroupUrlBytes();
// optional uint32 channelId = 2; // optional string groupName = 2;
/** /**
* <code>optional uint32 channelId = 2;</code> * <code>optional string groupName = 2;</code>
*/ */
boolean hasChannelId(); boolean hasGroupName();
/** /**
* <code>optional uint32 channelId = 2;</code> * <code>optional string groupName = 2;</code>
*/ */
int getChannelId(); java.lang.String getGroupName();
// optional string serverName = 3;
/** /**
* <code>optional string serverName = 3;</code> * <code>optional string groupName = 2;</code>
*/
boolean hasServerName();
/**
* <code>optional string serverName = 3;</code>
*/
java.lang.String getServerName();
/**
* <code>optional string serverName = 3;</code>
*/ */
com.google.protobuf.ByteString com.google.protobuf.ByteString
getServerNameBytes(); getGroupNameBytes();
} }
/** /**
* Protobuf type {@code signalservice.OpenGroupInvitation} * Protobuf type {@code signalservice.OpenGroupInvitation}
@ -13048,17 +13038,12 @@ public final class SignalServiceProtos {
} }
case 10: { case 10: {
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
serverAddress_ = input.readBytes(); groupUrl_ = input.readBytes();
break; break;
} }
case 16: { case 18: {
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
channelId_ = input.readUInt32(); groupName_ = input.readBytes();
break;
}
case 26: {
bitField0_ |= 0x00000004;
serverName_ = input.readBytes();
break; break;
} }
} }
@ -13101,20 +13086,20 @@ public final class SignalServiceProtos {
} }
private int bitField0_; private int bitField0_;
// optional string serverAddress = 1; // optional string groupUrl = 1;
public static final int SERVERADDRESS_FIELD_NUMBER = 1; public static final int GROUPURL_FIELD_NUMBER = 1;
private java.lang.Object serverAddress_; private java.lang.Object groupUrl_;
/** /**
* <code>optional string serverAddress = 1;</code> * <code>optional string groupUrl = 1;</code>
*/ */
public boolean hasServerAddress() { public boolean hasGroupUrl() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>optional string serverAddress = 1;</code> * <code>optional string groupUrl = 1;</code>
*/ */
public java.lang.String getServerAddress() { public java.lang.String getGroupUrl() {
java.lang.Object ref = serverAddress_; java.lang.Object ref = groupUrl_;
if (ref instanceof java.lang.String) { if (ref instanceof java.lang.String) {
return (java.lang.String) ref; return (java.lang.String) ref;
} else { } else {
@ -13122,58 +13107,42 @@ public final class SignalServiceProtos {
(com.google.protobuf.ByteString) ref; (com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8(); java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) { if (bs.isValidUtf8()) {
serverAddress_ = s; groupUrl_ = s;
} }
return s; return s;
} }
} }
/** /**
* <code>optional string serverAddress = 1;</code> * <code>optional string groupUrl = 1;</code>
*/ */
public com.google.protobuf.ByteString public com.google.protobuf.ByteString
getServerAddressBytes() { getGroupUrlBytes() {
java.lang.Object ref = serverAddress_; java.lang.Object ref = groupUrl_;
if (ref instanceof java.lang.String) { if (ref instanceof java.lang.String) {
com.google.protobuf.ByteString b = com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8( com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref); (java.lang.String) ref);
serverAddress_ = b; groupUrl_ = b;
return b; return b;
} else { } else {
return (com.google.protobuf.ByteString) ref; return (com.google.protobuf.ByteString) ref;
} }
} }
// optional uint32 channelId = 2; // optional string groupName = 2;
public static final int CHANNELID_FIELD_NUMBER = 2; public static final int GROUPNAME_FIELD_NUMBER = 2;
private int channelId_; private java.lang.Object groupName_;
/** /**
* <code>optional uint32 channelId = 2;</code> * <code>optional string groupName = 2;</code>
*/ */
public boolean hasChannelId() { public boolean hasGroupName() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>optional uint32 channelId = 2;</code> * <code>optional string groupName = 2;</code>
*/ */
public int getChannelId() { public java.lang.String getGroupName() {
return channelId_; java.lang.Object ref = groupName_;
}
// optional string serverName = 3;
public static final int SERVERNAME_FIELD_NUMBER = 3;
private java.lang.Object serverName_;
/**
* <code>optional string serverName = 3;</code>
*/
public boolean hasServerName() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* <code>optional string serverName = 3;</code>
*/
public java.lang.String getServerName() {
java.lang.Object ref = serverName_;
if (ref instanceof java.lang.String) { if (ref instanceof java.lang.String) {
return (java.lang.String) ref; return (java.lang.String) ref;
} else { } else {
@ -13181,22 +13150,22 @@ public final class SignalServiceProtos {
(com.google.protobuf.ByteString) ref; (com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8(); java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) { if (bs.isValidUtf8()) {
serverName_ = s; groupName_ = s;
} }
return s; return s;
} }
} }
/** /**
* <code>optional string serverName = 3;</code> * <code>optional string groupName = 2;</code>
*/ */
public com.google.protobuf.ByteString public com.google.protobuf.ByteString
getServerNameBytes() { getGroupNameBytes() {
java.lang.Object ref = serverName_; java.lang.Object ref = groupName_;
if (ref instanceof java.lang.String) { if (ref instanceof java.lang.String) {
com.google.protobuf.ByteString b = com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8( com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref); (java.lang.String) ref);
serverName_ = b; groupName_ = b;
return b; return b;
} else { } else {
return (com.google.protobuf.ByteString) ref; return (com.google.protobuf.ByteString) ref;
@ -13204,9 +13173,8 @@ public final class SignalServiceProtos {
} }
private void initFields() { private void initFields() {
serverAddress_ = ""; groupUrl_ = "";
channelId_ = 0; groupName_ = "";
serverName_ = "";
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
@ -13221,13 +13189,10 @@ public final class SignalServiceProtos {
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeBytes(1, getServerAddressBytes()); output.writeBytes(1, getGroupUrlBytes());
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeUInt32(2, channelId_); output.writeBytes(2, getGroupNameBytes());
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeBytes(3, getServerNameBytes());
} }
getUnknownFields().writeTo(output); getUnknownFields().writeTo(output);
} }
@ -13240,15 +13205,11 @@ public final class SignalServiceProtos {
size = 0; size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
.computeBytesSize(1, getServerAddressBytes()); .computeBytesSize(1, getGroupUrlBytes());
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(2, channelId_); .computeBytesSize(2, getGroupNameBytes());
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
.computeBytesSize(3, getServerNameBytes());
} }
size += getUnknownFields().getSerializedSize(); size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@ -13366,12 +13327,10 @@ public final class SignalServiceProtos {
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
serverAddress_ = ""; groupUrl_ = "";
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
channelId_ = 0; groupName_ = "";
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
serverName_ = "";
bitField0_ = (bitField0_ & ~0x00000004);
return this; return this;
} }
@ -13403,15 +13362,11 @@ public final class SignalServiceProtos {
if (((from_bitField0_ & 0x00000001) == 0x00000001)) { if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
to_bitField0_ |= 0x00000001; to_bitField0_ |= 0x00000001;
} }
result.serverAddress_ = serverAddress_; result.groupUrl_ = groupUrl_;
if (((from_bitField0_ & 0x00000002) == 0x00000002)) { if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
to_bitField0_ |= 0x00000002; to_bitField0_ |= 0x00000002;
} }
result.channelId_ = channelId_; result.groupName_ = groupName_;
if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
to_bitField0_ |= 0x00000004;
}
result.serverName_ = serverName_;
result.bitField0_ = to_bitField0_; result.bitField0_ = to_bitField0_;
onBuilt(); onBuilt();
return result; return result;
@ -13428,17 +13383,14 @@ public final class SignalServiceProtos {
public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation other) { public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation other) {
if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.getDefaultInstance()) return this; if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.getDefaultInstance()) return this;
if (other.hasServerAddress()) { if (other.hasGroupUrl()) {
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
serverAddress_ = other.serverAddress_; groupUrl_ = other.groupUrl_;
onChanged(); onChanged();
} }
if (other.hasChannelId()) { if (other.hasGroupName()) {
setChannelId(other.getChannelId()); bitField0_ |= 0x00000002;
} groupName_ = other.groupName_;
if (other.hasServerName()) {
bitField0_ |= 0x00000004;
serverName_ = other.serverName_;
onChanged(); onChanged();
} }
this.mergeUnknownFields(other.getUnknownFields()); this.mergeUnknownFields(other.getUnknownFields());
@ -13468,183 +13420,150 @@ public final class SignalServiceProtos {
} }
private int bitField0_; private int bitField0_;
// optional string serverAddress = 1; // optional string groupUrl = 1;
private java.lang.Object serverAddress_ = ""; private java.lang.Object groupUrl_ = "";
/** /**
* <code>optional string serverAddress = 1;</code> * <code>optional string groupUrl = 1;</code>
*/ */
public boolean hasServerAddress() { public boolean hasGroupUrl() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>optional string serverAddress = 1;</code> * <code>optional string groupUrl = 1;</code>
*/ */
public java.lang.String getServerAddress() { public java.lang.String getGroupUrl() {
java.lang.Object ref = serverAddress_; java.lang.Object ref = groupUrl_;
if (!(ref instanceof java.lang.String)) { if (!(ref instanceof java.lang.String)) {
java.lang.String s = ((com.google.protobuf.ByteString) ref) java.lang.String s = ((com.google.protobuf.ByteString) ref)
.toStringUtf8(); .toStringUtf8();
serverAddress_ = s; groupUrl_ = s;
return s; return s;
} else { } else {
return (java.lang.String) ref; return (java.lang.String) ref;
} }
} }
/** /**
* <code>optional string serverAddress = 1;</code> * <code>optional string groupUrl = 1;</code>
*/ */
public com.google.protobuf.ByteString public com.google.protobuf.ByteString
getServerAddressBytes() { getGroupUrlBytes() {
java.lang.Object ref = serverAddress_; java.lang.Object ref = groupUrl_;
if (ref instanceof String) { if (ref instanceof String) {
com.google.protobuf.ByteString b = com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8( com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref); (java.lang.String) ref);
serverAddress_ = b; groupUrl_ = b;
return b; return b;
} else { } else {
return (com.google.protobuf.ByteString) ref; return (com.google.protobuf.ByteString) ref;
} }
} }
/** /**
* <code>optional string serverAddress = 1;</code> * <code>optional string groupUrl = 1;</code>
*/ */
public Builder setServerAddress( public Builder setGroupUrl(
java.lang.String value) { java.lang.String value) {
if (value == null) { if (value == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
serverAddress_ = value; groupUrl_ = value;
onChanged(); onChanged();
return this; return this;
} }
/** /**
* <code>optional string serverAddress = 1;</code> * <code>optional string groupUrl = 1;</code>
*/ */
public Builder clearServerAddress() { public Builder clearGroupUrl() {
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
serverAddress_ = getDefaultInstance().getServerAddress(); groupUrl_ = getDefaultInstance().getGroupUrl();
onChanged(); onChanged();
return this; return this;
} }
/** /**
* <code>optional string serverAddress = 1;</code> * <code>optional string groupUrl = 1;</code>
*/ */
public Builder setServerAddressBytes( public Builder setGroupUrlBytes(
com.google.protobuf.ByteString value) { com.google.protobuf.ByteString value) {
if (value == null) { if (value == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
serverAddress_ = value; groupUrl_ = value;
onChanged(); onChanged();
return this; return this;
} }
// optional uint32 channelId = 2; // optional string groupName = 2;
private int channelId_ ; private java.lang.Object groupName_ = "";
/** /**
* <code>optional uint32 channelId = 2;</code> * <code>optional string groupName = 2;</code>
*/ */
public boolean hasChannelId() { public boolean hasGroupName() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>optional uint32 channelId = 2;</code> * <code>optional string groupName = 2;</code>
*/ */
public int getChannelId() { public java.lang.String getGroupName() {
return channelId_; java.lang.Object ref = groupName_;
}
/**
* <code>optional uint32 channelId = 2;</code>
*/
public Builder setChannelId(int value) {
bitField0_ |= 0x00000002;
channelId_ = value;
onChanged();
return this;
}
/**
* <code>optional uint32 channelId = 2;</code>
*/
public Builder clearChannelId() {
bitField0_ = (bitField0_ & ~0x00000002);
channelId_ = 0;
onChanged();
return this;
}
// optional string serverName = 3;
private java.lang.Object serverName_ = "";
/**
* <code>optional string serverName = 3;</code>
*/
public boolean hasServerName() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* <code>optional string serverName = 3;</code>
*/
public java.lang.String getServerName() {
java.lang.Object ref = serverName_;
if (!(ref instanceof java.lang.String)) { if (!(ref instanceof java.lang.String)) {
java.lang.String s = ((com.google.protobuf.ByteString) ref) java.lang.String s = ((com.google.protobuf.ByteString) ref)
.toStringUtf8(); .toStringUtf8();
serverName_ = s; groupName_ = s;
return s; return s;
} else { } else {
return (java.lang.String) ref; return (java.lang.String) ref;
} }
} }
/** /**
* <code>optional string serverName = 3;</code> * <code>optional string groupName = 2;</code>
*/ */
public com.google.protobuf.ByteString public com.google.protobuf.ByteString
getServerNameBytes() { getGroupNameBytes() {
java.lang.Object ref = serverName_; java.lang.Object ref = groupName_;
if (ref instanceof String) { if (ref instanceof String) {
com.google.protobuf.ByteString b = com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8( com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref); (java.lang.String) ref);
serverName_ = b; groupName_ = b;
return b; return b;
} else { } else {
return (com.google.protobuf.ByteString) ref; return (com.google.protobuf.ByteString) ref;
} }
} }
/** /**
* <code>optional string serverName = 3;</code> * <code>optional string groupName = 2;</code>
*/ */
public Builder setServerName( public Builder setGroupName(
java.lang.String value) { java.lang.String value) {
if (value == null) { if (value == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
bitField0_ |= 0x00000004; bitField0_ |= 0x00000002;
serverName_ = value; groupName_ = value;
onChanged(); onChanged();
return this; return this;
} }
/** /**
* <code>optional string serverName = 3;</code> * <code>optional string groupName = 2;</code>
*/ */
public Builder clearServerName() { public Builder clearGroupName() {
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000002);
serverName_ = getDefaultInstance().getServerName(); groupName_ = getDefaultInstance().getGroupName();
onChanged(); onChanged();
return this; return this;
} }
/** /**
* <code>optional string serverName = 3;</code> * <code>optional string groupName = 2;</code>
*/ */
public Builder setServerNameBytes( public Builder setGroupNameBytes(
com.google.protobuf.ByteString value) { com.google.protobuf.ByteString value) {
if (value == null) { if (value == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
bitField0_ |= 0x00000004; bitField0_ |= 0x00000002;
serverName_ = value; groupName_ = value;
onChanged(); onChanged();
return this; return this;
} }
@ -21202,38 +21121,37 @@ public final class SignalServiceProtos {
"\020\001\022\027\n\023ENCRYPTION_KEY_PAIR\020\003\022\017\n\013NAME_CHAN" + "\020\001\022\027\n\023ENCRYPTION_KEY_PAIR\020\003\022\017\n\013NAME_CHAN" +
"GE\020\004\022\021\n\rMEMBERS_ADDED\020\005\022\023\n\017MEMBERS_REMOV" + "GE\020\004\022\021\n\rMEMBERS_ADDED\020\005\022\023\n\017MEMBERS_REMOV" +
"ED\020\006\022\017\n\013MEMBER_LEFT\020\007\"$\n\005Flags\022\033\n\027EXPIRA" + "ED\020\006\022\017\n\013MEMBER_LEFT\020\007\"$\n\005Flags\022\033\n\027EXPIRA" +
"TION_TIMER_UPDATE\020\002\"S\n\023OpenGroupInvitati", "TION_TIMER_UPDATE\020\002\":\n\023OpenGroupInvitati",
"on\022\025\n\rserverAddress\030\001 \001(\t\022\021\n\tchannelId\030\002" + "on\022\020\n\010groupUrl\030\001 \001(\t\022\021\n\tgroupName\030\002 \001(\t\"" +
" \001(\r\022\022\n\nserverName\030\003 \001(\t\"\316\003\n\024Configurati" + "\316\003\n\024ConfigurationMessage\022E\n\014closedGroups" +
"onMessage\022E\n\014closedGroups\030\001 \003(\0132/.signal" + "\030\001 \003(\0132/.signalservice.ConfigurationMess" +
"service.ConfigurationMessage.ClosedGroup" + "age.ClosedGroup\022\022\n\nopenGroups\030\002 \003(\t\022\023\n\013d" +
"\022\022\n\nopenGroups\030\002 \003(\t\022\023\n\013displayName\030\003 \001(" + "isplayName\030\003 \001(\t\022\026\n\016profilePicture\030\004 \001(\t" +
"\t\022\026\n\016profilePicture\030\004 \001(\t\022\022\n\nprofileKey\030" + "\022\022\n\nprofileKey\030\005 \001(\014\022=\n\010contacts\030\006 \003(\0132+" +
"\005 \001(\014\022=\n\010contacts\030\006 \003(\0132+.signalservice." + ".signalservice.ConfigurationMessage.Cont" +
"ConfigurationMessage.Contact\032\202\001\n\013ClosedG" + "act\032\202\001\n\013ClosedGroup\022\021\n\tpublicKey\030\001 \001(\014\022\014" +
"roup\022\021\n\tpublicKey\030\001 \001(\014\022\014\n\004name\030\002 \001(\t\0221\n" + "\n\004name\030\002 \001(\t\0221\n\021encryptionKeyPair\030\003 \001(\0132" +
"\021encryptionKeyPair\030\003 \001(\0132\026.signalservice", "\026.signalservice.KeyPair\022\017\n\007members\030\004 \003(\014",
".KeyPair\022\017\n\007members\030\004 \003(\014\022\016\n\006admins\030\005 \003(" + "\022\016\n\006admins\030\005 \003(\014\032V\n\007Contact\022\021\n\tpublicKey" +
"\014\032V\n\007Contact\022\021\n\tpublicKey\030\001 \002(\014\022\014\n\004name\030" + "\030\001 \002(\014\022\014\n\004name\030\002 \002(\t\022\026\n\016profilePicture\030\003" +
"\002 \002(\t\022\026\n\016profilePicture\030\003 \001(\t\022\022\n\nprofile" + " \001(\t\022\022\n\nprofileKey\030\004 \001(\014\"u\n\016ReceiptMessa" +
"Key\030\004 \001(\014\"u\n\016ReceiptMessage\0220\n\004type\030\001 \002(" + "ge\0220\n\004type\030\001 \002(\0162\".signalservice.Receipt" +
"\0162\".signalservice.ReceiptMessage.Type\022\021\n" + "Message.Type\022\021\n\ttimestamp\030\002 \003(\004\"\036\n\004Type\022" +
"\ttimestamp\030\002 \003(\004\"\036\n\004Type\022\014\n\010DELIVERY\020\000\022\010" + "\014\n\010DELIVERY\020\000\022\010\n\004READ\020\001\"\354\001\n\021AttachmentPo" +
"\n\004READ\020\001\"\354\001\n\021AttachmentPointer\022\n\n\002id\030\001 \002" + "inter\022\n\n\002id\030\001 \002(\006\022\023\n\013contentType\030\002 \001(\t\022\013" +
"(\006\022\023\n\013contentType\030\002 \001(\t\022\013\n\003key\030\003 \001(\014\022\014\n\004" + "\n\003key\030\003 \001(\014\022\014\n\004size\030\004 \001(\r\022\021\n\tthumbnail\030\005" +
"size\030\004 \001(\r\022\021\n\tthumbnail\030\005 \001(\014\022\016\n\006digest\030" + " \001(\014\022\016\n\006digest\030\006 \001(\014\022\020\n\010fileName\030\007 \001(\t\022\r" +
"\006 \001(\014\022\020\n\010fileName\030\007 \001(\t\022\r\n\005flags\030\010 \001(\r\022\r", "\n\005flags\030\010 \001(\r\022\r\n\005width\030\t \001(\r\022\016\n\006height\030\n",
"\n\005width\030\t \001(\r\022\016\n\006height\030\n \001(\r\022\017\n\007caption" + " \001(\r\022\017\n\007caption\030\013 \001(\t\022\013\n\003url\030e \001(\t\"\032\n\005Fl" +
"\030\013 \001(\t\022\013\n\003url\030e \001(\t\"\032\n\005Flags\022\021\n\rVOICE_ME" + "ags\022\021\n\rVOICE_MESSAGE\020\001\"\365\001\n\014GroupContext\022" +
"SSAGE\020\001\"\365\001\n\014GroupContext\022\n\n\002id\030\001 \001(\014\022.\n\004" + "\n\n\002id\030\001 \001(\014\022.\n\004type\030\002 \001(\0162 .signalservic" +
"type\030\002 \001(\0162 .signalservice.GroupContext." + "e.GroupContext.Type\022\014\n\004name\030\003 \001(\t\022\017\n\007mem" +
"Type\022\014\n\004name\030\003 \001(\t\022\017\n\007members\030\004 \003(\t\0220\n\006a" + "bers\030\004 \003(\t\0220\n\006avatar\030\005 \001(\0132 .signalservi" +
"vatar\030\005 \001(\0132 .signalservice.AttachmentPo" + "ce.AttachmentPointer\022\016\n\006admins\030\006 \003(\t\"H\n\004" +
"inter\022\016\n\006admins\030\006 \003(\t\"H\n\004Type\022\013\n\007UNKNOWN" + "Type\022\013\n\007UNKNOWN\020\000\022\n\n\006UPDATE\020\001\022\013\n\007DELIVER" +
"\020\000\022\n\n\006UPDATE\020\001\022\013\n\007DELIVER\020\002\022\010\n\004QUIT\020\003\022\020\n" + "\020\002\022\010\n\004QUIT\020\003\022\020\n\014REQUEST_INFO\020\004BB\n+org.se" +
"\014REQUEST_INFO\020\004BB\n+org.session.libsignal" + "ssion.libsignal.service.internal.pushB\023S" +
".service.internal.pushB\023SignalServicePro", "ignalServiceProtos"
"tos"
}; };
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@ -21317,7 +21235,7 @@ public final class SignalServiceProtos {
internal_static_signalservice_OpenGroupInvitation_fieldAccessorTable = new internal_static_signalservice_OpenGroupInvitation_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable( com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_signalservice_OpenGroupInvitation_descriptor, internal_static_signalservice_OpenGroupInvitation_descriptor,
new java.lang.String[] { "ServerAddress", "ChannelId", "ServerName", }); new java.lang.String[] { "GroupUrl", "GroupName", });
internal_static_signalservice_ConfigurationMessage_descriptor = internal_static_signalservice_ConfigurationMessage_descriptor =
getDescriptor().getMessageTypes().get(7); getDescriptor().getMessageTypes().get(7);
internal_static_signalservice_ConfigurationMessage_fieldAccessorTable = new internal_static_signalservice_ConfigurationMessage_fieldAccessorTable = new